282 commits

Author	SHA1	Message	Date
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
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
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
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
Zach Pomerantz	c334e4ebcb	Add JSON interface to render::Job::Config	2016-02-05 13:03:47 -08:00
Zach Pomerantz	f0797d8ea0	Move instanced pipeline setup to lambda from batch	2016-02-04 15:32:28 -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
Zach Pomerantz	0b6cfbe50a	Only connect render config if dirty signal present	2016-02-01 17:48:31 -08:00
Zach Pomerantz	5cbb5000d2	Render the correct maxDrawnItems	2016-01-28 11:42:54 -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
Zach Pomerantz	e770d7b679	Add PhysicsShowOwned back to Menu	2016-01-26 18:56:52 -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
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
Zach Pomerantz	dee8e0ba9d	Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows	2016-01-22 10:03:06 -08:00
samcake	8eddd52731	Fixing coding guidelines	2016-01-21 16:54:37 -08:00
samcake	402809fe2f	FIxing coding standards	2016-01-21 16:44:35 -08:00
samcake	8d1ab01018	exposing one more parameter	2016-01-20 18:32:44 -08:00