Commit graph

360 commits

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