174 commits

Author	SHA1	Message	Date
Seth Alves	8d00f0ab8f	allow obj reader to either combine meshes or keep parts separate	2017-04-07 15:59:01 -07:00
Stephen Birarda	0b57b98970	change readFBX calls to use QUrl where possible	2017-04-04 14:53:14 -07:00
samcake	a2b2e3e169	Revert "Revert "Don't hold KTX files open for longer than transfers require""	2017-03-28 14:45:04 -07:00
samcake	08e1a2ba4c	Revert "Don't hold KTX files open for longer than transfers require"	2017-03-28 14:06:09 -07:00
samcake	e42cb52bd1	Merge pull request #10020 from jherico/ktx_refactor ... Don't hold KTX files open for longer than transfers require	2017-03-28 14:06:02 -07:00
Seth Alves	651d87dc2a	move Qt-related stuff out of model and into model-networking	2017-03-28 07:53:25 -07:00
Bradley Austin Davis	638364497d	Trying a different tactic to avoid multiple concurrent file access	2017-03-27 16:18:04 -07:00
Bradley Austin Davis	f764cd614b	Don't hold KTX files open for longer than transfers require	2017-03-27 13:33:00 -07:00
Brad Davis	14c8c3f4db	Return existing textures when matching hash for a previously found live texture	2017-03-20 09:39:29 -07:00
Brad Davis	5e716f15b5	Protect against missing texture cache on shutdown	2017-03-14 13:48:24 -07:00
Zach Pomerantz	a41146451b	Merge pull request #9883 from jherico/smarter_textures ... Don't crash when failing to convert a texture to KTX format	2017-03-14 12:14:56 -04:00
Brad Davis	1ccf715e3b	Don't crash when failing to convert a texture to KTX format	2017-03-14 09:09:14 -07:00
Zach Pomerantz	172a638ef0	move resource paths to PathUtils	2017-03-13 17:26:34 -04:00
Zach Pomerantz	a27d88da1a	update TextureCache to use FileCache	2017-03-13 13:41:44 -04:00
Zach Pomerantz	ffdaa09072	use stored Usage(Type), Sampler for KTX	2017-03-08 15:54:32 -05:00
Brad Davis	9d56001341	Fix rebase	2017-03-08 12:14:45 -08:00
Zach Pomerantz	170df4a1f4	Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27	2017-03-06 17:14:11 -07:00
Brad Davis	8782fe1d93	Merge branch 'master' into smarter_textures ... Conflicts: libraries/model-networking/src/model-networking/TextureCache.cpp	2017-03-06 15:29:41 -08:00
Bradley Austin Davis	47087add15	Add support for fallback textures, throttling texture creation	2017-03-03 09:00:12 -08:00
Zach Pomerantz	1425eb0936	Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27	2017-03-01 21:01:37 -05:00
Zach Pomerantz	febeeeca3a	namespace cache::FileCache and use unique_ptr	2017-03-01 20:58:00 -05:00
Zach Pomerantz	c71e614dd5	add loading from persisted files	2017-03-01 20:18:31 -05:00
Bradley Austin Davis	fa5b315e09	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-01 15:16:18 -08:00
Zach Pomerantz	e8319f967d	add loading from KTXCache	2017-03-01 17:28:51 -05:00
Zach Pomerantz	a6a0fd3851	fix FileCache persistence	2017-03-01 11:32:11 -05:00
Zach Pomerantz	c044daf7b2	TextureCache	2017-02-28 13:30:47 -05:00
samcake	576660f6ef	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-27 18:17:28 -08:00
Zach Pomerantz	cfe14518a1	KTXCache	2017-02-27 18:05:57 -05:00
Seth Alves	6e9854cad0	don't crash if geometry fails to load	2017-02-24 13:01:01 -08:00
sam	e1aad8bd63	Deep dive into the shape key and filters and the PLumber construction	2017-02-24 00:35:10 -08:00
Brad Davis	27e8750b9b	Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction	2017-02-19 18:11:56 -08:00
Bradley Austin Davis	7fb7aa87eb	Working on new texture management strategy	2017-02-17 07:53:16 -08:00
samcake	b9102204ea	FIx the filtering problem on color and normals introduced since we generate mips with QImage	2017-02-10 11:40:39 -08:00
Andrew Meadows	d65cbbb455	name change: maxSize to maxNumPixels	2017-02-06 11:53:37 -08:00
Andrew Meadows	b3ae6f9aec	cap size of textures from FBX files	2017-02-06 11:53:37 -08:00
Andrew Meadows	45c73439eb	use type definition	2017-02-06 11:53:37 -08:00
Brad Davis	30a9961362	tracing polish	2016-12-16 14:02:27 -08:00
Brad Davis	a12b8b4b62	Cleanup dead code	2016-12-16 09:21:41 -08:00
Ryan Huffman	7bb2755913	Add chrome tracing support	2016-12-16 01:14:01 -08:00
Anthony J. Thibault	ec801cb9d8	Addressed feedback from code review.	2016-10-07 17:46:46 -07:00
Brad Hefta-Gaub	2cba3db2b6	fix crash when bouncing to escotology, which may or may not be related	2016-10-01 11:08:52 -07:00
Brad Davis	0953027ef3	Identify pre-generated textures	2016-09-23 12:04:56 -07:00
Brad Davis	a7f0ba24ed	Dynamic texture memory management	2016-09-23 12:04:42 -07:00
Brad Davis	ecfe56085d	GLM update and GLI integration	2016-09-09 10:18:15 -07:00
Andrew Meadows	48c73acae0	restore privacy of GeometryResourceWatcher methods	2016-08-24 22:26:56 -07:00
Andrew Meadows	726928c14c	creae collision Geometry from mesh	2016-08-24 22:25:45 -07:00
Brad Davis	5cdb30357f	Add checking for failed downloads in the textures	2016-08-24 18:03:56 -07:00
Seth Alves	87dbfa7e47	add -Wsuggest-override to compile flags and deal with fallout	2016-08-18 09:51:41 -07:00
Ryan Huffman	36744d72d6	Fix warning using init list for QVariantMap	2016-08-08 16:03:03 -07:00
Ryan Huffman	5b69ca03f0	Move default skybox out of global and make irradiance gen optional	2016-08-08 16:03:03 -07:00