325 commits

Author	SHA1	Message	Date
samcake	b94c2c9b7f	Introducing a cleaner filtering pipeline, normally it s good to go	2016-02-11 18:40:36 -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
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	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
samcake	a999e046b5	Showing the LOD angle	2016-02-04 17:59:35 -08:00
Zach Pomerantz	f0797d8ea0	Move instanced pipeline setup to lambda from batch	2016-02-04 15:32:28 -08:00
samcake	513561ba2d	Using an angle for the LOD test	2016-02-04 09:31:21 -08:00
Zach Pomerantz	666213b7a8	Add CULL, DEPTH_BIAS to ShapeKey	2016-02-03 19:18:56 -08:00
Zach Pomerantz	127f9694f6	Fix ordering of batchSetter in pickPipeline	2016-02-03 19:18:56 -08:00
Zach Pomerantz	d14ce8a9fe	Pass an explicit pipeline to render.*Instance calls	2016-02-03 19:18:56 -08:00
samcake	78b21c3f4d	Refining the culling test and defining the 2 new jobs FetchSPatialTree and CullSpatialSelection	2016-02-03 18:39:40 -08:00
samcake	0478450205	Refining the culling test and defining the 2 new jobs FetchSPatialTree and CullSpatialSelection	2016-02-03 18:38:57 -08:00
samcake	edbcef20d4	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-02-03 09:44:05 -08:00
samcake	cb59cccc0c	Adding 2 lists per brick now, the subcelItems and the regular items, trying to use it, probably buggy	2016-02-02 18:10:56 -08:00
samcake	a29831bdf4	Fancy selection of the brick and cells	2016-02-01 18:16:23 -08:00
Zach Pomerantz	0b6cfbe50a	Only connect render config if dirty signal present	2016-02-01 17:48:31 -08:00
samcake	ee7ca35c0c	Adding the selectBranch	2016-02-01 16:48:23 -08:00
samcake	6d4744ed47	Trying to see what s going on	2016-02-01 15:17:32 -08:00
samcake	668378481b	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-02-01 13:48:20 -08:00
samcake	18d8a2fb42	Implementing the octree selection from frustum	2016-02-01 13:47:38 -08:00
samcake	f551ea9f76	fixing compilation on mac and a glsl error on mac	2016-01-31 17:19:47 -08:00
samcake	59434e1ea9	DDisplay of the octree cells is working, added the Brick empty / full per cell	2016-01-29 18:16:45 -08:00
samcake	7b50a4d05f	clening up the BRick insert item interface and the shaders	2016-01-29 14:30:53 -08:00
samcake	71e6c6e443	Starting to add the Items on the Octree	2016-01-28 17:57:21 -08:00
samcake	972d4cda77	Adding better octree visualization	2016-01-28 15:31:24 -08:00
Zach Pomerantz	5cbb5000d2	Render the correct maxDrawnItems	2016-01-28 11:42:54 -08:00
samcake	a2a9227d28	Merging with master	2016-01-28 11:37:24 -08:00
samcake	0c50903030	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-01-28 11:19:37 -08:00
samcake	54b9c1ac0d	Merge pull request #6962 from zzmp/feat/task-io ... Reduce code duplication for render::Job::Model	2016-01-28 09:31:26 -08:00
samcake	23f2c98834	fixing the addressing issue	2016-01-28 09:23:45 -08:00
samcake	6d8c33b996	Merging with upstream and still debugging the cell navigation math	2016-01-27 18:59:45 -08:00
samcake	20e1270e92	Merging with upstream and still debugging the cell navigation math	2016-01-27 18:59:18 -08:00
samcake	ce5c115787	Debugging some of the computations in the OCtree::Location	2016-01-27 14:26:17 -08:00
samcake	b53f6b2e03	late night octree traversal	2016-01-27 10:03:31 -08:00