403 commits

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