Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 10:56:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59280 commits 74 branches 59 tags 1.2 GiB
Commit graph

2790 commits

Author SHA1 Message Date
Ryan Huffman
18a166bee8 Fix models not settings textures if not loaded 2016-12-16 15:05:17 -08:00
samcake
1ded581895 Merge pull request #9217 from zzmp/feat/render-forward-bounds 
Render bounds in Forward Render Task
 2016-12-16 14:57:14 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Andrew Meadows
ee6a9f4506 adding profile stats relating to avatar CPU costs 2016-12-16 13:41:31 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Zach Pomerantz
013713f92c rm unused scene 2016-12-15 15:21:57 -05:00
Zach Pomerantz
9e05403aba forward render opaque bounds 2016-12-15 14:59:25 -05:00
Zach Pomerantz
bae6ceb2ae rm extra buffer clears in forward render 2016-12-15 14:57:22 -05:00
Brad Hefta-Gaub
25c6e8021f Merge pull request #9198 from zzmp/chmod/render-utils 
Change file permissions of source code to remove execute bits
 2016-12-15 10:37:36 -08:00
samcake
7a29dbe7d4 Merge pull request #9207 from zzmp/feat/render-forward-empty 
Forward render task (empty and only used with RENDER_FORWARD set)
 2016-12-15 09:57:18 -08:00
Zach Pomerantz
87a8ad1289 strip forward render task to clear and blit 2016-12-13 20:48:05 -05:00
Zach Pomerantz
bc59be12ef create flagged forward render task 2016-12-13 19:19:30 -05:00
samcake
0b221abfb2 writting the abs differently 2016-12-13 15:27:50 -08:00
samcake
f509d1fca4 Clening up the fix 2016-12-13 12:48:16 -08:00
Zach Pomerantz
9a37ccbf3c chmod -x to render-utils src 2016-12-13 14:36:41 -05:00
samcake
d4f4bd4519 Debugginfg the bad tiles lighting 2016-12-12 18:02:14 -08:00
sam
2427a16d6e clean up and less changes 2016-12-09 03:05:25 -08:00
sam
914fc7fca8 rewind all the unecessary changes and do just the minimum layout(std140) and accessing the big arrays in vec4s to fix the amd bug 2016-12-09 02:58:09 -08:00
sam
7a97570949 Debugging the amd shader???? 2016-12-09 02:12:31 -08:00
samcake
d851278acd FIx the highlight issue, the gloss 2 is actually roughnees to the power of 4 2016-12-08 15:04:57 -08:00
Bradley Austin Davis
2ca4d0ab29 Fix drop in text rendering quality on texture memory constrained systems 2016-12-05 14:12:57 -08:00
sam
310e26011f Fix the lighting problem at the outline of the shapes, use the depth buffer instead of the Linear depth buffer 2016-12-05 00:47:50 -08:00
samcake
d764eebc79 removing dead code 2016-11-22 12:10:56 -08:00
samcake
dfc0b7beac adressed reveiw comments 2016-11-22 10:15:49 -08:00
samcake
31232a1078 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-21 11:30:26 -08:00
Brad Davis
3074be7ad0 Glow line replacement without geometry shader 2016-11-18 17:42:55 -08:00
samcake
7c003ce865 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-16 19:13:22 -08:00
samcake
9031e65aa5 Merge and fix the bug!!! 2016-11-16 19:12:56 -08:00
Brad Davis
fa841620ab Disable glow line temporarily while fixing implementation 2016-11-16 12:50:47 -08:00
samcake
982664dac5 Merging with upstream 2016-11-15 18:14:25 -08:00
Brad Hefta-Gaub
86430e4121 Merge pull request #8960 from samcake/red-backup-many-stereo-paths 
Introduce Instanced Stereo Drawcall
 2016-11-14 18:30:42 -08:00
samcake
a05e42138c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-14 09:58:12 -08:00
samcake
1d3fc1b647 Fix a bad conversion to integer for negative values of the GRid COordinates 2016-11-10 17:57:11 -08:00
Anthony J. Thibault
620fd3713c Add color support to debug draw marker rendering 2016-11-04 17:09:25 -07:00
samcake
6926cd274c Merge with upstream 2016-11-02 18:15:08 -07:00
samcake
d5f44befc6 Merge branch 'master' of https://github.com/highfidelity/hifi into red-backup-many-stereo-paths 2016-10-31 17:41:07 -07:00
samcake
37b3c96131 fixing the lighting problem in stereo 2016-10-31 17:40:34 -07:00
samcake
9adbb42a6c Fixing the skybox, still issues with the lights 2016-10-28 18:12:39 -07:00
Zach Pomerantz
be23668ca8 delete websurfaces on shutdown 2016-10-28 14:29:52 -07:00
Anthony Thibault
23aa626755 Destroy render scene & engine before Application is destroyed 
Many render items/payloads contain smart pointers back to the
objects that added them to the scene, including entity and avatar
objects. Currently, those render items are destroyed when the
scene is destroyed very late in the application life-cycle.

There are rare crashes that can occur when these render items are
destroyed. Possibly, due to them referencing objects that have
already been destroyed via raw pointers. In an effort to
eliminate these crashes, we now destroy the scene earlier, within
Application::aboutToQuit() which is connected to the
QCoreApplication::aboutToQuit signal.  Also, we guard against null
scene pointer dereferences.  Any location that accesses the scene
off the main thread, now checks the validity of the scene pointer.
 2016-10-25 15:28:37 -07: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
Brad Hefta-Gaub
0e1b377227 Merge pull request #8785 from jherico/oculus_crash 
Additional plugin debugging, better plugin resource cleanup
 2016-10-13 13:54:34 -07:00
samcake
7956c7b10b Fixing a mistake introduced in previous commit in a shader 2016-10-12 09:57:06 -07:00
samcake
5f9c713d44 Merging with upstream after resolving some conflicts 2016-10-12 09:22:12 -07:00
Brad Davis
4e0fffb8b7 Merge pull request #8779 from gcalero/shaders_gl_es 
Adapt shader for GL ES support
 2016-10-12 08:32:50 -07:00
Brad Davis
28771cbda9 Additional plugin debugging, better plugin resource cleanup 2016-10-11 19:40:02 -07:00
samcake
77062ac1b3 Cleaning up a missing constructor and adjusting the stride for the StrucBuffer by default + merging with upstream 2016-10-11 17:13:08 -07:00
samcake
eea5118eab Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-11 16:19:00 -07:00
samcake
7ea790aa4f adding a comment to explain what we are doing 2016-10-11 14:43:41 -07:00
samcake
7af3aa53ac Fixing the key light pass with ambient map 2016-10-11 13:20:32 -07:00
Gabriel Calero
834d9c0710 Adapt shader for GL ES support which requires operators of the same datatype 2016-10-11 12:15:49 -03:00
samcake
297907688c Fixing reveiw comments 2016-10-10 12:43:33 -07:00
samcake
8476939ba9 Avoiding warnings maybe 2016-10-07 16:44:51 -07:00
samcake
429a7cf58a adjust grid dimension to 14 x 14 x 14 conservatively to keep the generation fast 2016-10-07 16:12:36 -07:00
samcake
8a44140e6b cleaning up the comments from review and trying something to adress the issue that showed up on i5 2016-10-07 16:04:19 -07:00
sam
567adf651a FOund 2 bugs causing the empty clusters. now back to working 2016-10-07 05:02:04 -07:00
samcake
ac54533433 Adding more counters to understand the cullign bug 2016-10-06 18:15:32 -07:00
samcake
4504877ba6 Add a finer culling test to avoid faulty discards 2016-10-06 15:14:08 -07:00
samcake
6f7f949343 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-06 09:35:48 -07:00
samcake
765355e5d1 Avoid the debug view by default 2016-10-05 18:30:03 -07:00
samcake
ba88db1b14 Tried many different things to narrow down the issue of the corrupted memory, it seems to be linked to the grid dimendsions somehow, i m now forcing to reassign the frustum grid dimension on the 10th iteration which seems to fix the issue.... 2016-10-05 18:28:19 -07:00
Clément Brisset
3f64847888 Merge pull request #8726 from huffman/feat/model-overlay-hide-change-textures 
Fix model overlay visibility and texture properties
 2016-10-05 11:54:11 -07:00
