diff --git a/Engine/source/T3D/assets/ImageAsset.cpp b/Engine/source/T3D/assets/ImageAsset.cpp index 046d98b4c..5a6dfa205 100644 --- a/Engine/source/T3D/assets/ImageAsset.cpp +++ b/Engine/source/T3D/assets/ImageAsset.cpp @@ -239,6 +239,50 @@ const char* ImageAsset::getImageInfo() return ""; } +const char* ImageAsset::getImageTypeNameFromType(ImageAsset::ImageTypes type) +{ + // must match ImageTypes order + static const char* _names[] = { + "Albedo" + "Normal" + "Composite" + "GUI" + "Roughness" + "AO" + "Metalness" + "Glow" + "Particle" + "Decal" + "Cubemap" + }; + + if (type < 0 || type >= ImageTypeCount) + { + Con::errorf("ImageAsset::getAdapterNameFromType - Invalid ImageType, defaulting to Albedo"); + return _names[Albedo]; + } + + return _names[type]; +} + +ImageAsset::ImageTypes ImageAsset::getImageTypeFromName(const char* name) +{ + S32 ret = -1; + for (S32 i = 0; i < ImageTypeCount; i++) + { + if (!dStricmp(getImageTypeNameFromType((ImageTypes)i), name)) + ret = i; + } + + if (ret == -1) + { + Con::errorf("ImageAsset::getImageTypeFromName - Invalid ImageType name, defaulting to Albedo"); + ret = Albedo; + } + + return (ImageTypes)ret; +} + DefineEngineMethod(ImageAsset, getImageFilename, const char*, (), , "Creates an instance of the given GameObject given the asset definition.\n" "@return The GameObject entity created from the asset.") diff --git a/Engine/source/T3D/assets/ImageAsset.h b/Engine/source/T3D/assets/ImageAsset.h index a053c80b2..332020478 100644 --- a/Engine/source/T3D/assets/ImageAsset.h +++ b/Engine/source/T3D/assets/ImageAsset.h @@ -65,6 +65,7 @@ public: Particle = 8, Decal = 9, Cubemap = 10, + ImageTypeCount = 11 }; protected: @@ -100,6 +101,11 @@ public: const char* getImageInfo(); + static const char* getImageTypeNameFromType(ImageTypes type); + static ImageTypes getImageTypeFromName(const char* name); + + void setImageType(ImageTypes type) { mImageType = type; } + protected: virtual void initializeAsset(void); virtual void onAssetRefresh(void); diff --git a/Engine/source/T3D/assets/assetImporter.cpp b/Engine/source/T3D/assets/assetImporter.cpp index 7932686be..a6de3b742 100644 --- a/Engine/source/T3D/assets/assetImporter.cpp +++ b/Engine/source/T3D/assets/assetImporter.cpp @@ -896,12 +896,12 @@ void AssetImporter::processImportAssets(AssetImportObject* assetItem) processImageAsset(item); else if (item->assetType == String("ShapeAsset")) processShapeAsset(item); - else if (item->assetType == String("SoundAsset")) - SoundAsset::prepareAssetForImport(this, item); + /*else if (item->assetType == String("SoundAsset")) + SoundAsset::prepareAssetForImport(this, item);*/ else if (item->assetType == String("MaterialAsset")) processMaterialAsset(item); - else if (item->assetType == String("ShapeAnimationAsset")) - ShapeAnimationAsset::prepareAssetForImport(this, item); + /*else if (item->assetType == String("ShapeAnimationAsset")) + ShapeAnimationAsset::prepareAssetForImport(this, item);*/ item->processed = true; } @@ -933,12 +933,12 @@ void AssetImporter::processImportAssets(AssetImportObject* assetItem) processImageAsset(childItem); else if (childItem->assetType == String("ShapeAsset")) processShapeAsset(childItem); - else if (childItem->assetType == String("SoundAsset")) - SoundAsset::prepareAssetForImport(this, childItem); + /*else if (childItem->assetType == String("SoundAsset")) + SoundAsset::prepareAssetForImport(this, childItem);*/ else if (childItem->assetType == String("MaterialAsset")) processMaterialAsset(childItem); - else if (childItem->assetType == String("ShapeAnimationAsset")) - ShapeAnimationAsset::prepareAssetForImport(this, childItem); + /*else if (childItem->assetType == String("ShapeAnimationAsset")) + ShapeAnimationAsset::prepareAssetForImport(this, childItem);*/ childItem->processed = true; } @@ -1549,12 +1549,12 @@ void AssetImporter::importAssets(AssetImportObject* assetItem) assetPath = importImageAsset(importingAssets[i]); else if (importingAssets[i]->assetType == String("ShapeAsset")) assetPath = importShapeAsset(importingAssets[i]); - else if (importingAssets[i]->assetType == String("SoundAsset")) - assetPath = SoundAsset::importAsset(importingAssets[i]); + /*else if (importingAssets[i]->assetType == String("SoundAsset")) + assetPath = SoundAsset::importAsset(importingAssets[i]);*/ else if (importingAssets[i]->assetType == String("MaterialAsset")) assetPath = importMaterialAsset(importingAssets[i]); - else if (importingAssets[i]->assetType == String("ShapeAnimationAsset")) - assetPath = ShapeAnimationAsset::importAsset(importingAssets[i]); + /*else if (importingAssets[i]->assetType == String("ShapeAnimationAsset")) + assetPath = ShapeAnimationAsset::importAsset(importingAssets[i]);*/ //If we got a valid filepath back from the import action, then we know we're good to go and we can go ahead and register the asset! if (!assetPath.isEmpty() && !isReimport) @@ -1587,12 +1587,12 @@ void AssetImporter::importAssets(AssetImportObject* assetItem) assetPath = importImageAsset(childItem); else if (childItem->assetType == String("ShapeAsset")) assetPath = importShapeAsset(childItem); - else if (childItem->assetType == String("SoundAsset")) - assetPath = SoundAsset::importAsset(childItem); + /*else if (childItem->assetType == String("SoundAsset")) + assetPath = SoundAsset::importAsset(childItem);*/ else if (childItem->assetType == String("MaterialAsset")) assetPath = importMaterialAsset(childItem); - else if (childItem->assetType == String("ShapeAnimationAsset")) - assetPath = ShapeAnimationAsset::importAsset(childItem); + /*else if (childItem->assetType == String("ShapeAnimationAsset")) + assetPath = ShapeAnimationAsset::importAsset(childItem);*/ //If we got a valid filepath back from the import action, then we know we're good to go and we can go ahead and register the asset! if (!assetPath.isEmpty() && !isReimport)