104 commits

Author	SHA1	Message	Date
Brad Davis	d858d34523	Update material binding	2018-03-07 17:27:47 -08:00
samcake	fc8f1c1e65	Resolving conflicts	2018-03-02 14:20:33 -08:00
samcake	b8fb97c824	Resolving conflicts	2018-03-02 10:36:55 -08:00
samcake	a227cf1edb	Fixing bad key/pipeline pair	2018-03-01 10:49:58 -08:00
samcake	dc286544c5	Merging with nissim's pr	2018-02-28 17:54:54 -08:00
samcake	a7542d5b90	fixing the shadow	2018-02-28 17:46:22 -08:00
NissimHadar	5d7e6651a7	Use correct pixel shader.	2018-02-28 11:05:02 -08:00
NissimHadar	faad930e35	WIP.	2018-02-28 08:44:01 -08:00
NissimHadar	5764a21c4a	WIP.	2018-02-28 08:12:48 -08:00
NissimHadar	7cae04883e	WIP.	2018-02-27 17:19:02 -08:00
NissimHadar	f52f146db5	WIP.	2018-02-27 16:28:46 -08:00
NissimHadar	00f3682bbe	NOT WORKING YET.	2018-02-27 14:09:31 -08:00
Brad Davis	f01c42dcc9	Fixing merged dual-quat pipelines	2018-02-27 08:54:46 -08:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Anthony J. Thibault	0469eafbe4	Switch between dualQuats and matrix skinning based on model entity scale factor.	2018-02-22 18:35:16 -08:00
Brad Davis	e0e7fb04f2	Fix merge issues	2018-02-22 18:08:56 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
Anthony J. Thibault	86351f19a9	Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions	2018-02-22 08:44:21 -08:00
SamGondelman	2d754edf74	CR	2018-02-15 15:48:41 -08:00
Anthony J. Thibault	d2c199104e	Avatars use Dual Quaternion Skinning and Model Entities do not.	2018-02-13 17:47:49 -08:00
Sam Gateau	f20e1a727e	Removing the specular pipeline since we now take care of it with the base shader, remove unused shader include files adding the tone map pass	2018-02-08 23:07:39 -08:00
samcake	b66da1897d	improving the forward rendering pass, removing the specular variation and making it defautl	2018-02-08 17:59:07 -08:00
Bradley Austin Davis	fd007e845d	Squashed scribe changes	2018-02-07 10:29:29 -08:00
Olivier Prat	92279b5939	Merged with master	2018-02-05 18:24:05 +01:00
Olivier Prat	03daba9bac	Removed duplicate shader include	2018-02-02 18:18:24 +01:00
Olivier Prat	5e6300ce46	Merged with master	2018-01-30 09:52:30 +01:00
Olivier Prat	70a7ecc5f0	Fixed merge with remote trnormalmap	2018-01-29 10:50:17 +01:00
Olivier Prat	4cbfef55ef	Merged with master. Had to add back shaders and code	2018-01-29 10:33:16 +01:00
Brad Davis	87a41ef176	Force the forward pipelines to setup the lighting data	2018-01-28 14:56:15 -08:00
Brad Davis	361b767586	Merge branch 'fix/render_config' into android	2018-01-25 14:50:41 -08:00
Olivier Prat	95882e0cde	Merged with master	2018-01-24 10:51:54 +01:00
Olivier Prat	d0f2138e87	Merged with master	2018-01-24 10:00:41 +01:00
Olivier Prat	c92a9975ba	Merged with master	2018-01-24 09:53:38 +01:00
Olivier Prat	55abaf33fb	Added shaders to support normal maps on translucent objects	2018-01-23 17:35:01 +01:00
Gabriel Calero	1ad61b7683	Adding forward pipelines for translucent objects	2018-01-17 16:26:17 -03:00
Olivier Prat	e6caa83d73	Merged with master	2018-01-17 16:35:31 +01:00
Olivier Prat	efa6a8c0b5	Merged with master	2018-01-17 15:49:46 +01:00
Olivier Prat	49549ced17	Fixed compilation with new shader system	2018-01-17 10:52:58 +01:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
Olivier Prat	3911ce59cc	Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code	2018-01-16 19:02:12 +01:00
humbletim	b91d536dd0	rename model:: -> graphics::	2018-01-16 12:46:16 -05:00
Olivier Prat	32445a5660	Updated pipelines	2018-01-15 18:18:13 +01:00
Olivier Prat	54eab1c878	First working local lights on transparent objects	2018-01-15 17:49:55 +01:00
Olivier Prat	814de4ab81	Scribe now outputs shaders as cpp files.	2018-01-12 11:59:19 +01:00
Gabriel Calero	597114afea	Prepare forward pipeline for android	2018-01-03 16:42:19 -03:00
Olivier Prat	10643feb78	Working with specific zpass rendering for outline. Debug script needs relinking to correct config	2017-09-06 18:40:38 +02:00
SamGondelman	4c55849290	merge from master	2017-08-10 15:43:23 -07:00
SamGondelman	658acd91f2	experimenting with drawHUDLayer depth testing	2017-07-25 14:17:39 -07:00
Olivier Prat	267531cc1a	First working fade	2017-07-10 15:27:09 +02:00