Commit graph

20 commits

Author SHA1 Message Date
SamGondelman
25b31cfc72 merge with master 2019-02-15 11:08:24 -08:00
SamGondelman
bed2732d34 start moving materials to rendering only 2019-02-14 12:59:16 -08:00
SamGondelman
1b5c1d0677 working on primitiveMode and groupCulled 2019-01-08 10:02:03 -08:00
SamGondelman
b609cfaa2b renderLayer 2019-01-07 15:43:35 -08:00
SamGondelman
b3abd97707 projected materials and repeat property 2018-11-09 10:47:07 -08:00
SamGondelman
c5a94a415d fix material entity opacity maps 2018-10-17 09:59:43 -07:00
SamGondelman
de10dfb032 don't bind materials during shadow pass 2018-08-07 11:17:18 -07:00
SamGondelman
86ee5c12d8 merge and update based on sam's changes 2018-05-31 17:53:36 -07:00
SamGondelman
e6741a363e add local-only isVisibleInSecondaryCamera flag to entities 2018-05-23 16:35:21 -07:00
SamGondelman
bba47ba2b4 materials on client only entities 2018-04-10 11:35:24 -07:00
SamGondelman
96e48a0162 warnings 2018-03-07 13:50:51 -08:00
SamGondelman
19e4fb2355 materials on primitives 2018-03-07 12:22:17 -08:00
Brad Davis
5aa15b5422 Fixing build warnings 2018-02-26 10:17:07 -08:00
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
SamGondelman
ad40961864 fix tangents (I think), update material rendering when transform changes 2018-02-12 13:46:27 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars,
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00