samcake
8c561eaa44 trying to whipe these buffer cleans but doesn;t seems to make a different in release, it is working clena in debug ... keep on looking 2016-10-04 18:19:42 -07:00
Ryan Huffman
c683c82817 Fix setting textures in model overlays 2016-10-04 16:24:43 -07:00
samcake
3e11eb4129 Try avoiding the basd update of the buffer for the grid content 2016-10-04 13:55:53 -07:00
samcake
1c2a672214 Adjust the grid size for mac 2016-10-04 13:29:08 -07:00
samcake
6aa39ec95a Polish the debugging of the light volumes 2016-10-04 11:03:12 -07:00
samcake
a378a6eccb separate the rendering of the light outline from the main rendering and introduce a way to support both platform 2016-10-03 18:28:44 -07:00
samcake
c72b330821 Simple change to the get cluster interface 2016-10-03 15:34:54 -07:00
sam
bda835361a Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-03 02:54:11 -07:00
sam
deab1db39a FIxed the flickering bug and make a better debuging view to control the overlap 2016-10-03 02:53:41 -07:00
sam
6f2452815c pass the visibility of the enitity to the LightPaylkoad correctly, clean up the ambient shader 2016-10-03 00:08:30 -07:00
Brad Davis
488d191428 Remove all oglplus usage and references 2016-10-02 11:44:34 -07:00
sam
9a492b3a88 refining the voxelizatoion, tracking one bug where light flickers 2016-10-02 03:43:55 -07:00
Brad Hefta-Gaub
7ef8e53d03 Merge pull request #8701 from ZappoMan/getShapeKeyCrashFix 
add guards to getShapeKey
 2016-10-01 20:23:50 -07:00
sam
bd4268ee18 Try to fix the exp2 float version for linux 2016-10-01 17:59:37 -07:00
samcake
bdf2738f21 One more fix for linux build 2016-10-01 17:25:26 -07:00
samcake
89717720f7 CLeaning up code for Linux and Mac 2016-10-01 16:12:45 -07:00
Brad Hefta-Gaub
7fe16442fa make calculateTextureInfo thread safe 2016-10-01 15:47:17 -07:00
samcake
35f0d4b8a2 cleaning for mac 2016-10-01 15:35:59 -07:00
Brad Hefta-Gaub
04f6547940 add guards to getShapeKey 2016-10-01 12:15:03 -07:00
samcake
0475833e3b Friday night state, down to ~3.5ms in hmd 2016-09-30 19:08:00 -07:00
samcake
5b4829e7b6 Brining back support for the ambinet lighting 2016-09-30 16:24:57 -07:00
samcake
337fe155b7 clean up warning and merge with upstream 2016-09-30 11:01:25 -07:00
sam
e143c05ef8 Keep on investigating the shading cost per light 2016-09-30 02:41:21 -07:00
samcake
2a0e67ee2a REvisiting the full lighting code to optimize the perf 2016-09-29 19:06:26 -07:00
samcake
b09151f2a2 Rearrange the light struc description in the shader side, needs the c++ to match now 2016-09-28 18:32:35 -07:00
samcake
cd9dff57be back to normal 2016-09-28 10:03:51 -07:00
samcake
a0862820e6 MOre refinements? 2016-09-27 18:38:15 -07:00
samcake
9b94a025fc Refining the voxelization of the sphere in the view frustum grid 2016-09-26 18:41:53 -07:00
Brad Davis
82db3d5d55 Disable support for framebuffer resizing 2016-09-23 12:04:57 -07:00
Brad Davis
0953027ef3 Identify pre-generated textures 2016-09-23 12:04:56 -07:00
Brad Davis
1ff91219a8 Fix strange artifacts in skybox 2016-09-23 12:04:52 -07:00
samcake
3616a6fc12 Startign implementing the tighter culling for sphere but not done yet 2016-09-14 19:13:53 -07:00
samcake
f789f566e0 Minor fix for compilation 2016-09-14 17:34:17 -07:00
samcake
e0536a84e2 Minor fix for compilation 2016-09-14 17:18:39 -07:00
samcake
fdba78db6f Better vizualization, first set of culling improvment 2016-09-14 16:36:01 -07:00
samcake
af48d4f0bd fetch the cluster content through a function to be able to change the implementation 2016-09-14 09:28:51 -07:00
samcake
c622849481 Splitting the frustum culling test horizontal and vertical 2016-09-13 17:59:06 -07:00
samcake
11c6bb7d80 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-13 17:44:42 -07:00
samcake
124060d31a Cleaning up a bit 2016-09-13 17:44:19 -07:00
samcake
fea5f8b03b best state for now 2016-09-13 16:03:57 -07:00
samcake
e8c2dc10f1 best state for now 2016-09-13 14:59:23 -07:00
samcake
e9bf19840c minor fixes on mac 2016-09-13 08:58:07 -07:00
samcake
efc4406b47 Debugging the grid content 2016-09-12 19:46:18 -07:00
David Rowe
0cf3f6e953 Fix texture count and size getting stuck on 0 2016-09-13 13:03:06 +12:00
David Rowe
fe8b3b4d0d Merge branch 'master' into 21040 2016-09-13 09:12:47 +12:00
samcake
821072bb76 REarrange the light stage construction and light frame usage to produce the light clusters 2016-09-12 11:07:55 -07:00
samcake
7a7a60a5c4 INtroducing a true stage for updating the light cluster and ui to debug 2016-09-11 00:17:34 -07:00
samcake
a0d09e3316 Fixing the vizualisation shader for world to cluster space 2016-09-10 10:14:31 -07:00
samcake
108910052a Adding the reverse transformation 2016-09-09 19:00:54 -07:00
David Rowe
68499f49ad Fix count of textures 2016-09-10 10:15:13 +12:00
samcake
9bcaca0577 Developping the Light Clusters, adding visualization 2016-09-08 19:12:11 -07:00
samcake
61de063b29 Developping the Light Clusters, adding visualization 2016-09-08 18:02:35 -07:00
sam
25616be7c1 introducing the light Clusters 2016-09-08 02:16:13 -07:00
sam
a4df8a84b7 introducing the light Clusters 2016-09-08 00:11:54 -07:00
samcake
6a08c74463 Several experimetations without success 2016-09-07 18:39:07 -07:00
samcake
139ba1b71c REnaming the shaders correctly 2016-09-07 14:56:01 -07:00
samcake
34f40e0828 Creating a separate shader for the locallighting pass 2016-09-06 19:01:13 -07:00
samcake
665a79f100 Creating a separate shader for the locallighting pass 2016-09-06 18:59:26 -07:00
samcake
9bed047b75 Less warnings 2016-09-06 16:42:01 -07:00
samcake
e2a9751cf5 REmove warnings 2016-09-06 16:35:28 -07:00
samcake
1165c54f67 cleaning up the IndexedContainer in its own file and removing warnings 2016-09-06 16:24:03 -07:00
samcake
0c45627d94 CLeaning up the code for the RenderableLightEntityItem 2016-09-06 12:39:48 -07:00
sam
b81dfefbeb pack all the lights in a single buffer and shade the opaque with a single full screen path 2016-09-03 12:08:53 -07:00
samcake
d2a15ca82c Trying to migrate to a light array instead of each individual lights 2016-09-02 17:51:35 -07:00
Anthony J. Thibault
9122a33fff only raise the webEntity virtual keyboard in HMD mode 2016-09-02 16:53:40 -07:00
Brad Hefta-Gaub
8ec5798b7a Merge pull request #8548 from samcake/blue 
Exposing GPU & Batch running time to Engine gpu jobs
 2016-09-02 09:31:09 -07:00
