136 commits

Author	SHA1	Message	Date
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
ericrius1	3910cb0d69	Merge branch 'master' into polyLineInProgress	2015-08-07 10:12:02 -07:00
Sam Gateau	95682e6270	Introducing the Normal fitting algorithm for better normal in the deferred buffer	2015-08-05 17:17:00 -07:00
Sam Gateau	730ad2da2f	removing dead code	2015-08-04 16:37:01 -07:00
Sam Gateau	fc0ee28b84	FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD	2015-08-04 16:31:20 -07:00
ericrius1	47bc8f50ab	cleaning	2015-08-03 08:45:14 -07:00
samcake	fbf21cb089	FIxed the problem on Mac, by removing all of the gpuConfig includesgit status ... q :q wq	2015-07-30 18:27:47 -07:00
Andrew Meadows	77a12eb50e	compile on linux with GLEW	2015-07-28 17:53:01 -07:00
Sam Gateau	cb375e8ece	FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler	2015-07-24 02:15:50 -07:00
Sam Gateau	a002560003	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-23 16:32:00 -07:00
Sam Gateau	dc10f30d3d	Merged	2015-07-23 15:10:42 -07:00
Sam Gateau	a561874ce3	Render the rear view mirror in a separate target and then display it during overlay pass	2015-07-23 14:56:14 -07:00
ZappoMan	a0666d5e99	testing windows render bug	2015-07-23 13:17:12 -07:00
samcake	805e7326e0	Merge pull request #5396 from ZappoMan/deadCodeRemoval ... remove non-batch versions of GeometryCache renderXYZ() methods	2015-07-23 11:11:35 -07:00
Bradley Austin Davis	f19800f0de	Don't overwrite the normals buffer when copying the resolved lighting back to the primary FBO	2015-07-23 12:37:58 -04:00
ZappoMan	c2113ea96b	remove non-batch versions of GeometryCache renderXYZ() methods	2015-07-23 07:42:58 -07:00
Bradley Austin Davis	9596452c32	Trying to fix oculus rendering	2015-07-22 08:07:44 -04:00
Bradley Austin Davis	fda1cb6f7b	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00
Brad Davis	c3a2b72c13	Breaking framebuffer ops out of texture cache	2015-07-20 17:26:26 -07:00
Atlante45	59acfc9f47	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 13:51:51 -07:00
Brad Davis	d68618e206	Removing GL headers from most files, and some naked GL from application.cpp	2015-07-18 00:46:09 -07:00
Atlante45	052c3c987b	Fix some more smart pointer	2015-07-17 18:10:34 -07:00
Atlante45	256c786e28	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
ericrius1	a44e5f949c	Merge branch 'master' into polyLineInProgress	2015-07-17 15:01:40 -07:00
samcake	de7aed1abc	Merge pull request #5338 from ZappoMan/removeGlowEffect ... Remove the glow effect.	2015-07-15 14:50:15 -07:00
ZappoMan	c17794849d	more GlowEctomy	2015-07-15 12:58:15 -07:00
samcake	9df26c8488	removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs	2015-07-15 00:24:43 -07:00
Sam Gateau	5555ccd225	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-13 16:19:09 -07:00
Sam Gateau	4743bbad80	Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js	2015-07-13 16:18:39 -07:00
Clément Brisset	24eb4c8263	Merge pull request #5309 from sethalves/quiet-compiler ... quiet compiler	2015-07-13 15:55:35 -07:00
ericrius1	0ce6737b34	merged and normals flipping	2015-07-13 09:43:15 -07:00
Seth Alves	c17c9f1818	quiet compiler	2015-07-12 10:29:43 -07:00
Atlante45	80fe090a94	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-10 20:20:03 -07:00
Sam Gateau	2c05349b06	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-10 11:10:07 -07:00
Sam Gateau	7fc9fd97ff	Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.	2015-07-10 11:03:12 -07:00
Sam Gateau	11f2d74030	Simple cleaning to remove dependancies on the viewStateInterface in the deferredLightingEffect	2015-07-09 17:33:25 -07:00
samcake	1f13106f51	FIxed the issue on mac due to the abs function not correctly executing	2015-07-09 15:05:03 -07:00
Sam Gateau	110b009aa4	Less magic in this world	2015-07-09 09:55:25 -07:00
Sam Gateau	8f4a108441	Dead code and disable debug info	2015-07-09 09:37:35 -07:00
Sam Gateau	fb37af3e04	Removing dead code	2015-07-09 09:25:07 -07:00
Sam Gateau	e901d5cad0	Uncommented a block left behind...	2015-07-09 09:21:53 -07:00