38 commits

Author	SHA1	Message	Date
SamGondelman	6111c8a108	initial work on combining shader variants	2019-06-03 19:36:01 -07:00
SamGondelman	b3abd97707	projected materials and repeat property	2018-11-09 10:47:07 -08:00
sam gateau	e41b8f06e1	Cleaning up the pipeline and checking that it is working for all cases	2018-09-25 13:57:50 -07:00
sam gateau	ec6117e9bb	bringing the blendshape in skin shader only work in master	2018-09-18 17:40:29 -07:00
Bradley Austin Davis	fc51b93691	Fix OSX build	2018-08-03 16:15:58 -07:00
Brad Davis	ae8f841912	Shader refactoring for explicit bindings	2018-08-03 14:58:11 -07:00
SamGondelman	d59f368ad6	hide menu, fix shaders	2018-04-20 17:38:38 -07:00
samcake	9335acc887	Merge and a lot of rewriting the color conversion	2017-08-24 18:02:11 -07:00
Zach Pomerantz	9a37ccbf3c	chmod -x to render-utils src	2016-12-13 14:36:41 -05:00
samcake	2489df8229	Merge branch 'master' of https://github.com/highfidelity/hifi into color	2016-06-02 15:16:41 -07:00
samcake	3fe9b67e45	FIxing the reflection jittering by moving the normal into world space	2016-05-27 19:24:56 -07:00
samcake	c1fa096e78	adding texcoord 1 on all the material/model and go fetch occlusion map with this uv instead of texcoor0. this allow for separate transforms just for occlusoin map	2016-05-16 15:42:48 -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
Zach Pomerantz	a4cea0a307	Conform model/overlay shaders	2016-02-04 16:21:56 -08:00
Zach Pomerantz	399fe95dc9	Update overlay/emissive shaders	2016-02-03 19:18:56 -08:00
samcake	3014b3bd5b	Adding Gamma correction to all the Color coming for the attribute stream if used as color	2015-12-18 12:50:21 -08:00
samcake	4513b64b00	fixing review comments	2015-09-21 22:42:24 -07:00
Sam Gateau	1e9fce2a61	Drafting the materials for FBXReader	2015-08-25 22:12:51 -07:00
Brad Davis	d4b9a739f5	Still working on GL update	2015-06-23 09:49:10 -07:00
Sam Gateau	5e04b399d8	fixing the wrong matrix used	2015-06-08 03:07:17 -07:00
Sam Gateau	de61f4ea0b	Gettting th ehighlight on transparent to work	2015-06-08 02:52:13 -07:00
Sam Gateau	8d3a3221b0	shuffling the rendering steps to get to render transparent and light it correctly	2015-06-06 09:50:56 -07:00
samcake	e560687371	fixing the shader not compiling	2015-05-01 00:14:23 -07:00
Sam Gateau	ad9129b552	Fixing all the shaders for entities to work correctly with the now supported color attribute field	2015-04-07 14:26:45 -07:00
Sam Gateau	dee651069c	adding support for color attribute in FBX, and displaying it correctly	2015-04-06 23:33:13 -07:00
Sam Gateau	619a323196	Using Scribe preprocessor @func@ instead of regular glsl function to solve the intel bug with the transform stack	2015-03-19 14:46:50 -07:00
Sam Gateau	b33ba64e05	trying to tweek the transform equation to find the intel bug	2015-03-18 17:20:27 -07:00
Sam Gateau	ded78816b5	Fixing the remaining issue with the avatar rendering path	2015-02-20 11:26:08 -08:00
Sam Gateau	d08142d37d	replacing glTRansform by gpu/Transform features	2015-02-19 15:12:13 -08:00
Sam Gateau	7e04f8a491	Model almost working with Transform	2015-02-19 09:52:58 -08:00
Sam Gateau	11060ed273	trying to tackle the unenderstood transform value not going through corectly?	2015-02-18 16:00:37 -08:00
Sam Gateau	d8aa0e0138	replacing the glTransform pipeline for model rendering	2015-02-17 09:44:03 -08:00
Sam Gateau	23354da828	replacing the glTransform pipeline for model rendering	2015-02-16 22:08:21 -08:00
Sam Gateau	cc3cc4f96f	replacing the glTransform pipeline for model rendering	2015-02-16 09:31:29 -08: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	614e1aa6ae	Cleaning the Model rendering path from any use of glMaterial	2015-01-14 16:44:44 -08:00
Sam Gateau	6628f7b811	replace the model.frag and model.vert files from resource by the sl version of the shaders	2014-12-25 19:57:27 -08:00
Sam Gateau	c5eb04336f	first version of SCribe used for shaders in render-utils	2014-12-23 16:27:02 -08:00