samcake
7b68f1439f Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-02 09:28:35 -07:00
Brad Hefta-Gaub
e3bad8e8f4 Merge pull request #8556 from ZappoMan/renderStats 
add support for renderInfo properties to model entities
 2016-09-02 09:04:56 -07:00
samcake
e72791233d overall clean up of th elocal light drawing to avoid the in/out pipeline case, still seeing big cost on gpu from the spot lights 2016-09-01 18:08:36 -07:00
samcake
0c0109e427 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-01 15:20:34 -07:00
samcake
96935504a1 Streamlining the lighting phase for better performances 2016-09-01 15:20:14 -07:00
samcake
a537f40158 Moving to a simpler lighting shader 2016-09-01 12:10:15 -07:00
samcake
354cbbc927 Investigate why the disable depth Bclamp doesn't work 2016-08-31 19:14:35 -07:00
Stephen Birarda
65c1edfb1c add missing link from render-utils to entities 2016-08-31 16:57:52 -07:00
Brad Hefta-Gaub
e1845e2c3f add support for renderInfo properties to model entities 2016-08-31 15:00:21 -07:00
Stephen Birarda
7c2fea4598 remove glew/oglplus requirement for android interface 2016-08-31 11:03:53 -07:00
samcake
47aaed491d Merging with Blue 2016-08-30 17:06:29 -07:00
samcake
93aec28c7b Less warning 2016-08-30 14:54:58 -07:00
samcake
af68a2550e Remve dead code 2016-08-30 14:53:37 -07:00
samcake
faef8a9930 Adding the timing for GPU support with a simpelr JobConfig 2016-08-30 12:22:21 -07:00
samcake
3755a3fc32 Add batch timing information vs gpu 2016-08-29 17:54:17 -07:00
samcake
4bf93f66df Cleaning up the lights and the light stage 2016-08-26 17:47:20 -07:00
Brad Hefta-Gaub
9801ff075a Merge pull request #8433 from samcake/hdr 
Fix Screen Space ambient occlusion which was broken since a while
 2016-08-25 16:57:24 -07:00
Brad Hefta-Gaub
10c465f591 Merge pull request #8525 from hyperlogic/bug-fix/web-entity-rendering 
Improved web entity rendering
 2016-08-25 16:49:00 -07:00
samcake
8cc65ea965 Adrressing review issues 2016-08-25 16:31:42 -07:00
samcake
09a70740a8 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-25 15:21:41 -07:00
samcake
9669234f9c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-25 12:36:01 -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
Andrew Meadows
c337cc92e5 remove crufty comment 2016-08-25 08:51:53 -07:00
Andrew Meadows
b95cb566cd fix collision mesh for non-trivial registration 2016-08-24 22:26:56 -07:00
Andrew Meadows
19cd4648ad scale collision render mesh correctly 2016-08-24 22:26:56 -07:00
Andrew Meadows
2f16aca114 remove cruft and fix typo in rebase 2016-08-24 22:26:56 -07:00
Andrew Meadows
68dd66daec create collision render geometry only when needed 2016-08-24 22:26:56 -07:00
Andrew Meadows
b0a0293e6e move compoundResource out of Model class 2016-08-24 22:26:56 -07:00
Andrew Meadows
fe4198530f don't render raw compound collision geometry 2016-08-24 22:26:56 -07:00
Andrew Meadows
329c5432ed _showCollisionHull --> _showCollisionGeometry 2016-08-24 22:26:56 -07:00
Andrew Meadows
481d6990a3 trigger collision shape render mesh creation 2016-08-24 22:26:56 -07:00
Andrew Meadows
26f5d3cfaa fix render geometry for collision shapes 2016-08-24 22:26:56 -07:00
Andrew Meadows
6b0ae654ba cleanup logic around creating RenderItems 2016-08-24 22:26:56 -07:00
Andrew Meadows
d8fa0d1dd1 segregateMeshGroups() --> createRenderItems() 2016-08-24 22:25:45 -07:00
Andrew Meadows
726928c14c creae collision Geometry from mesh 2016-08-24 22:25:45 -07:00
Brad Davis
c5628b615c Make sure we start fade in once an item becomes ready 2016-08-24 16:05:22 -07:00
samcake
4da712fbdf Fixing bad include not respecting filename case (for linux) 2016-08-22 10:36:43 -07:00
samcake
44c6637160 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-22 10:32:06 -07:00
sam
1e84f9dc90 back to noise seeded in image space 2016-08-21 23:37:24 -07:00
sam
4097fcb0f6 fixing the blurring issue 2016-08-21 00:27:43 -07:00
Seth Alves
9bcda1bb45 merge from upstream 2016-08-20 15:25:04 -07:00
samcake
9cdd079213 And again 2016-08-19 18:22:14 -07:00
samcake
6a076bcee4 PRoviding a fix for the macOS build 2016-08-19 11:09:12 -07:00
samcake
a4945fe45c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-19 10:00:40 -07:00
Brad Hefta-Gaub
1cec7b2db0 Merge pull request #8429 from SamGondelman/loadingFade2 
Don't do fade effect once physics kick in
 2016-08-18 12:46:24 -07:00
samcake
b5296410c3 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-18 10:20:33 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
samcake
8d12a23efb Merge pull request #8325 from jherico/deferred_batches_threaded 
Threaded rendering
 2016-08-15 09:59:44 -07:00
Brad Davis
fdbbd70eed Merge pull request #8422 from sethalves/sidestep-linux-gcc-bug 
sidestep linux gcc linker? bug
 2016-08-13 12:08:05 -07:00
Brad Davis
574737fbb5 More GPU api fixes, protect Buffer::flush 2016-08-12 22:29:04 -07:00
Brad Davis
6d7edd38cc Rename clearViewTransform 2016-08-12 22:28:59 -07:00
Brad Davis
cbe1f6dbf5 Allow the lighting framebuffer to use the camera correction to stabilize lights in the HMD 2016-08-12 22:28:32 -07:00
Brad Davis
894d29bb29 Fixing flicking in instance based objects 2016-08-12 22:28:24 -07:00
Brad Davis
adcfd55cc0 Batch replay reprojection 2016-08-12 22:28:23 -07:00
samcake
b90e0cfd89 Fixing the stereo issue 2016-08-12 19:18:05 -07:00
SamGondelman
ccca6d935f don't fade after physics kick in 2016-08-12 14:35:22 -07:00
samcake
4fe67bfbf1 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-12 10:56:59 -07:00
Seth Alves
77a49e6c10 when building in debug mode on Linux, for reasons totally beyond me, this code ends up using the Vertex from FBXReader_Mesh.cpp (which is a different size so I get a crash). This change hopefully doesn't change any functionality while sidestepping what's probably a bug in gcc. 2016-08-12 10:01:20 -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
9e20d92241 CR changes 2016-08-10 10:35:18 -07:00
SamGondelman
9b27f8bc0f Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-09 14:55:14 -07:00
SamGondelman
36d9f92101 performance optimization to minimize calling usecTimestampNow 2016-08-09 13:10:02 -07:00
SamGondelman
ae9fb3768c CR notes 2016-08-08 17:45:25 -07:00
samcake
4d3dce449f Better maybe 2016-08-08 17:28:04 -07:00
Ryan Huffman
6854f9fda4 Remove stars shaders and renderable 2016-08-08 16:03:03 -07:00
SamGondelman
de900e85c0 remove duplicate include 2016-08-08 14:10:47 -07:00
SamGondelman
328d3128fa merge from master 2016-08-08 13:30:39 -07:00
SamGondelman
f311907982 fix merge mistake 2016-08-08 11:08:01 -07:00
Ryan Huffman
2a071c4329 Fix improperly formatted floats 2016-08-08 10:39:06 -07:00
Ryan Huffman
4f9be2ae72 Fix camera position not being set for angular loading 2016-08-08 08:53:06 -07:00
Ryan Huffman
77e993510e Cleanup implementation of angular loading 2016-08-08 08:53:05 -07:00
Ryan Huffman
c594dcdf9f Add priority loading for model entities 2016-08-08 08:52:29 -07:00
sam
db8bf78dd1 Good state 2016-08-08 02:28:25 -07:00
sam
e6c74b29c7 WTF... 2016-08-07 19:48:23 -07:00
sam
b133556c14 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-07 18:55:44 -07:00
sam
d1105b8102 Still trying 2016-08-07 18:10:03 -07:00
sam
e92e69d963 More changes 2016-08-06 11:54:54 -07:00
SamGondelman
dd51e0e38f merge from master 2016-08-05 17:04:45 -07:00
SamGondelman
771e105fa2 Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-05 16:52:01 -07:00
Sam Gondelman
debda37567 Merge pull request #8379 from SamGondelman/loadingFade 
fixed procedural entity fade
 2016-08-05 16:48:51 -07:00
