Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 10:47:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45715 commits 25 branches 0 tags 1.1 GiB
Commit graph

455 commits

Author SHA1 Message Date
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
Brad Hefta-Gaub
1e30ba43ea Merge pull request #7781 from zzmp/log/pipeline-flood 
Avoid missing pipeline log flood
 2016-05-05 00:15:10 -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
Zach Pomerantz
0bc89d6b18 Avoid missing pipeline log flood 2016-05-03 09:39:31 -07:00
samcake
88f816fab4 Adding reflection of the ambient map for translucent 2016-04-28 18:18:18 -07:00
Zach Pomerantz
2f20e58301 Avoid crashing on missed pipelines 2016-04-27 19:54:52 -07:00
samcake
4202e60ac3 trying to add the skymap on translucents 2016-04-26 18:20:15 -07:00
samcake
5cb346330b Merging with master 2016-04-25 18:48:58 -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
samcake
28521aa66a REmoving uneeded changes 2016-04-19 11:01:41 -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
samcake
9087de22bd Fixing the extra spaces 2016-04-18 16:10:11 -07:00
samcake
ca720efce6 Exposing the timing of the jobs by default 2016-04-18 14:53:06 -07:00
samcake
0ae54b9abc Typo 2016-04-18 11:45:48 -07:00
samcake
d746fba142 Cleaning up the stats.qml 2016-04-18 11:18:28 -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
ff1df0d45e Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-12 15:29:58 -07:00
samcake
ab9f41f5eb Trying something a bit more radical for timing 2016-04-12 15:29:31 -07:00
samcake
710c4a1b8f TRying to merge and expose counters for in flights transfers 2016-04-05 12:18:30 -07:00
samcake
9d1f91fa19 First pass at using compressed format when uploading textures 2016-03-31 19:27:35 -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
samcake
6213e0859d Expose to counters fro drawcalls, one for the API drawcalls and the other for gpu drawcalls spawned 2016-03-30 15:07:45 -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
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
samcake
aa085f6955 Putting members of the ENgineStats class NOT public so they can keep their name proudly 2016-03-28 11:52:31 -07:00
samcake
5a3896b1de FIxing warnigns 2016-03-27 09:35:13 -07:00
samcake
7361304084 Cleaning up for review 2016-03-25 18:38:52 -07:00
samcake
c23640249e Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-25 15:29:01 -07:00
samcake
9b58d50fd4 BUilding a more complete set of tools to monitor performances 2016-03-25 15:28:06 -07:00
Anthony J. Thibault
c00a412d3b Fix misleading comments for _skipCulling case. 2016-03-25 09:10:46 -07:00
samcake
9fb1a9a2a8 Merge and many more counters 2016-03-25 03:02:18 -07:00
Anthony J. Thibault
c302c803b0 CullTask: added ability to disable culling during rendering. 
You can use the following JavaScript to disable culling:

    Render.RenderDeferredTask.CullSceneSelection.skipCulling = true
 2016-03-24 13:20:29 -07:00
samcake
138a996013 First draft of monitoring the memeory consumption 2016-03-23 15:46:17 -07:00
Zach Pomerantz
ff0862b594 Emplace render engine jobs 2016-03-14 17:51:43 -07:00
samcake
729890342e Fixing the linux warning for unused variable 2016-03-11 00:27:56 -08:00
samcake
24d712b7b4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-10 18:14:22 -08:00
samcake
58b84b67ea Fixing the outside the octree bug 2016-03-10 18:14:11 -08:00
samcake
a88f22fa3c Removing white spaces 2016-03-10 15:58:04 -08:00
samcake
fb68c09941 Before merging upstream 2016-03-10 15:10:34 -08:00
samcake
3944a7f297 Exposing thread safe number of allocated items for a ascene 2016-03-10 15:03:20 -08:00
samcake
f6276615f7 Trying to fix the bound out of the octree volume problem 2016-03-10 09:31:05 -08:00
Zach Pomerantz
d1324b2e7a Merge branch 'master' of github.com:highfidelity/hifi into fix/resort-in-octree 2016-03-08 10:22:25 -08:00
samcake
9fb318570b Ajusting the pure Ambient SH lighting pass and more review issues 2016-03-01 12:24:44 -08:00
Zach Pomerantz
30fbd99d11 Factor out SortTask to fix shadows 2016-02-26 16:04:15 -08:00
Zach Pomerantz
56aac35348 Fix drawInFront bugs 2016-02-26 15:24:37 -08:00
Zach Pomerantz
5995c3717f Continue updating overlay key on edit 2016-02-26 14:46:42 -08:00
Zach Pomerantz
2cd6706a6a Update fetch to use nonspatialSet 2016-02-26 14:46:42 -08:00
Zach Pomerantz
8e1c514a9c Replace scene buckets with nonspatial set 2016-02-26 14:46:40 -08:00
samcake
3ee6f9d6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-25 23:48:53 -08:00
Andrew Meadows
f964df6c97 final names for ViewFrustum intersection tests 2016-02-25 18:09:35 -08:00
Andrew Meadows
706cf66240 restor name: viewTest() --> frustumTest() 2016-02-25 18:09:35 -08:00
Andrew Meadows
dfdf375853 use shapeInFrustum() names again 
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
 2016-02-25 18:09:35 -08:00
