Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 10:20:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49797 commits 72 branches 59 tags 1.2 GiB
Commit graph

2358 commits

Author SHA1 Message Date
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