30380 commits

Author	SHA1	Message	Date
sabrina-shanman	79e9bff225	Nest if statement for invalid id checking in hfm::FormatRegistry::getSerializerForMediaType	2018-12-10 16:18:11 -08:00
sabrina-shanman	31d1512701	Simplify url empty check in GeometryReader::run	2018-12-10 16:12:23 -08:00
sabrina-shanman	b960b66542	Fix mac warning for std::move on temporary object	2018-12-10 11:10:29 -08:00
sabrina-shanman	8792824960	Remove FormatSerializerRegister as it is unused	2018-12-10 09:58:59 -08:00
sabrina-shanman	031085b384	Remove now unused HFMSimpleFormat	2018-12-07 16:17:33 -08:00
sabrina-shanman	f2e69aec5e	Fix mac warning for OBJSerializer::getFactory not marked with override	2018-12-07 13:41:33 -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	ed1684967f	Remove straggler HFMSimpleFormat.cpp	2018-12-04 10:08:14 -08:00
sabrina-shanman	1c9beed44f	Fix ModelFormatRegistry Dependency inheritance being private	2018-12-04 09:30:05 -08:00
sabrina-shanman	3c38b43a65	Fix compilation error due to static variable definition in MIMETypeLibrary header file	2018-12-04 09:30:04 -08:00
sabrina-shanman	a63888cac8	Remove unused default constructor for GLTFSerializer	2018-12-04 09:30:04 -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	da9f37bb39	Fix up HFMFormatRegistry to accept subclass factory unique pointers	2018-12-04 09:30:04 -08:00
sabrina-shanman	19459c15a5	Split MIMETypeLibrary file type detection into three separate functions	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	6ec0e42ded	Remove locks from MIMETypeLibrary	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	2178baf1a8	Create SimpleFormat	2018-12-04 09:29:57 -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	74015a1a5e	Implement hfm::Format/hfm::Factory for model serializers	2018-11-30 16:50:53 -08:00
sabrina-shanman	d1ac501967	Create hfm::FormatRegistry, for more general model format definition	2018-11-30 16:50:45 -08:00
sabrina-shanman	142e787a9c	Create MIMETypeLibrary for general MIME type detection	2018-11-30 10:28:43 -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	b809eed01f	Merge branch 'master' into hfm_mimetype	2018-11-28 15:06:04 -08:00
Seth Alves	0de011dd71	Merge pull request #14478 from danteruiz/ScriptEngine-Crashes ... Fix script engine crashes when reloading scripts.	2018-11-28 12:04:52 -08:00
Shannon Romano	ff934a8f87	Merge pull request #14394 from sabrina-shanman/hfm_serializer ... (case 20005) Create HFMSerializer interface for model loaders	2018-11-28 11:10:27 -08:00
sabrina-shanman	df1083970f	Fix assert in ModelLoader.h	2018-11-27 14:07:03 -08:00
Seth Alves	8f21ade0c7	make cmake -DDISABLE_QML=1 work again	2018-11-27 12:41:40 -08:00
Sam Gateau	87730884ab	Merge pull request #14340 from Nex-Pro/patch-5 ... Change to English spelling of 'declination'	2018-11-27 10:53:28 -08:00
sabrina-shanman	fd83ae231b	Fix case for ModelLoader import	2018-11-27 09:49:55 -08:00
Dante Ruiz	c4a9ca3445	fix interface crashing when reloading scripts	2018-11-27 09:32:37 -08:00
sabrina-shanman	d1f8bfe48b	Move definition of supported file types into ModelLoader	2018-11-26 17:51:11 -08:00
sabrina-shanman	98853b5d1d	Move FBXSerializer import by AnimationCache to source file	2018-11-26 16:30:18 -08:00
sabrina-shanman	b3d5f2fa65	Add MIME type-based Serializer selection	2018-11-26 16:30:18 -08:00
sabrina-shanman	2387641cbb	Store the MIME type in HTTPResourceRequest::onRequestFinished()	2018-11-26 16:09:41 -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
birarda	23857ea8c2	ensure packets are added to loss list after timeout	2018-11-19 17:40:55 -08:00
Jeff Clinton	30051f75da	Merge pull request #14434 from sethalves/fix-throw-from-worker ... catch QString exceptions that ModelCache can throw	2018-11-19 16:36:52 -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
Jeff Clinton	484de06cf4	Merge pull request #14422 from SimonWalton-HiFi/entities-json-less-strict ... Don't check for presence of particular keys in models json	2018-11-19 10:29:10 -08:00
Jeff Clinton	870619b19d	Merge pull request #14412 from amantley/avatarPipelineOffsets ... Avatar Pipeline Joint Rotation Offsets Handling	2018-11-19 08:54:29 -08:00
Seth Alves	b72f462028	Merge pull request #14406 from danteruiz/master-disable-interstitial ... disable interstitial for master	2018-11-16 20:13:50 -08:00
Simon Walton	3baebf55c5	Don't enforce key presence in models.json	2018-11-16 17:33:13 -08:00