Olivier Prat
24d45e0f5b
Updated from upstream master because of change of protocol
2017-06-13 10:43:25 +02:00
Liv
7785473ccb
moving else
2017-06-09 12:59:08 -07:00
Liv
8c488d95d1
Stylish updates
2017-06-09 11:46:38 -07:00
Liv
1808505d8b
Coding standard fixes
2017-06-09 10:54:57 -07:00
Liv
34bd2b8a2b
style fix
2017-06-08 09:01:01 -07:00
Olivier Prat
20d4fcbbc7
Fixed fading on skinned objects. Added initialiazeShapePipelines on GeometryCache to postpone simple pipeline creation after initializeGL
2017-06-08 09:24:12 +02:00
Liv
c3bf915fd4
Changing loop to avoid unused warnings
2017-06-07 15:04:39 -07:00
Liv
5579c409e7
Style fix
2017-06-05 18:03:10 -07:00
Liv
42cb2332d5
Remove unimplemented comment on circle
2017-06-05 17:46:13 -07:00
Liv
393aa84a55
Renaming conical to isConical
2017-06-05 17:45:52 -07:00
Liv
e4963e076a
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes
2017-06-05 17:38:28 -07:00
samcake
c5e9551bab
more cleanup
2017-06-01 18:05:18 -07:00
samcake
9c1e99fe3f
Removing cruft and organizing the stencil config
2017-06-01 13:06:22 -07:00
Liv
8bcaacbe40
Removing incomplete torus function
2017-05-31 15:46:35 -07:00
Liv
2808ab4865
Sort of making progress on torus vertex buffer
2017-05-26 10:45:29 -07:00
Liv
10408a0fe4
basic circle function to be used as base for torus
2017-05-25 15:32:49 -07:00
Liv
ffbe39df0a
Refactor to add optional conical parameter to existing extrude polygon function
2017-05-25 13:06:24 -07:00
Liv
d3e900e42f
Adding first pass on cone shape
2017-05-25 12:54:49 -07:00
Liv
417d9ec80b
Surface cylinder option for primitive shape to html
2017-05-25 11:04:25 -07:00
Liv
362e08a90d
Add extrudePolygon for cylinder
2017-05-25 10:23:28 -07:00
Sam Cake
29545f0918
FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend
2017-04-13 23:53:56 -07:00
sam
e1aad8bd63
Deep dive into the shape key and filters and the PLumber construction
2017-02-24 00:35:10 -08:00
Anthony J. Thibault
39d68828ab
Disable FXAA on tablet overlay in desktop mode.
...
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass. Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.
Two new shaders were introduced.
simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf
These are tailored to write into the main framebuffer instead of the g-buffer.
2017-01-30 11:24:59 -08:00
Brad Davis
3074be7ad0
Glow line replacement without geometry shader
2016-11-18 17:42:55 -08:00
Brad Davis
fa841620ab
Disable glow line temporarily while fixing implementation
2016-11-16 12:50:47 -08:00
Brad Davis
2705ee7030
Remove the use of implicit ids in geometry cache
2016-10-19 11:18:25 -07:00
Brad Davis
dde79ef3c5
Fix GPU buffer leak in geometry cache / overlays
2016-10-17 12:22:20 -07:00
Anthony J. Thibault
e82f6a90af
Improved web entity rendering
...
* fading now works properly
* web browsers are now fully opaque.
2016-08-25 11:04:23 -07:00
Brad Davis
574737fbb5
More GPU api fixes, protect Buffer::flush
2016-08-12 22:29:04 -07:00
Brad Davis
894d29bb29
Fixing flicking in instance based objects
2016-08-12 22:28:24 -07:00
Brad Hefta-Gaub
a714f325fe
Merge pull request #8333 from SamGondelman/miscFixes
...
Miscellaneous cmake and render engine improvements
2016-08-10 11:06:50 -07:00
SamGondelman
ae9fb3768c
CR notes
2016-08-08 17:45:25 -07:00
SamGondelman
130e64aaba
remove polyvox fade, possibly fix web fade
2016-08-05 10:36:48 -07:00
SamGondelman
b6e73e06a2
merge from master
2016-08-04 13:34:38 -07:00
SamGondelman
2eb0c7735f
working on fading shape entities
2016-08-03 13:30:05 -07:00
SamGondelman
676f4bdfcf
misc fixes from particles branch
2016-07-29 15:36:32 -07:00
Anthony Thibault
ea310bcc43
Web Entities now render correctly as well
2016-07-28 14:11:19 -07:00
Anthony J. Thibault
0a35c13a94
Moved creation of pipeline into call_once block
2016-07-25 16:30:29 -07:00
Anthony J. Thibault
fb84f058d6
Fix alpha cut-outs and incorrect gamma on Web3DOverlays
2016-07-25 15:56:05 -07:00
Brad Davis
85b0440e32
Disable glow lines (and the use of geometry shaders) on non-Windows platforms for now
2016-07-23 11:06:33 -07:00
Brad Davis
03cb6175ab
Support triangle and hexagon shapes, add shape support to overlays.
2016-07-15 22:02:17 -07:00
Brad Davis
2c72037e81
Fixing warnings
2016-07-09 20:43:31 -07:00
Brad Davis
31948bce2d
Support alpha and color gradients in circle overlays
2016-07-09 20:43:30 -07:00
Brad Davis
ae1dd29a7a
Fix depth writing for glow lines
2016-07-08 10:27:53 -07:00
Brad Davis
c644c87e69
Fix glow line vanishing, improve transparency interaction
2016-07-07 19:01:41 -07:00
Brad Davis
8ca3630cfa
Support glow effect in 3D line overlays
2016-07-07 13:36:48 -07:00
Brad Davis
b7926b8582
Don't render wire geometry with lighting effects
2016-06-30 16:11:05 -07:00
Brad Davis
2c02c963d4
Moving shape definition to a shared location
2016-05-26 12:22:39 -07:00
Brad Davis
2c703e963c
More shapes
2016-05-22 19:48:59 -07:00
Brad Davis
cd1e910844
Add a generic shape primitive
2016-05-21 23:46:44 -07:00
samcake
1ec9ef560e
Fixing the srgb color format conversion for web entities
2016-05-11 10:46:54 -07:00
samcake
88f816fab4
Adding reflection of the ambient map for translucent
2016-04-28 18:18:18 -07:00
samcake
9d0803e6b8
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-23 09:33:54 -08:00
Zach Pomerantz
fd6aa9a78b
Add layering to renderGrid, draw edit grid not layered
2016-02-19 13:57:32 -08:00
Zach Pomerantz
9daefbdb94
Fix grid antialiasing
2016-02-19 11:39:11 -08:00
Zach Pomerantz
07a5c7bd16
Update grid shader for major/minor lines
2016-02-19 11:22:01 -08:00
Zach Pomerantz
2bfbf1b5fd
Reimplement renderGrid to use frag shader
2016-02-18 11:30:03 -08:00
samcake
71863a1550
Fixing the material names
2016-02-16 09:33:24 -08:00
samcake
0ad7bacf02
Changing diffuse to albedo and breaking everything...
2016-02-15 21:50:10 -08:00
Zach Pomerantz
d9132f3973
Clean up geometry instanced calls
2016-02-05 11:22:45 -08:00
Zach Pomerantz
44d297e7e2
Differentiate named calls by pipeline
2016-02-04 15:32:47 -08:00
Zach Pomerantz
f0797d8ea0
Move instanced pipeline setup to lambda from batch
2016-02-04 15:32:28 -08:00
Zach Pomerantz
cb06d4a9e4
Fix -Wunused-variable for geometry solid stream formats
2016-02-04 10:13:35 -08:00
Zach Pomerantz
a790b09892
Supply normals to GeometryCache draw calls
2016-02-03 19:18:56 -08:00
Zach Pomerantz
d14ce8a9fe
Pass an explicit pipeline to render.*Instance calls
2016-02-03 19:18:56 -08:00
Atlante45
a5603140de
Fix for mac
2016-02-01 18:50:01 +01:00
Atlante45
7e8ea4dc77
Update primitive instance rendering calls
2016-02-01 18:50:01 +01:00
Atlante45
ccb183e518
Unify Named/Normal calls
2016-02-01 18:50:01 +01:00
Atlante45
741c22c0ac
Move SimpleProgramKey to cpp
2016-01-13 11:47:43 -08:00
Atlante45
1789878be1
Remove dead code
2016-01-13 11:47:43 -08:00
Atlante45
c30569cd55
Naming coding standard
2016-01-13 11:47:43 -08:00
Atlante45
205c14eb43
Remove unused headers
2016-01-13 11:47:43 -08:00
Atlante45
11dc3cd261
Move primitive rendering out of DeferredLightingEffect
2016-01-13 11:47:43 -08:00
Atlante45
ce51350b65
Fix warnings on windows 64bit
2015-12-11 15:42:15 -08:00
Bradley Austin Davis
011a43d5f2
Add sphere and cube triangle counts to displayed stats
2015-12-08 11:08:22 -08:00
Atlante45
3da80f5861
gpu::Shader::create* return shared_ptr
2015-12-03 14:56:07 -08:00
Brad Davis
5cbb2562cd
Move GL utilities out to their own library
2015-10-27 15:53:42 -07:00
samcake
c75c31ddc8
Fixing the index Offset issue with instanced shapes from Geometry cache
2015-10-06 18:04:08 -07:00
samcake
8735aa8003
Merging Austin pr that adds the multi draw indirect and also fix the seprate vertex format feature for windows and linux
2015-09-23 12:19:17 -07:00
Brad Hefta-Gaub
17a3fd159a
apparently unix doesn't like the generic type version of sqrt()
2015-09-22 21:43:09 -07:00
Brad Hefta-Gaub
cd9aad4f41
more warnings fixes
2015-09-22 21:28:45 -07:00
Brad Hefta-Gaub
5b00783f18
more warnings fixes
2015-09-22 20:54:36 -07:00
Brad Hefta-Gaub
6f7e13b3c1
more warning fixes
2015-09-22 17:26:45 -07:00
Brad Hefta-Gaub
efda121619
fix a bunch of warnings on windows
2015-09-22 16:40:17 -07:00
Brad Davis
deaa4a747b
Batch side implementation of multi-draw indirect
2015-09-22 15:56:58 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
Bradley Austin Davis
b3aeaba5f4
CR feedback
2015-09-21 15:44:47 -07:00
Bradley Austin Davis
e12e4ece34
Fixing lighting and atmosphere
2015-09-21 13:51:08 -07:00
Bradley Austin Davis
e024d23366
Instancing work, second pass
2015-09-21 13:27:02 -07:00
samcake
d3b1bcb86d
Redistributing the files to create the model-networking lib and separate that from the redner-utils
2015-09-21 13:21:35 -07:00
samcake
6a714f405c
Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map
2015-09-21 00:53:48 -07:00
samcake
3614812681
MOving the actual creation of the texture and the pixel manipulation required from TextureCache to TextureSOurce
2015-09-20 23:31:59 -07:00
samcake
c9cb768945
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-19 09:00:19 -07:00
samcake
9a8dc6ca5d
Fix compilation issues on mac
2015-09-19 08:59:47 -07:00
samcake
8941741508
Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap
2015-09-18 18:47:18 -07:00
Brad Davis
8a703d0363
Instanced rendering, first pass
2015-09-18 16:29:29 -07:00
Sam Gateau
9074d0d6e1
very first version of the TextureStorage working
2015-09-14 09:29:46 -07:00
Sam Gateau
c37cdce750
Merging back with master
2015-09-10 17:53:50 -07:00
Stephen Birarda
b8bf9a1104
fix OBJReader loading with URL
2015-09-08 14:51:51 -07:00
Sam Gateau
4e944645fe
more cleaning for showing a cleaner pr
2015-08-28 16:58:36 -07:00
Sam Gateau
b845fcaff9
Cleanup
2015-08-28 16:38:07 -07:00
Sam Gateau
85f230bf17
Getting rid of the NetworkMEshPart and simplifying the thinking around the MOdel regarding its RenderItems
2015-08-28 08:12:50 -07:00
Sam Gateau
f6953f8e02
REfining th eTextureMap design but still with the issue of the lightmapped model
2015-08-27 09:52:07 -07:00
Ryan Huffman
269d5bb6da
Resolve bugs with *Cache changes
2015-08-26 14:04:55 -07:00
Sam Gateau
1e9fce2a61
Drafting the materials for FBXReader
2015-08-25 22:12:51 -07:00
Thijs Wenker
0f8cf80d45
Merge branch 'master' of https://github.com/worklist/hifi into 20660
2015-08-23 19:53:50 +02:00
Nex Pro
ad315cf68a
Merge branch '20660' of github.com:thoys/hifi into 20660
...
Conflicts:
interface/src/Util.cpp
2015-08-23 16:30:46 +01:00
Nex Pro
1f08444369
Modified the world box to render axes in negative space
...
Also Modified renderDashedLine to accept params for dash len and gap len so we can display negative axes as dashed lines with 500mm dashes and gaps.
2015-08-23 16:21:20 +01:00
Anthony J. Thibault
04e7084743
Resource fix for textures in FBX files.
...
The baseTexturePath url for textures in FBXGeometry
should default to the same base url as the fbx file itself.
This error was introduced in my recent refactoring.
Textures embedded in FBXGeometries should be un-affected
by this change.
2015-08-21 21:44:15 -07:00
Anthony J. Thibault
1b3d7fabc8
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
...
* Removed validation logic from Resource class, Qt does this internally and is more
standards compliant. This should result in more accurate caching and faster resource
fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.
* NetworkGeometry now uses multiple Resource objects to download
the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
have to poll it to determine when loading is complete (except for textures *sigh*)
Some functionality was removed
* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.
* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
This can result in a pop when switching avatars, and there's no longer a default
if avatar loading fails.
2015-08-20 18:59:51 -07:00
Sam Gateau
f0f141a2b4
SImple fix to the case of multiple material in a mesh with different opacity
2015-08-06 18:51:44 -07:00
Atlante45
3dc8bd47ae
Fix warning and remove unused headers
2015-08-05 16:46:44 -07:00
Bradley Austin Davis
89aa596717
Fix white rendering of many primitives
2015-08-04 14:05:05 -07:00
Andrew Meadows
acfc907704
Merge pull request #5438 from howard-stearns/rig
...
Rig: Bottleneck animation management through a Rig class
2015-08-03 11:14:21 -07:00
ZappoMan
b02f751830
diff redux
2015-08-01 16:53:35 -07:00
ZappoMan
b138c16c7f
use Austins QUAD to TRIANGLE_STRIP approach
2015-08-01 16:50:36 -07:00
ZappoMan
1dd6c1117d
change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive
2015-08-01 11:29:28 -07:00
Howard Stearns
b685378ab0
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-31 10:08:30 -07:00
Sam Gateau
d84e2d31ea
Merge with master
2015-07-30 11:20:00 -07:00
Howard Stearns
06aa107762
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-30 09:57:02 -07:00
Brad Hefta-Gaub
b95e4e1e93
Merge pull request #5323 from MarcelEdward/20605
...
Removed the line where the directory is stripped off the RelativeFile
2015-07-30 07:30:01 -07:00
Andrew Meadows
77a12eb50e
compile on linux with GLEW
2015-07-28 17:53:01 -07:00
Howard Stearns
1663d095a1
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-24 14:08:51 -07:00
Andrew Meadows
1bf49d72f1
Merge branch 'rig' of github.com:howard-stearns/hifi into bromine
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-07-24 10:06:02 -07:00
samcake
52ac5b3ef6
On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize
2015-07-24 03:38:21 -07:00
Sam Gateau
66cd17ec66
REmove the crappy solution for drawing transparent texture into overlay by a proper shader
2015-07-23 23:09:40 -07:00
Sam Gateau
dc10f30d3d
Merged
2015-07-23 15:10:42 -07:00
Sam Gateau
a561874ce3
Render the rear view mirror in a separate target and then display it during overlay pass
2015-07-23 14:56:14 -07:00
Andrew Meadows
6657026a12
remove cruft: legacy shapes for skeleton bones
2015-07-23 08:34:44 -07:00
ZappoMan
c2113ea96b
remove non-batch versions of GeometryCache renderXYZ() methods
2015-07-23 07:42:58 -07:00
Marcel Verhagen
8f0893ba21
Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives.
...
Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file.
So it now does not break existing content.
Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.
2015-07-22 22:34:45 +02:00
Brad Davis
9016f437a8
Merge pull request #5371 from Atlante45/smart_pointers
...
Smart pointers fixes
2015-07-21 08:52:29 -07:00
ZappoMan
d41d86c33c
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-07-20 14:31:58 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
Brad Davis
d68618e206
Removing GL headers from most files, and some naked GL from application.cpp
2015-07-18 00:46:09 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
ZappoMan
816fd41624
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-07-17 17:10:52 -07:00
Brad Hefta-Gaub
2423d25839
Merge pull request #5355 from ctrlaltdavid/20620
...
QA for #20620 - Make renderGrid handle changing position and dimensions
2015-07-17 17:10:43 -07:00
David Rowe
c46533d9a6
Make renderGrid handle changing position and dimensions
...
So that audio scope grid moves when Interface window is resized.
2015-07-16 21:05:14 -07:00
ZappoMan
398075e45a
hacking on more naked GL
2015-07-16 16:26:28 -07:00
ZappoMan
2ad2c4d554
remove some dead code
2015-07-15 15:33:28 -07:00
ZappoMan
293ccc1713
remove some dead code
2015-07-15 15:32:02 -07:00
ZappoMan
d19c7125da
remove naked gl calls
2015-07-14 16:49:43 -07:00
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
Atlante45
a3848f08d2
Conditionnal fixes.
2015-07-10 15:36:17 -07:00
Atlante45
5cfa1605df
Made Texture safe with resource refresh
2015-07-10 12:28:06 -07:00
Brad Davis
6c5d7b8789
Performance optimizations in transform buffers and geometry cache
2015-07-09 17:53:26 -07:00
samcake
84b70fbaca
Mergin yellow with the Status bar rendering into Daft cwith the switch to batch for deferred pass
2015-07-03 11:36:19 -07:00
Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07:00
Sam Gateau
c41ebcae78
Covering all the case for rendering the light passes
2015-06-26 15:40:08 -07:00