SamGondelman
b794259b7d fixed procedural entity fade 2016-08-05 16:15:10 -07:00
Sam Gondelman
84b7f9b186 Merge pull request #8375 from SamGondelman/loadingFade 
remove polyvox fade, fix web fade, add light fade
 2016-08-05 11:53:15 -07:00
SamGondelman
8494400047 don't use web entity texel color alpha as per tony's suggestion 2016-08-05 11:27:56 -07:00
SamGondelman
130e64aaba remove polyvox fade, possibly fix web fade 2016-08-05 10:36:48 -07:00
Brad Hefta-Gaub
83280aa3f2 implement support for updating the render items of models when they finish their fade 2016-08-05 10:11:07 -07:00
sam
e96fd92f32 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-05 09:28:45 -07:00
sam
92c0fa2e7a Testiung more variations 2016-08-05 09:26:48 -07:00
SamGondelman
b6e73e06a2 merge from master 2016-08-04 13:34:38 -07:00
Seth Alves
905c6147cf Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails 2016-08-04 09:56:32 -07:00
SamGondelman
d7052f6250 try to make text entities fade 2016-08-03 16:27:51 -07:00
SamGondelman
7713c1f4bf try to fade in web entities 2016-08-03 15:56:41 -07:00
samcake
b4e5b60656 fixing ao 2016-08-03 15:45:22 -07:00
Anthony J. Thibault
f24c92f3a1 Bug fix for avatar debug marker rendering. 
"Developer > Hands > Show Hand Targets" works again
"Developer > Avatar > Draw Position" works again
 2016-08-03 15:43:31 -07:00
SamGondelman
27bacc9165 try to fade in procedural shapes 2016-08-03 14:33:05 -07:00
SamGondelman
2eb0c7735f working on fading shape entities 2016-08-03 13:30:05 -07:00
Seth Alves
c743cf379e use loadCollisionModelURLFinished when collisions model is finished 2016-08-03 11:31:51 -07:00
Seth Alves
ad4fc8c656 merge from upstream, don't hold up enabling of physics if a collision hull fails to load 2016-08-03 10:42:15 -07:00
SamGondelman
d63a0ef08f working on making other entities transparent 2016-08-02 18:09:42 -07:00
Stephen Birarda
5d3e125a06 make failed geomtetry request not hold physics 2016-08-02 16:32:41 -07:00
SamGondelman
5de21982be fix linux build 2016-08-02 11:44:17 -07:00
SamGondelman
ad5dec829c why did I change that 2016-08-02 10:52:51 -07:00
SamGondelman
3d08502080 space 2016-08-02 10:50:57 -07:00
SamGondelman
74f11eb70b try a different easing function 2016-08-02 10:50:31 -07:00
samcake
4ec971b449 MOre debugging 2016-08-01 23:17:32 -07:00
SamGondelman
0b5c7909b8 a calculated change 2016-08-01 18:45:25 -07:00
Seth Alves
b953e6f0ff when an avatar URL fails, switch to the default 2016-08-01 18:12:30 -07:00
SamGondelman
6154aaddda try to fix linux build 2016-08-01 16:19:03 -07:00
SamGondelman
ae0b9ea9a3 fade wireframes 2016-08-01 15:26:04 -07:00
SamGondelman
313ba87fce fade on texture load 2016-08-01 14:47:20 -07:00
SamGondelman
217a102926 working on loading fade 2016-08-01 13:15:55 -07:00
samcake
3ca1cdd645 Merging with master 2016-08-01 12:42:33 -07:00
samcake
beb42332ef save the current state of adding debug and evolving the ao job 2016-07-31 16:05:25 -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 Thibault
be6e401e9a Merge branch 'master' into bug-fix/web3doverlay-rendering 2016-07-28 11:20:35 -07:00
Anthony Thibault
6b8e912114 Fix for mac and linux builds 2016-07-28 10:02:19 -07:00
samcake
afb1ebf42e Revolutionizing ao 2016-07-26 23:19:41 -07:00
Bradley Austin Davis
fa20898285 Remove last direct use of gpu::Context::render() 2016-07-26 16:13:22 -07:00
Bradley Austin Davis
bb6abf11d3 FramebufferCache, cleanup & thread safety 2016-07-26 15:32:31 -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
Chris Collins
e1e1ca1c12 Merge pull request #8306 from AndrewMeadows/fix-crash-on-avatar-change 
fix interface crash when chaning avatar models
 2016-07-25 12:11:46 -07:00
Chris Collins
3c9b9aef4f Merge pull request #8304 from ChristophHaag/fixGridShader 
fix grid shader
 2016-07-25 09:47:12 -07:00
Andrew Meadows
d876251f1e release geometry refs in Model::deleteGeometry() 2016-07-24 19:17:39 -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
Christoph Haag
7134d2bfd4 fix grid shader 
this shader is used for example in
developer - audio - audio scope - show scope
 2016-07-23 11:09:16 +02:00
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui 
Edit model dialog improvements
 2016-07-22 17:11:52 -07:00
