71 commits

Author	SHA1	Message	Date
Zach Pomerantz	b90f2b2e0a	Use correct textureBaseUrl	2016-03-25 13:17:29 -07:00
Zach Pomerantz	fac54b6ee3	Maintain parity with tex changes	2016-03-25 13:00:18 -07:00
Zach Pomerantz	581bbea36e	Accomodate the caching Model	2016-03-25 11:57:40 -07:00
Zach Pomerantz	a262d9960c	Mind differently tex'ed instances	2016-03-25 11:47:33 -07:00
Zach Pomerantz	864def31ea	Don't refresh NetworkGeometry with cache	2016-03-25 10:56:20 -07:00
Zach Pomerantz	5d306a74d5	Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching	2016-03-25 10:09:37 -07:00
Zach Pomerantz	c625d36bd8	Persist material transform/params	2016-03-24 19:28:44 -07:00
Zach Pomerantz	eeeb175bb8	Derive NetworkMaterial, avoid copying it	2016-03-24 18:50:44 -07:00
Zach Pomerantz	8d0e419a5c	Clean image-reader to drop image sooner	2016-03-24 15:50:48 -07:00
Zach Pomerantz	aa038bac58	Don't cache nested geometries	2016-03-24 14:34:25 -07:00
Zach Pomerantz	4d47126ae4	Don't mark failed models loaded, emit failure	2016-03-24 12:17:55 -07:00
Zach Pomerantz	7f05e4453b	Fetch model geometries through cache	2016-03-24 11:35:40 -07:00
samcake	22191a2864	When an albedo texture is replaced from script,make sure its aloha channel is checked for opacity	2016-03-23 16:12:43 -07:00
samcake	1e46b0803c	fixing repported issues during review	2016-03-23 15:59:57 -07:00
samcake	3c075532f8	Good to go for merge	2016-03-22 15:14:01 -07:00
samcake	de374c0cac	Switching emissive and lightmap somewhere but not big issue	2016-03-21 17:51:57 -07:00
samcake	695e558851	Trying to clena up the problem?	2016-03-21 16:36:47 -07:00
samcake	ec7165983d	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2016-03-21 13:30:28 -07:00
Anthony Thibault	6e872edcae	NetworkGeometry: Fix crash for empty geometry/bad FBX versions ... Interpret empty geometry as an error.	2016-03-20 12:13:54 -07:00
samcake	225b330d41	Trying to better load aand detect the case for transparent textures oor opacity mask	2016-03-18 12:47:33 -07:00
samcake	d58ac269ee	Fixing a bug when albedo map transaprent but not quite loaded yet	2016-03-15 17:01:26 -07:00
Zach Pomerantz	9dcdf26567	Only consider model transparent if all texs are	2016-03-11 15:15:30 -08:00
Zach Pomerantz	3b62e203f7	Cache NetworkGeometry::_hasTransparentTextures	2016-03-11 14:33:18 -08:00
Zach Pomerantz	22d41c833f	Update loaded models with texture transparency	2016-03-11 14:27:36 -08:00
Zach Pomerantz	b627a17ce9	Allow px/color skybox without tex	2016-03-10 12:58:49 -08:00
Zach Pomerantz	1e925d7bd8	Fetch unspecified textures on a delay ... This fixes an abort caused by the assertion in ResourceCache::getResource: assert(delayLoad).	2016-03-10 12:28:59 -08:00
Zach Pomerantz	54af58834a	Mark Resource loaded after postprocessing	2016-03-09 10:34:07 -08:00
Zach Pomerantz	883d4ba006	Only cache processed textures	2016-03-08 14:39:53 -08:00
samcake	16ac69315f	Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture	2016-03-01 16:38:02 -08:00
Zach Pomerantz	d5a5ce8c70	Refactor helper from lambda to static fn	2016-03-01 13:25:10 -08:00
Zach Pomerantz	19c83e869f	Add helper to buildNetworkMaterial	2016-03-01 12:33:55 -08:00
Zach Pomerantz	c5cb3543eb	Cache inline textures under fbx	2016-03-01 12:29:32 -08:00
samcake	5401149713	Cleaning the tlist of textures in the NetworkTexture and in FBXMaterial	2016-02-26 12:10:13 -08:00
samcake	d64b9bb6d9	Drafting the support for gloss map	2016-02-26 09:18:40 -08:00
samcake	96fb9c4466	cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures	2016-02-25 14:13:35 -08:00
samcake	a0d7ce145e	Adding support for emissive and occlusion maps, on to pr land	2016-02-24 17:30:29 -08:00
samcake	00782b0e76	GOing home, this is in the middle of adding the Roughness texture and potentially cleaning up the different compinations of shaders regarding the material textures	2016-02-22 18:19:36 -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	903824809c	trying to have better support for the materials	2016-02-18 18:33:32 -08:00
samcake	0ad7bacf02	Changing diffuse to albedo and breaking everything...	2016-02-15 21:50:10 -08:00
Zach Pomerantz	d21f9d555a	Update NetworkMaterial maps when changing textures	2016-02-12 12:37:07 -08:00
Brad Davis	421160eeb6	Make the file parsing threads run at lower priority	2016-02-08 23:55:02 -08:00
samcake	f98f8d5bbb	Revert "Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque"	2016-01-22 11:51:02 -08:00
ericrius1	0ffcf437e9	Fix for transparent textures not being rendered with opacity	2016-01-20 16:22:49 -08:00
ericrius1	eb5a950f85	texture opacity potential fix	2016-01-20 15:08:39 -08:00
Brad Hefta-Gaub	29b9592c8c	Merge pull request #6838 from ctrlaltdavid/20763 ... Fix reading model's "textures" property	2016-01-15 17:02:14 -08:00
Brad Hefta-Gaub	8f8afabbfe	Merge pull request #6811 from Atlante45/master ... Fix skybox not always rendering correctly	2016-01-13 21:00:48 -08:00
David Rowe	a59cbd1aca	Merge branch 'master' into 20763	2016-01-14 17:25:44 +13:00
Atlante45	205c14eb43	Remove unused headers	2016-01-13 11:47:43 -08:00
Atlante45	0008b1a055	Code cleanup	2016-01-12 20:49:25 -08:00