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