samcake
1c4742e710 Fixing comments from review 2016-07-20 11:02:27 -07:00
Andrew Meadows
2afd65467a fix bug where model is not yet ready for col shape 2016-07-19 18:01:22 -07:00
samcake
8f663f20e0 FIx warnings 2016-07-19 13:24:03 -07:00
samcake
7f169b8e4f Adjust qml positions and fix one shader bug 2016-07-19 13:20:19 -07:00
samcake
3e7126f5be Removed reference to LIghtingModel.slh in teh DefereedBufferWrite.slh to avoid side effects 2016-07-19 13:06:26 -07:00
samcake
4742f40128 Separating the normal packing into it s own file and make sure to sclae the filter radius correctly dpeending on the resolution of diffusion 2016-07-19 12:23:57 -07:00
samcake
36d58a2b82 Finish the integration of the diffusion pass in the SurfaceGeometryPass job, clean up ui 2016-07-19 10:34:06 -07:00
samcake
ff132fa712 Gathering the diffusion passes in the SUrfaceGEometryPAss job 2016-07-19 02:11:22 -07:00
samcake
a8dd06ad38 Better groupint of the diffuseion of the curvature for easier fix for mini mirror 2016-07-18 19:24:43 -07:00
samcake
34f2a96888 Adding the check for Obscurrance 2016-07-18 18:11:51 -07:00
samcake
80587ca8a3 using the textureGather lookup 2016-07-18 12:52:21 -07:00
samcake
be4839d46c a better depth filter 2016-07-18 12:26:04 -07:00
samcake
a4ad4659c4 Fixing build warnings 2016-07-18 11:17:06 -07:00
samcake
a44aee84ce Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 10:16:55 -07:00
samcake
86d9ee56d2 Downsampling shader pass 2016-07-18 03:56:11 -07:00
samcake
5a0ce81516 Performing the curvature generation and diffusion at half the resolution 2016-07-18 03:54:05 -07:00
samcake
378f4576fa a bit better making the curvature and diffusion passes 2016-07-17 20:18:06 -07:00
samcake
cfa51ae1f5 REmoving problematic timers for mac 2016-07-17 18:32:43 -07:00
samcake
9332f82d54 Carrefully improving the curvature generation performances 2016-07-17 17:13:07 -07:00
samcake
744474982d Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-17 13:28:03 -07:00
Brad Davis
03cb6175ab Support triangle and hexagon shapes, add shape support to overlays. 2016-07-15 22:02:17 -07:00
samcake
076b8cd297 Instrumenting the GPU git status 2016-07-15 17:47:54 -07:00
Brad Davis
b31300406a Don't extend glow line length 2016-07-15 16:20:05 -07:00
samcake
22ac95d463 REvisiting the RangeTimer to measure the real gpu duration 2016-07-15 09:12:16 -07:00
samcake
d69be5e4d2 Fixing the default value for the lightingMOdel flag when using debugDeferredLighting 2016-07-14 16:45:56 -07:00
samcake
776bcb6655 FIxing the web entity rendering 2016-07-14 15:49:49 -07:00
Zach Pomerantz
e4dabc6be4 fix task config initialization 2016-07-14 13:16:19 -07:00
samcake
3ab56062d4 Address some warnings and syntax issues 2016-07-14 12:06:02 -07:00
samcake
a42f9a5d0e FIxing the mini mirror perf issue and the gamma correction 2016-07-14 10:53:13 -07:00
samcake
b9a2b2778e Adding the support for the subregion in the blur passes to apply it correctly to mini mirror 2016-07-13 18:53:37 -07:00
samcake
f6671b34fa Fix the transformation problem for rendering the mini mirror (scattering is still screwed though) 2016-07-13 18:26:53 -07:00
samcake
219b41e813 Fix the mini mirror perf issue and improve the debugDeferredLighting script 2016-07-13 17:37:35 -07:00
Andrew Meadows
3e43859139 setCollisionModelURL() more symmetric with setURL() 2016-07-13 15:13:35 -07:00
Andrew Meadows
4bebb682dc namechange: fetchResource --> getGeometryResource 2016-07-13 15:13:35 -07:00
Andrew Meadows
9f7d2cf263 NetworkGeometry --> GeometryResourceWatcher 
Model class gets render and collision geometries with watchers
also changed names for readability
 2016-07-13 15:00:12 -07:00
Andrew Meadows
f6681d4b3d remove unused cruft 2016-07-13 15:00:12 -07:00
samcake
8acc18ae8b Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-13 11:42:07 -07:00
samcake
307243da8b cleaning compilation warnings and tuning the FBX material mapping pass 2016-07-13 11:04:53 -07:00
samcake
2c584f7690 Fixing a bad autoRef usage 2016-07-13 10:34:43 -07:00
samcake
9f91dd5bfc Cleaning the gpu-test app to work with the new deferred pipeline 2016-07-13 10:19:42 -07:00
samcake
51594fefa2 more clean up 2016-07-12 18:21:31 -07:00
Brad Hefta-Gaub
819cab4aab Merge pull request #8158 from sethalves/raypick-avatars 
Raypick avatars
 2016-07-12 15:27:30 -07:00
samcake
cde17ecaab Clenaing the rendering and the framebuffer allocations 2016-07-12 14:34:54 -07:00
samcake
504e9f154c Less comments 2016-07-12 09:18:02 -07:00
samcake
e0993c593b BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore 2016-07-11 18:34:18 -07:00
samcake
ba7590712a BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore 2016-07-11 18:33:57 -07:00
samcake
0e99a4ac97 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-11 10:49:28 -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
samcake
2fbdb22493 Cleaning up the lighting with the simpler approach where emissive and lightmap is displayed on forward 2016-07-08 18:14:05 -07:00
Seth Alves
5c69e55475 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-08 17:43:52 -07:00
Brad Davis
ae1dd29a7a Fix depth writing for glow lines 2016-07-08 10:27:53 -07:00
samcake
37f7596183 Trying to unify the shaders with/without scattering eve more but found a scribe bug. REnder emissive and lightmap during forward pass 2016-07-08 09:04:10 -07:00
samcake
fff2a9a5a2 REfactoring the shading functions interface to account for scattering 2016-07-07 21:16:28 -07:00
Brad Davis
c644c87e69 Fix glow line vanishing, improve transparency interaction 2016-07-07 19:01:41 -07:00
Seth Alves
11542aeca2 pick against avatar's capsule and then against the T-pose mesh 2016-07-07 16:36:25 -07:00
samcake
5827993125 Fixing warnings 2016-07-07 16:30:10 -07:00
samcake
1eb4acf815 Unifying the lighting pass for scaterring and not 2016-07-07 15:41:00 -07:00
Brad Davis
8ca3630cfa Support glow effect in 3D line overlays 2016-07-07 13:36:48 -07:00
samcake
8f2bf2b423 Integrating the scattering to the local lights 2016-07-06 17:13:16 -07:00
samcake
66b65391a4 Cleaning up the lighting equations 2016-07-05 18:21:49 -07:00
Seth Alves
5ab82cd7c8 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars 2016-07-02 15:11:59 -07:00
samcake
2a52f1db7f Adding the lighting model class to configure accross the jobs the lighting 2016-07-01 18:36:51 -07:00
samcake
9281b28d43 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-01 13:39:12 -07:00
samcake
9a604d0ede Bringing Beckmann specular to the lighting 2016-06-30 19:03:24 -07:00
Brad Davis
b7926b8582 Don't render wire geometry with lighting effects 2016-06-30 16:11:05 -07:00
samcake
ab21a5a5d5 FIxing the bad brdf and adding better debug tool and better Pipeline architecture 2016-06-29 18:59:06 -07:00
Seth Alves
5f9c7b6ea5 trying to take joint information into account when raypicking against models 2016-06-29 17:02:49 -07:00
Seth Alves
d53c7ae5d8 experimenting 2016-06-29 12:39:04 -07:00
samcake
7f5e22d0eb Post tuesday review, clean up 2016-06-28 17:20:24 -07:00
samcake
d128af48db Fix the curvature issue in stereo by evaluating in the mono clip space, not stereo. INtegrate the scattering in simple ambient without IBL 2016-06-28 13:47:55 -07:00
samcake
197d49fc03 introducing the depth aware blur 2016-06-27 17:04:37 -07:00
samcake
9bc8441c73 Friday night build, working on getting the LUT generated on the GPU 2016-06-24 17:50:43 -07:00
samcake
a619a142ed Friday night build, working on getting the LUT generated on the GPU 2016-06-24 17:48:40 -07:00
samcake
ec68eba3cb Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-24 09:37:52 -07:00
samcake
e95a31f760 CLeaning up and debugging the splotch 2016-06-24 09:18:04 -07:00
samcake
884b9211c6 Curvature is looking correct now without artefact, moving on to the lighting 2016-06-23 17:13:48 -07:00
samcake
3ec14fd746 MErging and still trying to understand the curvature isssue 2016-06-22 18:06:55 -07:00
samcake
bd28498833 trying to fix the curvature artefact 2016-06-21 18:25:02 -07:00
samcake
0c882832bf Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now) 2016-06-20 17:58:35 -07:00
Andrew Meadows
5d5dc2837b fix comment 2016-06-20 17:29:20 -07:00
samcake
37a6d29406 Finally clean the lighting pass for global and local lights, split it into global and locals and make it work with the stereo single drawcall 2016-06-17 17:19:49 -07:00
samcake
904efc8076 SPlitting appart the DeferredLIghting Effect 2016-06-17 09:31:32 -07:00
samcake
350f06465d Introducing the deferredFRameTransform to DeferredLighting Effect and simplifying the rendering! 2016-06-16 18:28:08 -07:00
samcake
40a4e72f73 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-15 15:14:19 -07:00
samcake
e31a3b4d08 After trying stop trying to expose a generic [] operator on Varying and Containers 2016-06-15 15:13:51 -07:00
samcake
42eaaf742d Protoype done 2016-06-14 18:29:06 -07:00
samcake
8858f9dc82 IUse the light stage finally for the scattering prototype 2016-06-14 09:54:51 -07:00
Brad Davis
196ab401e5 Merge pull request #8046 from SamGondelman/proceduralRaymarch 
Exposed orientation and eye position to procedural entity shaders
 2016-06-14 09:48:07 -07:00
