Commit graph

40 commits

Author SHA1 Message Date
sabrina-shanman
203e8e2455 Realize joint properties isFree and freeLineage are unused, so tear them out 2019-01-29 11:55:35 -08:00
sabrina-shanman
be511378cd Merge branch 'master' into hfm_serializer 2018-11-20 13:42:24 -08:00
humbletim
21030fbe5b Merge remote-tracking branch 'upstream/master' into fb18302-deprecated-package-model 2018-11-14 23:40:04 -05: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
5b6e2aae5a Remove/move some unused serializer imports 2018-11-12 16:12:21 -08:00
sabrina-shanman
f971294d6d Make HFMSerializer return a smart pointer to an HFMModel 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
Zach Fox
142dfab9ac CR round 1 2018-11-08 10:05:57 -08:00
sabrina-shanman
e654ff9bbc Remove forward declaration in HFM.h so ModelPackager and other things can use it instead 2018-11-06 14:53:23 -08:00
Howard Stearns
05becb870f remove urls from logs in Interface 2018-11-06 13:47:07 -08:00
sabrina-shanman
30eb360f62 Convert remaining HFMModels called model to hfmModel, and rename some missed local variables 2018-11-05 12:07:17 -08:00
sabrina-shanman
cbca77b12f Rename HFMGeometry to HFMModel and adjust related variables 2018-11-01 17:17:48 -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
humbletim
2cf633ca02 remove Model Type dropdown and related code paths 2018-10-22 15:05:49 -04:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
luiscuenca
689fbd2da0 added requested changes 2018-05-02 11:09:17 -07:00
luiscuenca
2de982a5a2 Added script types and better script reload 2018-04-30 12:04:35 -07:00
luiscuenca
e0770f06b1 Add scripts to Model Packager 2018-04-25 19:35:26 -07:00
vladest
556569819d 1st stage of moving to async dialogs 2017-08-09 14:00:19 +02:00
howard-stearns
51a4154ae7 Check results of qUncompress, and catch fbx reader throws in utility
programs.
2016-03-30 16:56:39 -07:00
samcake
0ad7bacf02 Changing diffuse to albedo and breaking everything... 2016-02-15 21:50:10 -08:00
Brad Hefta-Gaub
927fe97359 migrate callers of QMessageBox::warning() to OffscreenUi::warning() 2016-01-05 10:17:16 -08:00
samcake
4513b64b00 fixing review comments 2015-09-21 22:42:24 -07:00
Sam Gateau
4e944645fe more cleaning for showing a cleaner pr 2015-08-28 16:58:36 -07:00
Sam Gateau
f6953f8e02 REfining th eTextureMap design but still with the issue of the lightmapped model 2015-08-27 09:52:07 -07:00
Anthony J. Thibault
1b3d7fabc8 ResourceCache, NetworkGeometry and Model refactoring and optimizations.
* Removed validation logic from Resource class, Qt does this internally and is more
  standards compliant.  This should result in more accurate caching and faster resource
  fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.

* NetworkGeometry now uses multiple Resource objects to download
  the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
  have to poll it to determine when loading is complete (except for textures *sigh*)

Some functionality was removed

* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.

* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
  This can result in a pop when switching avatars, and there's no longer a default
  if avatar loading fails.
2015-08-20 18:59:51 -07:00
Marcel Verhagen
8f0893ba21 Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives.
Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file.

So it now does not break existing content.

Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.
2015-07-22 22:34:45 +02:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
fc5b442e12 interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging 2015-04-07 09:15:11 -07:00
Seth Alves
fb607e2b26 logging groups for library/shared and interface 2015-04-06 18:45:06 -07:00
ZappoMan
64fdca7d6d fix no root joint warning 2015-03-30 17:32:42 -07:00
ZappoMan
baa2f947e5 classifying FSTReader and moving ModelType into that class 2015-03-27 16:30:00 -07:00
ZappoMan
6189926105 add type hint to FST in model packager 2015-03-27 13:23:29 -07:00
Atlante45
716e9bfe4f Hint order for FST files 2015-03-26 15:40:48 +01:00
Atlante45
52c0ba817a Remove dead code 2015-03-12 16:32:09 +01:00
Atlante45
bcfd4b50be Merge branch 'master' of https://github.com/highfidelity/hifi into package_models 2015-03-12 14:18:37 +01:00
Atlante45
1609823e2b Move helper function to top 2015-03-11 16:32:45 +01:00
Atlante45
40c593bd0d Working model packager 2015-03-11 16:17:13 +01:00
Atlante45
d0d9d4bbac Introduced ModelPackager 2015-03-10 11:50:13 +01:00