186 commits

Author	SHA1	Message	Date
Zach Pomerantz	5a86f0c23f	Nest JS props in SceneScriptingInterface	2015-12-21 14:32:06 -08:00
samcake	8d4d0d4e9a	FIxing the bad returned value per reference	2015-12-17 10:08:40 -08:00
samcake	7bc815448e	The material colors for diffuse and emissive are now gamma corrected by default	2015-12-16 18:14:43 -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	b8495a6912	Merge branch 'master' of https://github.com/highfidelity/hifi into warnings-win	2015-12-11 18:05:47 -08:00
samcake	b3acde4462	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-11 17:49:00 -08:00
samcake	68134aafe5	Fix the broken skybox and simplify a bit the vertex shader used	2015-12-11 16:14:55 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
samcake	5d395ae54f	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-10 18:06:43 -08:00
samcake	3728a9c6f0	Merging with Master	2015-12-10 16:55:30 -08:00
samcake	9eb40bcd65	Trying to redner the collision geometry correctly but still an issue with the bounding box i get	2015-12-09 16:58:14 -08:00
Atlante45	1d513cfbba	Merge branch 'master' of https://github.com/highfidelity/hifi into particle	2015-12-09 15:09:19 -08:00
Sam Cake	9faec326da	CHanging the lighting BUffer format and adding tone mapping	2015-12-08 08:34:42 -08:00
Sam Cake	3595d0d719	less commented stuff	2015-12-07 01:15:10 -08:00
samcake	b28e3d0045	Merging MAster and Graphics	2015-12-04 17:51:30 -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
Atlante45	3da80f5861	gpu::Shader::create* return shared_ptr	2015-12-03 14:56:07 -08:00
samcake	762a241fa6	Adding specific path for loading lightmaps	2015-12-02 18:03:58 -08:00
Atlante45	e25ea122d8	Start moving update to shader	2015-11-24 11:51:56 -08:00
Andrew Meadows	7fa069cf30	fix line endings grumble gruble	2015-10-20 09:38:25 -07:00
Brad Hefta-Gaub	bddb0e1e7b	ifdef out buggy texture map code	2015-10-19 09:43:08 -07:00
Brad Davis	6f5f6450df	Cleanup CMake files	2015-10-11 00:01:03 -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	690620d74d	Cleaning code	2015-10-01 19:23:32 -07:00
samcake	0398f9429e	fix the coo/texel blender mode for the case when color is black and the stereo issue	2015-09-30 18:39:13 -07:00
samcake	69c4075439	Fix the behavior when skybox color is black and skymap is available	2015-09-30 18:08:01 -07:00
samcake	d3d4775232	THe dataBuffer contining the properties of the skybox is now per instace and not static and shared so it's static from frames to frames	2015-09-30 17:54:20 -07:00
samcake	be9b244779	Fix the skybox color issue with background rendering when no texture is there	2015-09-30 17:21:52 -07:00
samcake	75e858cd13	Putting together the stencil buffer for opaque vs background and using it for the backgroud render items	2015-09-30 15:54:03 -07:00
samcake	73b458c72e	Cleaning the normal texture load path	2015-09-29 09:38:01 -07:00
samcake	2a487a79a3	Getting something done today	2015-09-28 17:24:31 -07:00
Brad Hefta-Gaub	52842cb287	more warnings fixes	2015-09-22 20:34:40 -07:00
Brad Hefta-Gaub	5bb908f081	remove dead code and fix warning	2015-09-22 12:34:47 -07:00
samcake	4513b64b00	fixing review comments	2015-09-21 22:42:24 -07:00
samcake	a485d3d6de	Fixing the rendering of ProceduralSkybox	2015-09-21 15:21:48 -07:00
samcake	fa9b0930d2	Bring back the procedural skybox	2015-09-21 14:25:32 -07:00
samcake	d3b1bcb86d	Redistributing the files to create the model-networking lib and separate that from the redner-utils	2015-09-21 13:21:35 -07:00
samcake	2875cb99bb	Fixing the compilation issue	2015-09-21 09:47:00 -07:00
samcake	6a714f405c	Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map	2015-09-21 00:53:48 -07:00
samcake	3614812681	MOving the actual creation of the texture and the pixel manipulation required from TextureCache to TextureSOurce	2015-09-20 23:31:59 -07:00
samcake	6914caac9d	Renaming TextureStorage.x to TextureMap.x	2015-09-20 18:14:03 -07:00
samcake	9a8dc6ca5d	Fix compilation issues on mac	2015-09-19 08:59:47 -07:00
samcake	8941741508	Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap	2015-09-18 18:47:18 -07:00
Sam Gateau	9074d0d6e1	very first version of the TextureStorage working	2015-09-14 09:29:46 -07:00
Sam Gateau	c37cdce750	Merging back with master	2015-09-10 17:53:50 -07:00
Brad Davis	5f1affaff9	Procedural skybox work	2015-09-08 14:31:16 -07:00
Sam Gateau	4f7b857130	Merge	2015-08-27 10:01:39 -07:00
Sam Gateau	f6953f8e02	REfining th eTextureMap design but still with the issue of the lightmapped model	2015-08-27 09:52:07 -07:00