samcake
414c43c012 Current state 2016-06-13 19:10:50 -07:00
samcake
f69c72f984 Fixing the VaryingPair problem 2016-06-13 10:44:31 -07:00
samcake
6a5dff06c4 Pushing a shitty state where the pairs of Varyings don;t get copied correctly 2016-06-13 09:46:24 -07:00
samcake
c325cc50dd Adding the depth aware blur 2016-06-11 18:54:22 -07:00
samcake
28886f6ec3 Many improvments 2016-06-10 17:18:12 -07:00
SamGondelman
8a682450a9 still trying to fix cmake errors 2016-06-10 17:01:22 -07:00
samcake
6831710efb Adding the deawSCattering pass 2016-06-09 19:13:28 -07:00
samcake
75a2864845 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-09 14:36:28 -07:00
samcake
0b873365ed save current state 2016-06-09 14:35:44 -07:00
samcake
7bd686167e Adding the generation of the Scattering on GPU 2016-06-09 09:33:03 -07:00
samcake
e69022285e A lot more stuff to try to see the skin scattering 2016-06-08 18:58:50 -07:00
Brad Hefta-Gaub
262e0262fc Merge pull request #7889 from samcake/color 
add support for ambient occlusion texture and lightmap texture for fbx exported from Blender
 2016-06-08 17:38:45 -07:00
samcake
75a5f6bd89 Intoducing the bluring as a separate Job reusable and the first version of curvature 2016-06-07 18:13:40 -07:00
samcake
8d90570f72 Correcting the Z sign 2016-06-06 09:29:50 -07:00
samcake
0ea1e7c6b5 Adding acleaner way to do all the deferred frame transform manipulation 2016-06-03 19:29:48 -07:00
Andrew Meadows
c73757f740 use many colors for collision hull rendering 2016-06-03 10:47:54 -07:00
samcake
079f6af2cc Fixing the gamma correction for the debug view of occlusion 2016-06-02 16:14:46 -07:00
samcake
2489df8229 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-06-02 15:16:41 -07:00
samcake
25eb569433 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-06-02 10:38:40 -07:00
samcake
1dca62f752 Introducing a new technique for normal packing and fixing a bug on the normal buffer format 2016-06-01 17:51:53 -07:00
samcake
3fe9b67e45 FIxing the reflection jittering by moving the normal into world space 2016-05-27 19:24:56 -07:00
Andrew Meadows
1132b4666a Merge pull request #7975 from jherico/shared_shapes 
Moving shape definition to a shared location
 2016-05-27 07:28:11 -07:00
Brad Davis
2c02c963d4 Moving shape definition to a shared location 2016-05-26 12:22:39 -07:00
Brad Hefta-Gaub
06cb625d09 Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision 
Improved Avatar Mixer Rotation Precision
 2016-05-25 17:14:12 -07:00
samcake
b76cda3c89 Merge pull request #7945 from Geenz/20901 
20901: Add Range Based Light Attenuation
 2016-05-25 16:39:01 -07:00
Brad Hefta-Gaub
b8b39b962d Merge pull request #7868 from jherico/entity_shape 
Add a generic shape primitive
 2016-05-24 08:40:58 -07:00
Anthony J. Thibault
a1c32f8c44 Merge branch 'master' into tony/improved-avatar-mixer-precision 2016-05-23 10:24:52 -07:00
Geenz
bd6f6d2eef Typo. 
Not quite sure how this got here.
 2016-05-23 09:53:22 -04:00
Brad Davis
2c703e963c More shapes 2016-05-22 19:48:59 -07:00
Geenz
ff3fca3dc3 Remove no longer necessary light vector parameter. 2016-05-22 21:50:48 -04:00
Brad Davis
cd1e910844 Add a generic shape primitive 2016-05-21 23:46:44 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Geenz
a80f47e550 Merge remote-tracking branch 'highfidelity/master' into 20901 2016-05-20 21:12:42 -04:00
Brad Hefta-Gaub
95f7ea5609 Merge pull request #7922 from samcake/red 
improve performance of Light volume pass
 2016-05-20 09:33:55 -07:00
Geenz
6ecbdc6b9a Modify evalLightAttenuation to "fade" edges of lights. 
This provides a more attractive light falloff around the bounds of a
light - removing harsh edges.

This also adds a new parameter to evalLightAttenuation - the
unnormalized light vector.
 2016-05-19 20:03:05 -04:00
samcake
2d7118dacc clening up the code 2016-05-19 10:21:00 -07:00
Zach Pomerantz
e1971f5ed3 Fix shadow bounds checking 2016-05-18 18:58:28 -07:00
samcake
185f069441 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-05-18 13:16:14 -07:00
samcake
89f18aee3b Simplifying the deferredbuffer clear and enableing z test for lighting pass 2016-05-18 13:14:42 -07:00
samcake
8ec280535b FIx bad roughness value read from the deferred buffer 2016-05-17 11:13:34 -07:00
samcake
d06c6e2a59 Fix forgotten vertex shader case 2016-05-16 17:54:42 -07:00
Anthony J. Thibault
55b0060df9 Convert JointData from relative frame to absolute. 2016-05-16 17:48:52 -07:00
samcake
a12e56f880 Fix forgotten vertex shader case 2016-05-16 17:43:54 -07:00
samcake
c1fa096e78 adding texcoord 1 on all the material/model and go fetch occlusion map with this uv instead of texcoor0. this allow for separate transforms just for occlusoin map 2016-05-16 15:42:48 -07:00
Brad Hefta-Gaub
1f800294c6 Merge pull request #7880 from jherico/gpu_smart_buffers 
Support partial CPU->GPU buffer transfers
 2016-05-14 17:44:26 -07:00
Brad Davis
1e136ed71f Fix procedural rendering on primitives 2016-05-14 10:59:59 -07:00
Brad Davis
9509e32928 PR feedback 2016-05-14 08:28:51 -07:00
Brad Hefta-Gaub
e754b9e19c Merge pull request #7871 from samcake/hdr 
Defaulting the color formats used in the rendering pipeline to sRGB
 2016-05-13 17:35:48 -07:00
Brad Davis
85272a87ba Merge pull request #7859 from samcake/lemon 
Introduce the "Unlit" shading model support and apply it to Web Enitities
 2016-05-12 15:09:50 -07:00
samcake
d5a9d39edf Defaulting the color formats used in the rendering pipeline to sRGB 2016-05-11 18:01:19 -07:00
samcake
1ec9ef560e Fixing the srgb color format conversion for web entities 2016-05-11 10:46:54 -07:00
samcake
e40a795a27 Trying to clean up for pr 2016-05-10 19:25:22 -07:00
Anthony J. Thibault
80a349c65b Merge branch 'master' into tony/improved-avatar-debug-draw 2016-05-10 14:50:13 -07:00
samcake
303cade547 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-10 09:56:05 -07:00
samcake
00f2e34aa9 Changing emissive to unlit 2016-05-09 17:18:07 -07:00
samcake
615f4028c4 fixing the web enitites lighting, still need to solve the sRGB for it, starting to introduce the unlit feature to the overlays 2016-05-09 17:17:16 -07:00
Anthony J. Thibault
641e152699 Eye tracking bug fix and debug rendering improvement 
* Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head.
* DebugDraw: added drawRay method.
* Application: Renamed preRender to postUpdate
* AvatarManager: added postUpdate method that iterates over all avatars.
* MyAvatar: Renamed preRender to preDisplaySide
* MyAvatar: split preRender code into postUpdate and preDisplaySide.
* Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw.
* Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking.
* "Show Look at Vectors" now draws the right eye red and the left eye blue.
* Removed Avatar and MyAvatar renderBody
* Removed look at rendering from head.
* GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal
 2016-05-08 16:20:32 -07:00
