TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-28 07:45:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

asset load flow work

Browse source 
add reloading state to asset tracking,
convert most asset.isnull() checks on over to skipping out unless the errcode is ::Ok, or ::UsingFallback
add more errstriongcodes to hook up
skip load<type> execution if the asset loaded state is ::Ok
This commit is contained in:
AzaezelX 2023-10-08 13:19:43 -05:00
parent 753cbe32d9
commit b710a309bd
23 changed files with 177 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Engine/source/T3D/assets/ImageAsset.cpp
View file

@ -125,13 +125,18 @@ ImplementEnumType(ImageAssetType,
EndImplementEnumType;
const String ImageAsset::mErrCodeStrings[] =
{
"TooManyMips",
"UnKnown"
};
//-----------------------------------------------------------------------------
ImageAsset::ImageAsset() : AssetBase(), mUseMips(true), mIsHDRImage(false), mIsValidImage(false), mImageType(Albedo)
{
mImageFileName = StringTable->EmptyString();
mImagePath = StringTable->EmptyString();
mLoadedState = AssetErrCode::NotLoaded;
mChangeSignal.notify(this, &ImageAsset::onAssetRefresh);
}
//-----------------------------------------------------------------------------
@ -202,6 +207,7 @@ U32 ImageAsset::getAssetByFilename(StringTableEntry fileName, AssetPtr<ImageAsse
{
//acquire and bind the asset, and return it out
imageAsset->setAssetId(query.mAssetList[0]);
(*imageAsset)->loadImage();
return (*imageAsset)->mLoadedState;
}
}
@ -234,12 +240,14 @@ U32 ImageAsset::getAssetById(StringTableEntry assetId, AssetPtr<ImageAsset>* ima
if (imageAsset->notNull())
{
(*imageAsset)->loadImage();
return (*imageAsset)->mLoadedState;
}
else
{
if (imageAsset->isNull())
{
(*imageAsset)->loadImage();
//Well that's bad, loading the fallback failed.
Con::warnf("ImageAsset::getAssetById - Finding of asset with id %s failed with no fallback asset", assetId);
return AssetErrCode::Failed;
@ -248,6 +256,7 @@ U32 ImageAsset::getAssetById(StringTableEntry assetId, AssetPtr<ImageAsset>* ima
//handle noshape not being loaded itself
if ((*imageAsset)->mLoadedState == BadFileReference)
{
(*imageAsset)->loadImage();
Con::warnf("ImageAsset::getAssetById - Finding of asset with id %s failed, and fallback asset reported error of Bad File Reference.", assetId);
return AssetErrCode::BadFileReference;
}
@ -268,6 +277,7 @@ void ImageAsset::copyTo(SimObject* object)
void ImageAsset::loadImage()
{
if (mLoadedState == AssetErrCode::Ok) return;
if (mImagePath)
{
if (!Torque::FS::IsFile(mImagePath))
@ -279,7 +289,6 @@ void ImageAsset::loadImage()
mLoadedState = Ok;
mIsValidImage = true;
mChangeSignal.trigger();
return;
}
mLoadedState = BadFileReference;
@ -292,13 +301,13 @@ void ImageAsset::initializeAsset()
ResourceManager::get().getChangedSignal().notify(this, &ImageAsset::_onResourceChanged);
mImagePath = getOwned() ? expandAssetFilePath(mImageFileName) : mImagePath;
loadImage();
//loadImage();
}
void ImageAsset::onAssetRefresh()
{
mImagePath = getOwned() ? expandAssetFilePath(mImageFileName) : mImagePath;
loadImage();
//loadImage();
}
void ImageAsset::_onResourceChanged(const Torque::Path& path)
@ -309,6 +318,7 @@ void ImageAsset::_onResourceChanged(const Torque::Path& path)
refreshAsset();
//loadImage();
onAssetRefresh();
}
void ImageAsset::setImageFileName(const char* pScriptFile)

17
Engine/source/T3D/assets/ImageAsset.h
View file

@ -54,6 +54,7 @@
class ImageAsset : public AssetBase
{
typedef AssetBase Parent;
typedef AssetPtr<ImageAsset> ConcreteAssetPtr;
public:
/// The different types of image use cases
@ -75,6 +76,22 @@ public:
static StringTableEntry smNoImageAssetFallback;
enum ImageAssetErrCode
{
TooManyMips = AssetErrCode::Extended,
Extended
};
static const String mErrCodeStrings[U32(ImageAssetErrCode::Extended) - U32(Parent::Extended) + 1];
static U32 getAssetErrCode(ConcreteAssetPtr checkAsset) { if (checkAsset) return checkAsset->mLoadedState; else return 0; }
static String getAssetErrstrn(U32 errCode)
{
if (errCode < Parent::Extended) return Parent::getAssetErrstrn(errCode);
if (errCode > ImageAssetErrCode::Extended) return "undefined error";
return mErrCodeStrings[errCode - Parent::Extended];
};
protected:
StringTableEntry mImageFileName;
StringTableEntry mImagePath;

7
Engine/source/T3D/assets/MaterialAsset.cpp
View file

@ -45,6 +45,13 @@
StringTableEntry MaterialAsset::smNoMaterialAssetFallback = NULL;
const String MaterialAsset::mErrCodeStrings[] =
{
"ScriptLoaded",
"DefinitionAlreadyExists",
"EmbeddedDefinition",
"UnKnown"
};
//-----------------------------------------------------------------------------
IMPLEMENT_CONOBJECT(MaterialAsset);

11
Engine/source/T3D/assets/MaterialAsset.h
View file

@ -63,6 +63,7 @@
class MaterialAsset : public AssetBase
{
typedef AssetBase Parent;
typedef AssetPtr<MaterialAsset> ConcreteAssetPtr;
String mShaderGraphFile;
StringTableEntry mScriptFile;
@ -82,6 +83,16 @@ public:
Extended
};
static const String mErrCodeStrings[U32(MaterialAssetErrCode::Extended) - U32(Parent::Extended) + 1];
static U32 getAssetErrCode(ConcreteAssetPtr checkAsset) { if (checkAsset) return checkAsset->mLoadedState; else return 0; }
static String getAssetErrstrn(U32 errCode)
{
if (errCode < Parent::Extended) return Parent::getAssetErrstrn(errCode);
if (errCode > MaterialAssetErrCode::Extended) return "undefined error";
return mErrCodeStrings[errCode - Parent::Extended];
};
public:
MaterialAsset();
virtual ~MaterialAsset();

6
Engine/source/T3D/assets/ShapeAnimationAsset.cpp
View file

@ -90,6 +90,12 @@ ConsoleSetType(TypeShapeAnimationAssetPtr)
Con::warnf("(TypeShapeAnimationAssetPtr) - Cannot set multiple args to a single asset.");
}
const String ShapeAnimationAsset::mErrCodeStrings[] =
{
"TooManyBones",
"UnKnown"
};
//-----------------------------------------------------------------------------
ShapeAnimationAsset::ShapeAnimationAsset() :

23
Engine/source/T3D/assets/ShapeAnimationAsset.h
View file

@ -44,11 +44,17 @@
#include "core/resource.h"
#endif
#ifndef _ASSET_PTR_H_
#include "assets/assetPtr.h"
#endif
#include "assetMacroHelpers.h"
//-----------------------------------------------------------------------------
class ShapeAnimationAsset : public AssetBase
{
typedef AssetBase Parent;
typedef AssetPtr<ShapeAnimationAsset> ConcreteAssetPtr;
protected:
StringTableEntry mFileName;
StringTableEntry mFilePath;
@ -72,6 +78,21 @@ protected:
Resource<TSShape> mSourceShape;
public:
enum ShapeAnimationAssetErrCode
{
TooManyBones = AssetErrCode::Extended,
Extended
};
static const String mErrCodeStrings[U32(ShapeAnimationAssetErrCode::Extended) - U32(Parent::Extended) + 1];
static U32 getAssetErrCode(ConcreteAssetPtr checkAsset) { if (checkAsset) return checkAsset->mLoadedState; else return 0; }
static String getAssetErrstrn(U32 errCode)
{
if (errCode < Parent::Extended) return Parent::getAssetErrstrn(errCode);
if (errCode > ShapeAnimationAssetErrCode::Extended) return "undefined error";
return mErrCodeStrings[errCode - Parent::Extended];
};
ShapeAnimationAsset();
virtual ~ShapeAnimationAsset();

15
Engine/source/T3D/assets/ShapeAsset.cpp
View file

@ -117,7 +117,7 @@ ConsoleSetType(TypeShapeAssetId)
//-----------------------------------------------------------------------------
const String ShapeAsset::mShapeErrCodeStrings[] =
const String ShapeAsset::mErrCodeStrings[] =
{
"TooManyVerts",
"TooManyBones",
@ -225,7 +225,7 @@ void ShapeAsset::initializeAsset()
mNormalImposterPath = StringTable->insert(normalPath.c_str());
}
loadShape();
//loadShape();
}
void ShapeAsset::setShapeFile(const char* pShapeFile)
@ -307,11 +307,13 @@ void ShapeAsset::_onResourceChanged(const Torque::Path &path)
refreshAsset();
loadShape();
onAssetRefresh();
}
bool ShapeAsset::loadShape()
{
if (mLoadedState == AssetErrCode::Ok) return true;
mMaterialAssets.clear();
mMaterialAssetIds.clear();
@ -396,7 +398,8 @@ bool ShapeAsset::loadShape()
//First, we need to make sure the anim asset we depend on for our blend is loaded
AssetPtr<ShapeAnimationAsset> blendAnimAsset = mAnimationAssets[i]->getBlendAnimationName();
if (blendAnimAsset.isNull())
U32 assetStatus = ShapeAnimationAsset::getAssetErrCode(blendAnimAsset);
if (assetStatus != AssetBase::Ok)
{
Con::errorf("ShapeAsset::initializeAsset - Unable to acquire reference animation asset %s for asset %s to blend!", mAnimationAssets[i]->getBlendAnimationName(), mAnimationAssets[i]->getAssetName());
{
@ -458,6 +461,7 @@ U32 ShapeAsset::getAssetByFilename(StringTableEntry fileName, AssetPtr<ShapeAsse
{
//acquire and bind the asset, and return it out
shapeAsset->setAssetId(query.mAssetList[0]);
(*shapeAsset)->loadShape();
return (*shapeAsset)->mLoadedState;
}
}
@ -490,6 +494,7 @@ U32 ShapeAsset::getAssetById(StringTableEntry assetId, AssetPtr<ShapeAsset>* sha
if (shapeAsset->notNull())
{
(*shapeAsset)->loadShape();
return (*shapeAsset)->mLoadedState;
}
else
@ -499,6 +504,7 @@ U32 ShapeAsset::getAssetById(StringTableEntry assetId, AssetPtr<ShapeAsset>* sha
if (shapeAsset->isNull())
{
(*shapeAsset)->loadShape();
//Well that's bad, loading the fallback failed.
Con::warnf("ShapeAsset::getAssetById - Finding of asset with id %s failed with no fallback asset", assetId);
return AssetErrCode::Failed;
@ -507,6 +513,7 @@ U32 ShapeAsset::getAssetById(StringTableEntry assetId, AssetPtr<ShapeAsset>* sha
//handle noshape not being loaded itself
if ((*shapeAsset)->mLoadedState == BadFileReference)
{
(*shapeAsset)->loadShape();
Con::warnf("ShapeAsset::getAssetById - Finding of asset with id %s failed, and fallback asset reported error of Bad File Reference.", assetId);
return AssetErrCode::BadFileReference;
}

8
Engine/source/T3D/assets/ShapeAsset.h
View file

@ -65,6 +65,7 @@
class ShapeAsset : public AssetBase
{
typedef AssetBase Parent;
typedef AssetPtr<ShapeAsset> ConcreteAssetPtr;
protected:
StringTableEntry mFileName;
@ -104,15 +105,14 @@ public:
static StringTableEntry smNoShapeAssetFallback;
static const String mShapeErrCodeStrings[U32(ShapeAssetErrCode::Extended) - U32(Parent::Extended) + 1];
static U32 getAssetErrCode(AssetPtr<ShapeAsset> shapeAsset) { if (shapeAsset) return shapeAsset->mLoadedState; else return 0; }
static const String mErrCodeStrings[U32(ShapeAssetErrCode::Extended) - U32(Parent::Extended) + 1];
static U32 getAssetErrCode(ConcreteAssetPtr checkAsset) { if (checkAsset) return checkAsset->mLoadedState; else return 0; }
static String getAssetErrstrn(U32 errCode)
{
if (errCode < Parent::Extended) return Parent::getAssetErrstrn(errCode);
if (errCode > ShapeAssetErrCode::Extended) return "undefined error";
return mShapeErrCodeStrings[errCode - Parent::Extended];
return mErrCodeStrings[errCode - Parent::Extended];
};
ShapeAsset();

9
Engine/source/T3D/assets/SoundAsset.cpp
View file

@ -106,6 +106,14 @@ ConsoleSetType(TypeSoundAssetId)
Con::warnf("(TypeAssetId) - Cannot set multiple args to a single asset.");
}
const String SoundAsset::mErrCodeStrings[] =
{
"BadProfile",
"BadDescription",
"BadBufferData",
"UnKnown"
};
//-----------------------------------------------------------------------------
SoundAsset::SoundAsset()
@ -215,6 +223,7 @@ void SoundAsset::onAssetRefresh(void)
bool SoundAsset::loadSound()
{
if (mLoadedState == AssetErrCode::Ok) return true;
if (mSoundPath)
{
if (!Torque::FS::IsFile(mSoundPath))

18
Engine/source/T3D/assets/SoundAsset.h
View file

@ -70,6 +70,7 @@ class SFXResource;
class SoundAsset : public AssetBase
{
typedef AssetBase Parent;
typedef AssetPtr<SoundAsset> ConcreteAssetPtr;
protected:
StringTableEntry mSoundFile;
@ -106,6 +107,23 @@ protected:
SoundAssetChanged mChangeSignal;
public:
enum SoundAssetErrCode
{
BadProfile = AssetErrCode::Extended,
BadDescription,
BadBufferData,
Extended
};
static const String mErrCodeStrings[U32(SoundAssetErrCode::Extended) - U32(Parent::Extended) + 1];
static U32 getAssetErrCode(ConcreteAssetPtr checkAsset) { if (checkAsset) return checkAsset->mLoadedState; else return 0; }
static String getAssetErrstrn(U32 errCode)
{
if (errCode < Parent::Extended) return Parent::getAssetErrstrn(errCode);
if (errCode > SoundAssetErrCode::Extended) return "undefined error";
return mErrCodeStrings[errCode - Parent::Extended];
};
SoundAsset();
virtual ~SoundAsset();