Andrew Meadows
9c927ea36b ViewFrustum method renames and whitespace cleanup 
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
 2016-02-25 09:11:28 -08:00
samcake
ae6e625894 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-24 17:30:40 -08:00
samcake
a0d7ce145e Adding support for emissive and occlusion maps, on to pr land 2016-02-24 17:30:29 -08:00
samcake
2f5800a4cc IMproving the shading model and the loading, added the roughness, needt to clean up 2016-02-23 18:31:38 -08:00
Chris Collins
94d018be3e Merge pull request #7172 from zzmp/fix/stats 
Consolidate stats for opaque/transparent/other
 2016-02-23 16:23:11 -08:00
Zach Pomerantz
eb53f44a06 Convert size_t details to int 2016-02-23 12:44:38 -08:00
Zach Pomerantz
7804ee22d4 Consolidate stats for opaque/transparent/other 2016-02-23 12:14:00 -08:00
samcake
1c53f9bc87 Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly 2016-02-23 10:40:50 -08:00
samcake
b88501784c Making progress toward the PBR material 2016-02-17 18:47:52 -08:00
Andrew Meadows
fd8073f6b5 init drawstatus to false 2016-02-16 12:11:19 -08:00
samcake
0ad7bacf02 Changing diffuse to albedo and breaking everything... 2016-02-15 21:50:10 -08:00
Zach Pomerantz
5d1aedf707 Update scene items on overlay3d edits 2016-02-15 13:05:19 -08:00
Zach Pomerantz
01309ffd5f Add resort for scene item keys 2016-02-15 13:02:29 -08:00
samcake
0c0089f736 REnamed Octree.h/cpp to SpatialTree and fixing some coding guidelines 2016-02-15 11:08:12 -08:00
samcake
21c9b74a68 Cleaning up performance timers which are taking too much time... 2016-02-12 17:07:53 -08:00
samcake
bcd7876f6c adding better performance stats 2016-02-12 16:53:24 -08:00
samcake
e3307d91ad Fix the debugging tool to be able to freeze the frustum for scene fetch and culling 2016-02-12 14:59:43 -08:00
samcake
9bfeb4a1d5 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-12 11:31:47 -08:00
samcake
40c283cba2 Fixing some warnings 2016-02-12 10:21:28 -08:00
samcake
171acb883f Fixing compilation issue on mac and linux 2016-02-12 09:59:33 -08:00
samcake
b94c2c9b7f Introducing a cleaner filtering pipeline, normally it s good to go 2016-02-11 18:40:36 -08:00
Zach Pomerantz
232f06e175 Avoid unnecessary TaskConfig dtor 2016-02-11 17:29:18 -08:00
samcake
898cfbc043 cleaning a if into an assert 2016-02-11 14:41:37 -08:00
samcake
dedfee3acc Fixing a terrible bug! 2016-02-11 13:43:43 -08:00
Zach Pomerantz
d0f3ad75b8 Nest Persistent in Config to compile on nix 2016-02-11 10:27:32 -08:00
Zach Pomerantz
a7778daed2 Change graphics dialog to persisted dropdowns 2016-02-11 10:15:13 -08:00
samcake
31230e81bb Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 10:05:58 -08:00
samcake
355b8ee40d THursday morning the frustum culling seems broken in one particular angle 2016-02-11 10:05:39 -08:00
Zach Pomerantz
84197e5eb2 Add persistent render engine configuration file 2016-02-11 10:00:44 -08:00
Zach Pomerantz
991d6328ef Fix JSON integration for JobConfig 2016-02-11 08:47:58 -08:00
Zach Pomerantz
5f395654f0 Integrate JobConfig with JSON/qml 2016-02-11 08:47:51 -08:00
samcake
b295a3732e Fix a bunch of warnings 2016-02-10 12:18:46 -08:00
samcake
8a4e2cb0c5 cleaning the warnings coming from the os side 2016-02-09 16:27:40 -08:00
samcake
c96dd7f131 Cleaning up of the octree as items are removed 2016-02-09 15:51:38 -08:00
samcake
b1b08bf2f7 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-09 09:24:55 -08:00
Chris Collins
e61636e8a7 Merge pull request #7028 from zzmp/fix/overlay 
Add transparency and layering for overlays
sam is doing it
 2016-02-09 09:18:32 -08:00
samcake
40e49b2376 Starting to remove empty bricks and empty cells 2016-02-08 18:23:29 -08:00
Zach Pomerantz
63d87550b1 Guard batchSetter invocation for ShapePipelines 2016-02-08 17:06:43 -08:00
Zach Pomerantz
281ba3c3ea Fix ShapeKey::withoutCullFace to set, not reset 2016-02-08 16:14:03 -08:00
Zach Pomerantz
a7bafed61b Change ShapeKey::CULL to NO_CULL_FACE 2016-02-08 13:44:42 -08:00
samcake
76d8135fdc Trying to introduce the Filtering step after the full scene culling 2016-02-05 18:21:21 -08:00
samcake
91a28c597a Quiet warnings 2016-02-05 17:18:14 -08:00
samcake
e5f3805d0e Fixing the item insert in cell criteria for subcell and adding debgging tool 2016-02-05 16:49:43 -08:00
Zach Pomerantz
c334e4ebcb Add JSON interface to render::Job::Config 2016-02-05 13:03:47 -08:00