samcake
a8347cac6e Getting the unlit to work from the pipeline, and found the isLinear for texture bug! 2016-05-06 18:36:55 -07:00
Andrew Meadows
71b2d647e8 add locks and explicitly copy ViewFrustums 2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074 use references not pointers for ViewFrustums 
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
 2016-05-05 18:28:27 -07:00
Andrew Meadows
60a72c6660 getViewFrustum() provides const pointer 2016-05-05 18:28:27 -07:00
samcake
e306a24a1b INtroducing the unlit mode for fragments 2016-05-05 17:08:52 -07:00
samcake
f1b236f3be adding the DeferredBUfferRead.slh 2016-05-04 18:51:35 -07:00
samcake
2d573963bb Introducing the unlit material 2016-05-04 18:50:52 -07:00
Brad Hefta-Gaub
bbf358f81d Merge pull request #7796 from samcake/blue 
Improve Translucent shapes global lighting with support for the ambient map reflection
 2016-05-03 11:14:06 -07:00
Geenz
85e0620261 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-04-30 15:40:28 -04:00
samcake
257c8c94c3 clean up the lighting function and put the global specular lighting in a separate function 2016-04-29 10:58:55 -07:00
samcake
88f816fab4 Adding reflection of the ambient map for translucent 2016-04-28 18:18:18 -07:00
samcake
4202e60ac3 trying to add the skymap on translucents 2016-04-26 18:20:15 -07:00
Geenz
bf31fc728a And another. 2016-04-26 18:54:02 -04:00
Geenz
ef7098b39a Missed a few. 2016-04-26 17:12:04 -04:00
samcake
5cb346330b Merging with master 2016-04-25 18:48:58 -07:00
Chris Collins
9bd9de5710 Merge pull request #7636 from samcake/red 
Stereo drawcall amplification
 2016-04-22 15:46:18 -07:00
samcake
43caca901f Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-04-22 10:57:14 -07:00
samcake
fd3efa37e3 Cleanup the shaders to avoid any uniform in genral, fixed a bug woith the emissive params applied twice for model_lightmap.slf 2016-04-22 10:56:21 -07:00
samcake
5a67411d75 Removing separate uniforms for the texcoord transforms and lightmap params, shader still failing 2016-04-21 18:35:37 -07:00
Ryan Huffman
f90e1aaa23 Remove #line from starsGrid.slf 
Fails to compile with certain drivers.
 2016-04-20 15:04:10 -07:00
Brad Davis
882267e08f Merge pull request #7709 from samcake/blue 
Introduce Shader Compilation versions
 2016-04-19 11:14:22 -07:00
samcake
21b0341e50 REmoving extra cruff 2016-04-19 10:51:44 -07:00
samcake
265f6f1275 Updating & Merging with master 2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
5d550197bd Merge pull request #7697 from samcake/orange 
Introduce a simple state sort for drawing opaque items
 2016-04-19 08:41:49 -07:00
Brad Hefta-Gaub
c41b320d40 Merge pull request #7706 from zzmp/fix/text3d-font 
Fix text3d to allow transparent text
 2016-04-19 07:50:36 -07:00
samcake
85fd1dcb5b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-04-18 18:25:16 -07:00
samcake
cadb53b703 Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more 2016-04-18 18:24:27 -07:00
Zach Pomerantz
2d9dcc8595 Fix text3d to allow transparent text 2016-04-18 16:02:45 -07:00
samcake
ca720efce6 Exposing the timing of the jobs by default 2016-04-18 14:53:06 -07:00
samcake
3887dfdf34 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-04-18 11:52:45 -07:00
samcake
88c58cc276 Adding the simple state sort to draw opaque deferred 2016-04-18 10:51:31 -07:00
samcake
0531f90675 Adding state sorting for free 2016-04-18 00:22:05 -07:00
samcake
298300e42f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-15 14:16:02 -07:00
Zach Pomerantz
2e4e1dd590 Fix leaking Font 2016-04-14 17:00:23 -07:00
samcake
7653fa2c37 Fixing the resize of framebuffer to avoid reassigning the render buffer every frame 2016-04-13 10:56:29 -07:00
samcake
e9a0365454 Removing an include not needed 2016-04-13 00:16:04 -07:00
samcake
ab9f41f5eb Trying something a bit more radical for timing 2016-04-12 15:29:31 -07:00
samcake
042a419669 Adding counters, not sure they are really useful or that this is the best way to do this... 2016-04-12 02:44:10 -07:00
samcake
816a35099a Adding tcpu timer on some jobs 2016-04-11 18:34:52 -07:00
samcake
90fd9d77a5 Merging with Master 2016-04-11 18:34:14 -07:00
samcake
8964c2427d adding support for the 2 versions of the shaders nad solving the mapping of uniforms that arise with it 2016-04-08 18:47:21 -07:00
samcake
2f8d30e7ce Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-08 09:34:55 -07:00
howard-stearns
5284af6b51 Update text3d shader post pbr. 2016-04-06 12:15:19 -07:00
samcake
d3a87f8db2 need to merge, commiting at a broken state 2016-04-04 18:25:23 -07:00
Anthony Thibault
865a77ae20 Model: fixed two crash issues when changing avatars 
* When the GeometryReader has the last ref to the GeometryResource ptr
  It needs to hold on to the reference until invokeMethod is completed.
  Otherwise, invokeMethod will call a method on a deleted object, leading
  to memory corruption or crashes.

* When the Model URL is changed, the clusterMatrices are invalided and the
  RenderItemsSets are cleared.  However, there still might be renderItems in
  the scene pending changes list that might refer to those RenderItems and their
  clusterMatrices.  We need to guard against this access to prevent reading from
  memory that was previously freed.

Both of these issues were uncovered using the [avatar-thrasher](https://gist.github.com/hyperlogic/d82a61d141df43d576428501a82c5ee6) test script.
 2016-04-02 21:48:22 -07:00
Anthony J. Thibault
5e81cccc6c Merge branch 'master' into tony/culling-fixes 2016-04-01 09:29:46 -07:00
Anthony J. Thibault
d670853941 AnimDebugDraw: enable bound now that culling works. :) 2016-03-31 16:10:04 -07:00
Anthony J. Thibault
bc967f0ab0 Model: update renderItems when items are added to the scene. 
* Renamed enqueueLocationChange to updateRenderItems
* Call updateRenderItems when models are added to the scene.

This will fix entity render bounds being incorrect when they are first added to the scene,
then later being correct after a position update.

* Renamed getMeshPartBound to getRenderableMeshBound.
* Avatar now uses getRenderableMeshBound() to do boundingRadius vs frustum check.
* Model::getRenderableMeshBound now returns a more accurate bound, because it is the same one used for rendering.

This will fix avatar freezing, when they are in the corner of your frustum.
This was due to matrices not being updated because the avatar had to a small bounding sphere.
 2016-03-31 14:59:27 -07:00
Anthony J. Thibault
635f58629a MeshPartPayload: remove dead code 2016-03-31 14:58:25 -07:00
samcake
1b54a29491 small improvments adn exploring the jittering bug for reflections 2016-03-31 11:34:27 -07:00
Zach Pomerantz
e4cba14333 Avoid recreating model items when adding to scene 2016-03-31 10:46:51 -07:00
Zach Pomerantz
3de5f73a1f Fixup model on tex load 2016-03-31 10:46:51 -07:00
samcake
a07ae70ea0 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-31 10:04:51 -07:00
samcake
10ddecd536 Debuggingh the reflection jittering 2016-03-31 01:51:26 -07:00
Brad Hefta-Gaub
a7f93aa75c Merge pull request #7519 from zzmp/fix/avatar-crash 
Fix crash from updating/resetting avatar
 2016-03-30 21:31:17 -07:00
