176 commits

Author	SHA1	Message	Date
samcake	f9070ee989	Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore	2015-12-22 12:41:31 -08:00
samcake	d8a71db929	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-17 10:11:03 -08:00
AlessandroSigna	08f7591787	Fix misspelling	2015-12-16 10:02:47 -08:00
samcake	e70ab472af	Merging with upstream master/graphics	2015-12-14 18:38:29 -08:00
samcake	84d1e3b123	Merged with upstream master	2015-12-14 18:30:24 -08:00
samcake	a50b14dfae	Merging with upstream graphics	2015-12-14 18:18:39 -08:00
samcake	3554f54e17	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-14 17:38:56 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
Sam Cake	9faec326da	CHanging the lighting BUffer format and adding tone mapping	2015-12-08 08:34:42 -08:00
samcake	5d207d0c9c	INtroducing the tonemapping job in its separate file and clean DeferredLightingEffect	2015-12-07 13:19:43 -08:00
Sam Cake	3595d0d719	less commented stuff	2015-12-07 01:15:10 -08:00
Sam Cake	01d48b29aa	cleaning code and removing cruft	2015-12-07 01:03:14 -08:00
Sam Cake	a018c51945	Drawing background first in the Lighting buffer then lighting passes with stencil test	2015-12-06 23:51:29 -08:00
samcake	b28e3d0045	Merging MAster and Graphics	2015-12-04 17:51:30 -08:00
samcake	119cc733b5	Merging with master	2015-12-04 17:17:33 -08:00
samcake	cfd7373585	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-04 16:52:50 -08:00
samcake	ef7ddce2b6	Trying to fix the problem of the background not showing correctly	2015-12-04 16:52:14 -08:00
samcake	3c18664c57	Cleaning all the deferred buffers in the Prepare call	2015-12-04 11:47:57 -08:00
samcake	d593b824e9	Introducing a true Primary Framebuffer and a different Deferred Framebuffer	2015-12-03 17:26:54 -08:00
samcake	72d393905b	Introducing the Lighting Buffer where all the lighting is beeing accumulated, apply a manual gamma correction when copying back into the main color buffer	2015-12-03 16:03:32 -08:00
Atlante45	3da80f5861	gpu::Shader::create* return shared_ptr	2015-12-03 14:56:07 -08:00
samcake	a5475ed14d	Early try fixing the lighting	2015-12-03 10:41:32 -08:00
Brad Davis	282cdadf63	Fixing line endings	2015-10-18 22:55:14 -07:00
samcake	12fedb6ff0	Move skinning shader features in its own slh and get ready for moving cluster matrices to uniform buffer	2015-10-05 18:31:05 -07:00
samcake	1bd07b58c3	Fixing the lighting view matrix for stereo again	2015-09-29 14:40:37 -07:00
Brad Hefta-Gaub	85b2322acc	more work on batch optimzation	2015-09-24 17:11:14 -07:00
Brad Hefta-Gaub	9a0e5b9870	address Sam's concerns	2015-09-23 17:37:48 -07:00
ZappoMan	65a079cb53	fix mac build	2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub	ef25876c9a	implement vector caching for gpu::Batch	2015-09-23 14:46:47 -07:00
Brad Hefta-Gaub	5b00783f18	more warnings fixes	2015-09-22 20:54:36 -07:00
Bradley Austin Davis	0401672c82	Fixing lighting again	2015-09-21 16:24:55 -07:00
Bradley Austin Davis	b3aeaba5f4	CR feedback	2015-09-21 15:44:47 -07:00
Bradley Austin Davis	e12e4ece34	Fixing lighting and atmosphere	2015-09-21 13:51:08 -07:00
Bradley Austin Davis	e024d23366	Instancing work, second pass	2015-09-21 13:27:02 -07:00
Brad Davis	8a703d0363	Instanced rendering, first pass	2015-09-18 16:29:29 -07:00
Sam Gateau	b207d97f72	Fix the lighting when the rear view mirror is showing up	2015-09-17 12:28:17 -07:00
Sam Gateau	882ca5d6c0	Fix the lights not rendering roperly	2015-09-16 15:57:35 -07:00
Sam Gateau	80d25a68b6	Bringing back the eyeView per side to the deferred transform stack	2015-09-15 18:05:15 -07:00
Sam Gateau	5410bc0945	FIx the review comment and trying to fix the simple stereo display plugin projection and eye view matrix	2015-09-15 17:48:55 -07:00
Sam Gateau	f00e3829f1	Cleaning for PR	2015-09-15 16:54:04 -07:00
Sam Gateau	dc8756e465	Need to pull master, just updated all the deferred shaders to use scribe func declare blocks to avoid long shaders... didn;t validate the current clip to eye position evaluation	2015-09-15 14:40:23 -07:00
Sam Gateau	400f90aea4	Introducing a stereo loop that should do the right thing but doesn't yet	2015-09-15 08:34:46 -07:00
Sam Gateau	45dc5be53d	DeferredTransform buffer working for the deferred rendering in mono	2015-09-14 17:48:15 -07:00
Sam Gateau	00688172dd	work in progress, gathering th eindvidual parameters of the deferred pass into a single UBO that is bound once for all the deferred lighting passes	2015-09-14 15:49:05 -07:00
Sam Gateau	3690d5a4c2	Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug	2015-09-14 12:28:59 -07:00
Sam Gateau	6c63dc0444	work in progress	2015-09-14 12:28:33 -07:00
Brad Davis	1bb15e28d6	Fixing differing highlights between left and right eyes in stereo modes	2015-09-14 11:24:28 -07:00
Brad Davis	76f236adf6	New stereo rendering implementation	2015-08-21 00:29:24 -07:00
ericrius1	0f7c21ddd7	rearranged entity props and added check in setNormals to avoid uninitialized binormal values	2015-08-10 11:55:47 -07:00
ZappoMan	87f609b9af	remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows	2015-08-07 11:26:07 -07:00