546 commits

Author	SHA1	Message	Date
sabrina-shanman	b2af6d1374	Have only one ColorChannel enum as header in image library	2019-02-12 16:14:41 -08:00
sabrina-shanman	2b355e9d52	Re-name ColorChannelMapping to ColorChannel and put versions in two specific libraries rather than shared	2019-02-12 11:56:44 -08:00
SamGondelman	189ccfde4a	clement's comments from PR14858	2019-02-12 09:51:11 -08:00
SamGondelman	61346437da	working on material mapping	2019-02-12 09:22:31 -08:00
sabrina-shanman	e16e968e98	Merge branch 'fst' of github.com:SamGondelman/hifi into gltf_mat-support	2019-02-11 16:23:15 -08:00
SamGondelman	d96b0534ab	fix resource texture crash	2019-02-11 16:12:13 -08:00
SamGondelman	4202685a4b	Merge remote-tracking branch 'upstream/master' into fst	2019-02-11 16:07:36 -08:00
David Rowe	5428bb19dc	Add "Avatar Script" JSDoc API classification	2019-02-12 11:49:49 +13:00
SamGondelman	4f03157f39	working on fst material mapping	2019-02-11 10:20:55 -08:00
sabrina-shanman	0fda6bd3e0	Merge 'samuel/fst' into gltf_mat-support	2019-02-11 09:28:29 -08:00
sabrina-shanman	f7d7136b3e	Do not have hash specialization just for ColorChannelMapping	2019-02-11 09:06:26 -08:00
SamGondelman	20841a0eea	fix skybox loading I think and pull in sabrina's ktx caching fix	2019-02-09 16:42:34 -08:00
sabrina-shanman	23806ed67d	Add support for GLTF roughness/metallic	2019-02-08 18:54:40 -08:00
Sabrina Shanman	baf72eaae0	Merge pull request #14802 from sabrina-shanman/hfm_prep_joints ... Case 20887: Move FST joint property handling to the model preparation step	2019-02-08 15:02:23 -08:00
SamGondelman	f7a487a020	move materialcache et al to material-networking library	2019-02-08 10:28:07 -08:00
SamGondelman	3addcb630c	Merge remote-tracking branch 'sabrina/hfm_prep_joints' into materialMapping	2019-02-07 11:45:59 -08:00
SamGondelman	9193704173	trying to get hashes working	2019-02-06 11:47:38 -08:00
SamGondelman	3ee448a89a	fix scattering and working on resource cache bug	2019-02-05 17:32:15 -08:00
Clement	8b32a62e2f	Simplify filter check	2019-02-05 17:03:19 -08:00
SamGondelman	5be6a31b6c	possible fix for transparency	2019-01-29 12:20:46 -08:00
sabrina-shanman	3e7a80ac4c	Move FST joint name and rig processing to the model preparation step	2019-01-28 17:49:29 -08:00
SamGondelman	ff3545beab	working with texture transform fallthrough	2019-01-07 13:28:00 -08:00
SamGondelman	a9d798070a	wip	2019-01-02 18:08:59 -08:00
SamGondelman	9155853889	working on material fallthrough	2018-12-20 16:03:58 -08:00
sabrina-shanman	566d09dc9c	Add model preparation step to ModelCache using new library model-baker	2018-12-11 11:15:54 -08:00
sabrina-shanman	31d1512701	Simplify url empty check in GeometryReader::run	2018-12-10 16:12:23 -08:00
sabrina-shanman	8792824960	Remove FormatSerializerRegister as it is unused	2018-12-10 09:58:59 -08:00
sabrina-shanman	7cbe3776f5	Simplify serializer registration process	2018-12-07 12:05:27 -08:00
sabrina-shanman	6ea4769173	Re-name MIMETypeLibrary to MediaTypeLibrary and update related references	2018-12-06 13:39:18 -08:00
sabrina-shanman	1c9beed44f	Fix ModelFormatRegistry Dependency inheritance being private	2018-12-04 09:30:05 -08:00
sabrina-shanman	a04c822ef0	Oops, ModelFormatRegistry needs to be defined as a Dependency before it can be used by DependencyManager	2018-12-04 09:30:04 -08:00
sabrina-shanman	660d8c4e92	Remove unused mapping parameter from MIME type detection	2018-12-04 09:30:04 -08:00
sabrina-shanman	0da4669370	Replace ReadWriteLockable with std::lock_guard in HFMFormatRegistry/ModelFormatRegistry	2018-12-04 09:30:04 -08:00
sabrina-shanman	bf1c5f2fa5	Make Serializer::Factory stored by HFMFormatRegistry unique_ptr	2018-12-04 09:30:03 -08:00
sabrina-shanman	30c4830bd8	Make Serializers use SimpleFormat	2018-12-04 09:30:03 -08:00
sabrina-shanman	39d1a2be6f	Simplify ModelLoader to utilize new model format registry	2018-11-30 16:50:53 -08:00
sabrina-shanman	243a1d6598	Add ModelFormatRegistry for handling model loading on the application side	2018-11-30 16:50:53 -08:00
sabrina-shanman	2919097f29	Complain about empty HFMModel when EITHER meshes or joints are empty	2018-11-28 15:58:02 -08:00
sabrina-shanman	df1083970f	Fix assert in ModelLoader.h	2018-11-27 14:07:03 -08:00
sabrina-shanman	fd83ae231b	Fix case for ModelLoader import	2018-11-27 09:49:55 -08:00
sabrina-shanman	d1f8bfe48b	Move definition of supported file types into ModelLoader	2018-11-26 17:51:11 -08:00
sabrina-shanman	b3d5f2fa65	Add MIME type-based Serializer selection	2018-11-26 16:30:18 -08:00
sabrina-shanman	fc0a31fa0d	Define ModelLoader instance in ModelCache	2018-11-26 16:09:41 -08:00
sabrina-shanman	f900a81e7a	Add ModelLoader	2018-11-26 16:09:41 -08:00
sabrina-shanman	be511378cd	Merge branch 'master' into hfm_serializer	2018-11-20 13:42:24 -08:00
Seth Alves	26a50e1820	don't log urls!	2018-11-19 15:38:12 -08:00
Seth Alves	cd177a4457	catch QString exceptions that ModelCache can throw	2018-11-19 15:25:14 -08:00
sabrina-shanman	e08bc7296f	Merge branch 'master' into hfm_serializer	2018-11-13 15:41:49 -08:00
Brad Hefta-Gaub	bb2239c0bd	Merge pull request #14359 from howard-stearns/no-url-logging ... remove urls from logs in Interface	2018-11-13 13:19:30 -08:00
sabrina-shanman	f971294d6d	Make HFMSerializer return a smart pointer to an HFMModel	2018-11-12 16:12:21 -08:00
sabrina-shanman	baa8cdb054	Remove combineParts from the Serializer interface	2018-11-12 16:12:21 -08:00
sabrina-shanman	00f2b4eeb9	Make the existing model serializers based on HFMSerializer	2018-11-12 16:12:20 -08:00
sabrina-shanman	83cc90ace0	Re-name GLTFReader to GLTFSerializer and do the same for other model readers	2018-11-12 16:12:20 -08:00
sabrina-shanman	753557736e	Merge branch 'master' into hfm_library	2018-11-12 15:03:30 -08:00
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
Zach Fox	be5dc36ccd	Actually fix build error...hopefully!	2018-11-09 14:23:15 -08:00
Zach Fox	df7486d0f5	Remove unused variable, fixing unix build warning	2018-11-09 10:40:46 -08:00
Dante Ruiz	f5b89ee7aa	reverting previous change	2018-11-08 15:43:45 -08:00
Dante Ruiz	5d000495df	making requested changes	2018-11-08 15:33:18 -08:00
Dante Ruiz	2a16ba57ac	fix image entity crash	2018-11-08 15:24:57 -08:00
Jeff Clinton	ea8dc8ae68	Merge pull request #14334 from danteruiz/interstitial-bug-fixes ... Interstitial bug fixes	2018-11-08 11:43:38 -08:00
Zach Fox	1ab1cb95d8	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-08 09:57:10 -08:00
Roxanne Skelly	cef7000a72	Case 19754 - Remove logging URLs and related file locations. ... The goal is to strip out data that can be used by untoward users in copying models, avatars, etc.	2018-11-06 16:24:32 -08:00
Zach Fox	58dd690c0a	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-06 10:29:05 -08:00
sabrina-shanman	2801f324b7	Switch references to HFM to the HFM lib and remove HFM classes in FBX	2018-11-05 12:47:34 -08:00
sabrina-shanman	cbca77b12f	Rename HFMGeometry to HFMModel and adjust related variables	2018-11-01 17:17:48 -07:00
Dante Ruiz	a4b345bb58	fix interstitial domain loading due to bad texture url	2018-11-01 09:25:46 -07:00
sabrina-shanman	becee7f010	Re-name FBXGeometry to HFMGeometry and do the same for related classes	2018-10-30 17:28:42 -07:00
Zach Fox	d1556ae4e8	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-23 15:51:34 -07:00
Kerry Ivan Kurian	e7d1c2873a	Merge branch 'master' into log-resource-requests-2	2018-10-23 13:46:59 -07:00
Zach Fox	988bca201b	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-23 13:36:46 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
Zach Fox	7be5d5674d	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-22 13:59:35 -07:00
Zach Fox	1eca1bfd55	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-22 11:18:10 -07:00
Seth Alves	2ce8ed25f8	Merge pull request #14125 from Atlante45/fix/mac-warnings ... Fix new Mac warnings	2018-10-20 13:40:53 -07:00
Brad Hefta-Gaub	e6ec32e515	Merge pull request #14222 from SamGondelman/material ... Fix material entity opacity maps	2018-10-19 16:45:31 -07:00
Zach Fox	2f37a2b1a1	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-18 11:12:26 -07:00
Zach Fox	2a9e0041b2	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-10-18 10:16:07 -07:00
Kerry Ivan Kurian	3b15548ea3	Display resource-access events in marketplace item tester ... Includes refactoring marketplace item tester into a single-page app.	2018-10-18 01:04:47 -07:00
Sam Gondelman	e3543cf098	Merge branch 'master' into scriptvec3	2018-10-17 13:10:29 -07:00
John Conklin II	e59e3720fe	Merge pull request #14139 from SamGondelman/animation ... Fix various ResourceCache bugs	2018-10-17 11:13:35 -07:00
SamGondelman	c5a94a415d	fix material entity opacity maps	2018-10-17 09:59:43 -07:00
Zach Fox	7de784ce27	First steps (definitely not working)	2018-10-10 12:32:55 -07:00
Clement	8983fe2bcf	Fix new Mac warnings	2018-10-09 12:11:55 -07:00
Sam Gondelman	67662df760	Merge branch 'master' into scriptvec3	2018-10-08 12:59:34 -07:00
SamGondelman	4024f2a180	fix various resourcecache bugs	2018-10-04 11:29:22 -07:00
Wayne Chen	0a7102b4d3	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-04 08:59:26 -07:00
Sam Gondelman	5b6e7b2566	Merge branch 'master' into scriptvec3	2018-10-02 08:58:04 -07:00
Dante Ruiz	652ec2210d	fixing loading issues	2018-10-01 13:58:14 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
SamGondelman	9b75c7e07f	trying to separate colors and vectors	2018-09-04 17:20:05 -07:00
Ryan Huffman	0fcf1517a5	Fix TextureCache not correctly choosing gl41 when gl45 is disabled	2018-08-13 16:35:21 -07:00
Ryan Huffman	44a9b1df0e	Fix choice of target backend in TextureCache on OSX	2018-08-09 12:30:42 -07:00
Ryan Huffman	2ba2c4b68a	Fix TextureCache not compressing textures on Android	2018-08-08 14:06:34 -07:00
Ryan Huffman	6be0c43fca	Update generateIrradiance to take a BackendTarget	2018-08-08 10:00:02 -07:00
Ryan Huffman	140b9be1c4	Update BackendTarget to include version	2018-08-08 10:00:02 -07:00
Ryan Huffman	9ea08f1850	Add ETC2 support to Oven	2018-08-08 10:00:01 -07:00
David Rowe	baf88ab508	Revise scriptable resource caches' interfaces	2018-07-26 16:12:16 +12:00
David Rowe	16e06de9cd	Move scriptable caches into scripting interfaces ... Removed non-working getResource() API functions.	2018-07-25 22:10:14 +12:00
SamGondelman	c4670322ab	Merge remote-tracking branch 'upstream/master' into modelTextures	2018-06-13 11:53:31 -07:00