Anthony Thibault
26b9469df5 Merge pull request #7516 from hyperlogic/tony/show-collision-geometry-crash-fix 
Model: fix for crash when displaying collision mesh
 2016-03-30 16:48:07 -07:00
Seth Alves
d9909fb7da Merge pull request #7518 from hyperlogic/tony/model-hand-grab-fix 
Model: Fix for equipped models not updating their matrices
 2016-03-30 16:10:21 -07:00
samcake
c13e24438c Merge pull request #7512 from zzmp/fix/light-buf-fmt 
Correctly represent lighting framebuffer
 2016-03-30 16:10:10 -07:00
samcake
6033ad81db Adding time counter 2016-03-30 16:09:33 -07:00
Zach Pomerantz
6e0d6ee45b Guard updateClusterMatrices from unloaded geo 2016-03-30 16:04:00 -07:00
Zach Pomerantz
00db095306 Guard against reset model geo on scene update 2016-03-30 15:49:45 -07:00
Anthony J. Thibault
f6344c34e7 Model: Fix for equipped models not updating their matrices 2016-03-30 15:19:35 -07:00
Anthony J. Thibault
103257493c Model: fix for crash when displaying collision mesh. 
This was due to a default constructed PayloadPointer being sent to the scene via resetItem.

The fix is to A) not do that anymore, B) make resetItem more robust and not crash if this happens.
 2016-03-30 14:24:28 -07:00
Zach Pomerantz
1234514e8f Correctly represent light fbo fmt 2016-03-30 11:22:44 -07:00
samcake
0ee1f039e9 Telling like it is... 2016-03-30 11:15:10 -07:00
samcake
11b6952eff Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-30 09:49:17 -07:00
samcake
b492c4b52c DUmb fix to the flickering issue by overshooting the inside volume of the light and avoid the failing region 2016-03-30 09:32:40 -07:00
Brad Hefta-Gaub
d99dcf5450 Merge pull request #7487 from hyperlogic/tony/animated-culling 
Improved render bounding boxes for animated models
 2016-03-30 09:27:43 -07:00
samcake
be27eaff24 Moving the scripts for render that where in utilities/tools/render to utilities/render, adding counters for lights 2016-03-29 17:51:24 -07:00
Zach Pomerantz
29dedd5524 Update model URL on render thread 2016-03-29 10:42:40 -07:00
Anthony J. Thibault
24ca5b3d60 Update after merge changes to NetworkGeometry. 
Also cleaned up API for ModelMeshPartPayload::updateTransformForSkinnedMesh() to pass a QVector const ref, instead of a raw pointer and a size.
 2016-03-28 20:29:02 -07:00
Anthony J. Thibault
940f3e636d Merge branch 'master' into tony/animated-culling 2016-03-28 19:58:38 -07:00
Anthony J. Thibault
115fd607a0 Address performance issues introduced with this PR. 
* Prevent clusterMatrices from being invalidated and re-computed in each updateItem lambda.
  We do this by not setting _model->_needsUpdateClusterMatrices = true;
* Prevent redundant work if Model::enqueueLocationChange is called multiple times per frame.
  We do this by introducing a preRenderLambdas map in the Application class.
  Instead of adding work directly to the scene PendingChanges queue Model::enqueueLocationChange
  adds a lambda to the Application preRenderLambdas map.  The Application ensures that only one lambda will
  be invoked for each model per frame.
 2016-03-28 19:47:30 -07:00
Anthony J. Thibault
f5a86666a1 Model: fix for collision mesh rendering 2016-03-28 09:56:15 -07:00
Zach Pomerantz
d6640ac520 Update Model::_hasTransparentTextures 2016-03-27 16:38:45 -07:00
Anthony J. Thibault
49a4d104a6 Minimize diff with master 2016-03-26 13:27:05 -07:00
Anthony J. Thibault
bf433487fa Dynamic bound update for skinned mesh 
* Use all cluster matrices to compute bound for skinned mesh.
  This is far less expensive then doing per-vertex work, but it's not free, for avatars especially.
* Remove skinnedMeshBound, compute it instead.
* Compute clusterMatrices in render update, because we need them to update bounds.
 2016-03-26 12:22:02 -07:00
Anthony J. Thibault
b4e70d9101 WIP: checkpoint 
* bug fix in AABox::operator+=
* added AABox::emiggen
* Avatar now has a default bound for it's skinned mesh.
* WIP: AABox tests;  NEED MORE
* Model: split collision and model mesh render items.
  Because ModelMeshRenderItems need special handling to update bounds for animated joints.
* Model: dynamically update the bound for rigidly bound animated meshes
* Rig: added access to geometryToRigTransform
* RenderableModelEntityItem: try to update bounds for skinned mesh to be the entity dimentions (this doesn't seem to be working)
* Geometry.cpp: removed unused bounds parameter in evalPartBounds
* ModelMeshPartPayload: bounds updating
   * non-animated: use existing _localBound
   * rigid bound mesh: use _localBound transformed by clusterMatrix joint transform
   * fully skinned mesh: use _skinnedMeshBound provided by the application.
 2016-03-25 21:29:20 -07:00
Zach Pomerantz
3402635f99 Lock geometry on blender 2016-03-24 18:50:43 -07:00
Zach Pomerantz
3e9e083df5 Update users of NetworkGeometry 2016-03-24 11:35:41 -07:00
samcake
1e46b0803c fixing repported issues during review 2016-03-23 15:59:57 -07:00
samcake
7d99183474 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-23 15:47:00 -07:00
Brad Hefta-Gaub
9f0084dbb1 make Blender keep a shared pointer to the model it's blending 2016-03-22 16:01:31 -07:00
samcake
67abdab8b2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-22 10:13:50 -07:00
Brad Hefta-Gaub
513138ca98 one more crack at fixing the blender 2016-03-21 18:28:26 -07:00
samcake
695e558851 Trying to clena up the problem? 2016-03-21 16:36:47 -07:00
Chris Collins
6324d0e3be Merge pull request #7393 from ZappoMan/protectMeshBoxes 
Fix for crash in recalculateMeshBoxes()
 2016-03-21 15:46:28 -07:00
Brad Hefta-Gaub
d28db7bec6 fix typo 2016-03-21 14:47:53 -07:00
samcake
ec7165983d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-21 13:30:28 -07:00
samcake
d189dc4af2 Problem not fixed yet, need to merge with upstream 2016-03-21 13:30:08 -07:00
Brad Hefta-Gaub
2389295217 actually properly remove pending blendshapes 2016-03-21 13:04:37 -07:00
samcake
227ddb12a6 Trying to clen up the way the opacity final value comes to the fragment shader 2016-03-21 12:14:59 -07:00
Brad Hefta-Gaub
492e71345a Revert "Revert "Fix ModelBlender crash"" 
This reverts commit f274cdcc7f.
 2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub
f274cdcc7f Revert "Fix ModelBlender crash" 2016-03-21 10:47:31 -07:00
Andrew Meadows
cd802a6549 Merge pull request #7406 from hyperlogic/tony/transparent-texture-fix 
Model: fix for avatars with late loaded transparent textures.
 2016-03-21 09:19:33 -07:00
Anthony Thibault
b06f027f2e Model: fix for avatars with late loaded transparent textures. 2016-03-20 18:20:03 -07:00
samcake
225b330d41 Trying to better load aand detect the case for transparent textures oor opacity mask 2016-03-18 12:47:33 -07:00
Brad Hefta-Gaub
925d5d36ac clean up the recalculateMeshBoxes() calls in findRayIntersectionAgainstSubMeshes() 2016-03-18 12:20:45 -07:00