26 commits

Author	SHA1	Message	Date
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
Menithal	19a290be70	Fixed Entity Shader emmissive ... Makes sure that the emissiveAmount information is used correctly for a custom shader, instead of using specular rgb information to generate the emissiveness, which was incorrect	2017-09-26 00:12:45 +03:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
SamGondelman	b794259b7d	fixed procedural entity fade	2016-08-05 16:15:10 -07:00
SamGondelman	7713c1f4bf	try to fade in web entities	2016-08-03 15:56:41 -07:00
SamGondelman	27bacc9165	try to fade in procedural shapes	2016-08-03 14:33:05 -07:00
samcake	4742f40128	Separating the normal packing into it s own file and make sure to sclae the filter radius correctly dpeending on the resolution of diffusion	2016-07-19 12:23:57 -07:00
samcake	0c882832bf	Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now)	2016-06-20 17:58:35 -07:00
Brad Davis	1e136ed71f	Fix procedural rendering on primitives	2016-05-14 10:59:59 -07:00
samcake	a0d7ce145e	Adding support for emissive and occlusion maps, on to pr land	2016-02-24 17:30:29 -08:00
samcake	39a7852979	MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders	2016-02-19 18:43:07 -08:00
samcake	f9070ee989	Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore	2015-12-22 12:41:31 -08:00
samcake	ae124ebede	Tuning the proedural shader support to work with the current default: gamma corrected emissive	2015-12-21 12:00:30 -08:00
Brad Davis	7b1c04512a	Adding support for accessing IPD in scripts	2015-09-28 16:24:38 -07:00
Brad Davis	5f1affaff9	Procedural skybox work	2015-09-08 14:31:16 -07:00
Brad Davis	aea07fe671	Merge branch 'master' into gl4_1 ... Conflicts: libraries/gpu/src/gpu/Config.slh libraries/render-utils/src/deferred_light_limited.slv libraries/render-utils/src/simple.slf libraries/render-utils/src/simple_textured.slf tests/render-utils/src/main.cpp tools/scribe/src/main.cpp	2015-07-31 15:08:37 -07:00
ZappoMan	e6262de864	CR feedback	2015-07-23 14:56:52 -07:00
ZappoMan	96e83e3ed4	remove gl_FrontMaterial	2015-07-23 14:11:28 -07:00
ZappoMan	5774af0856	more hacking	2015-07-23 13:38:08 -07:00
Brad Davis	fbf3a0cbe6	Working on GL 4	2015-06-23 09:48:16 -07:00
Atlante45	212007aa6f	Cleanup simple fragmen shaders	2015-05-29 16:53:53 +02:00
Atlante45	51570aac68	Add simple textured pipeline	2015-05-29 16:49:31 +02:00
samcake	e560687371	fixing the shader not compiling	2015-05-01 00:14:23 -07:00
Sam Gateau	e2e61c64b1	Support include path to shaders from the hifi libraries to cmake	2015-02-13 01:30:04 -08:00
Sam Gateau	d9efafac7e	updating the model fragment shaders to use DeferredBUfferWrite	2015-01-13 14:11:38 -08:00
Sam Gateau	8d95639416	moving the deferrered shaders from the resource folder to built-in the executable	2014-12-30 17:43:52 -08:00