285 commits

Author	SHA1	Message	Date
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
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
Zach Pomerantz	e770d7b679	Add PhysicsShowOwned back to Menu	2016-01-26 18:56:52 -08:00
samcake	1b1ffa494b	Making the octree more useful and cleaning up the interaction with the Scene	2016-01-26 18:46:57 -08:00
Zach Pomerantz	61f337b490	Hold Varying constant over task ctor	2016-01-26 17:43:41 -08:00
Zach Pomerantz	5d157b059f	Collapse all Job/Task Models to one, including TaskIO	2016-01-26 17:40:32 -08:00
Zach Pomerantz	5009e8702e	Cleanup new render settings	2016-01-26 15:58:50 -08:00
Zach Pomerantz	5b1834d7be	Fix Wreorder for Job::Models	2016-01-26 12:44:37 -08:00
samcake	903c7dde5a	Drafting the octree, allocating the first cells	2016-01-26 01:59:00 -08:00
samcake	a847a16788	Drafting the Octree and a debugging job	2016-01-25 18:15:07 -08:00
samcake	b96bbab22f	Drafting the Octree and a debugging job	2016-01-25 18:14:05 -08:00
Zach Pomerantz	59ac93485e	Propogate configuration changes through tasks	2016-01-25 15:18:13 -08:00
Zach Pomerantz	46c937325e	Make Job MEMBER enabled explicit	2016-01-25 15:18:11 -08:00
Zach Pomerantz	14d907206e	Clean out job enable logic from Job	2016-01-25 15:17:44 -08:00
Zach Pomerantz	bed325d675	Add Graphics to general settings	2016-01-25 15:17:43 -08:00
Zach Pomerantz	b42ab2179e	Call QConfig QConfigPointer	2016-01-25 15:17:39 -08:00
Zach Pomerantz	e4af8d89f1	Only refresh engine settings on own thread	2016-01-25 12:14:58 -08:00
Zach Pomerantz	56cc4dc223	Add Job::Config to RenderShadowTask	2016-01-25 12:14:58 -08:00
Zach Pomerantz	f3265db298	Gut RenderContext	2016-01-25 12:14:58 -08:00
Zach Pomerantz	e8b8f4d535	Add Job::Config to HitEffect	2016-01-25 12:14:58 -08:00
Zach Pomerantz	772aedde91	Add Job::Config to AmbientOcclusion	2016-01-25 12:14:58 -08:00
Zach Pomerantz	ccbec54f2d	Add Job::Config to DebugDeferredBuffer	2016-01-25 12:14:58 -08:00
Zach Pomerantz	f5a408d82a	Notes for later	2016-01-25 12:14:58 -08:00
Zach Pomerantz	f1b7807db7	Add Job::Config to Draw	2016-01-25 12:14:58 -08:00
Zach Pomerantz	adc9d2ea07	Add Job::Config to FetchItems	2016-01-25 12:13:55 -08:00
Zach Pomerantz	c903fc4739	Pass JobConfig to jobs	2016-01-25 12:13:55 -08:00
Zach Pomerantz	5698be5435	It works	2016-01-25 12:13:55 -08:00
Zach Pomerantz	75cddec647	Add alwaysEnabled render::Job::Config	2016-01-25 12:13:55 -08:00
Zach Pomerantz	b70108bb9a	Working demo	2016-01-25 12:13:55 -08:00
Zach Pomerantz	0188a9384a	Add enabled to Job::Config	2016-01-25 12:13:55 -08:00
Zach Pomerantz	fa2782e113	Add Task implementation	2016-01-25 12:13:55 -08:00
Zach Pomerantz	2e1fbf66ad	Refine Configuration for render::Job ... wip wip wip wip	2016-01-25 12:13:55 -08:00
Zach Pomerantz	581003ec83	Use QObject-derived Configuration for render::Job	2016-01-25 12:13:55 -08:00
Zach Pomerantz	8b68d5922c	Make Engine a Task	2016-01-25 12:13:55 -08:00
Zach Pomerantz	3dab1571a5	Make Task a Job	2016-01-25 12:13:55 -08:00
samcake	3ebcb705ab	defining the octree	2016-01-25 09:44:01 -08:00
samcake	6fdf1e6cf0	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-01-22 18:30:48 -08:00
Zach Pomerantz	dee8e0ba9d	Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows	2016-01-22 10:03:06 -08:00
samcake	b415558f30	FIrst draft of an octree for rendering	2016-01-22 03:23:43 -08:00