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

add backwards compatibility

Browse source 
Adds the backwards compatibility functions
is<asset>Valid
get<asset>Profile
This commit is contained in:
marauder2k7 2026-04-06 09:56:03 +01:00
parent dc140daa9c
commit d4c0c6fd3d
2 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -582,8 +582,18 @@ void SoundAsset::populateSFXTrack(void)
{ {
U32 count = 0; U32 count = 0;
for (U32 i = 0; i < SFXPlayList::SFXPlaylistSettings::NUM_SLOTS; ++i) for (U32 i = 0; i < SFXPlayList::SFXPlaylistSettings::NUM_SLOTS; ++i)
if (mSoundFile[i] != StringTable->EmptyString() && Torque::FS::IsFile(mSoundFile[i])) {
if (mSoundFile[i] != StringTable->EmptyString())
{
if (!Torque::FS::IsFile(mSoundFile[i]))
{
mLoadedState = AssetErrCode::BadFileReference;
return;
}
++count; ++count;
}
}
mIsPlaylist = (count > 1); mIsPlaylist = (count > 1);

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

@ -259,13 +259,15 @@ public:
AssetPtr<SoundAsset> get##name##Asset(void) { return m##name##Asset; } \ AssetPtr<SoundAsset> get##name##Asset(void) { return m##name##Asset; } \
static bool _set##name##Data(void* obj, const char* index, const char* data) { static_cast<className*>(obj)->_set##name(_getStringTable()->insert(data)); return false;} \ static bool _set##name##Data(void* obj, const char* index, const char* data) { static_cast<className*>(obj)->_set##name(_getStringTable()->insert(data)); return false;} \
StringTableEntry get##name##File(){ return m##name##Asset.notNull() ? m##name##Asset->getSoundFile() : ""; } \ StringTableEntry get##name##File(){ return m##name##Asset.notNull() ? m##name##Asset->getSoundFile() : ""; } \
SFXDescription* get##name##Description()\ bool is##name##Valid() { return (get##name##File() != StringTable->EmptyString() && m##name##Asset && m##name##Asset->getStatus() == AssetBase::Ok); } \
{\ SFXDescription* get##name##Description() \
if (m##name##Asset.notNull())\ { \
return m##name##Asset->getSfxDescription();\ if (m##name##Asset.notNull()) \
return NULL;\ return m##name##Asset->getSfxDescription(); \
}\ return NULL; \
SimObjectPtr<SFXTrack> get##name##SFXTrack(){ return m##name##Asset.notNull() ? m##name##Asset->getSFXTrack() : NULL; } } \
SimObjectPtr<SFXTrack> get##name##SFXTrack(){ return m##name##Asset.notNull() ? m##name##Asset->getSFXTrack() : NULL; } \
SimObjectPtr<SFXTrack> get##name##Profile(){ return get##name##SFXTrack(); }
#define INITPERSISTFIELD_SOUNDASSET(name, consoleClass, docs) \ #define INITPERSISTFIELD_SOUNDASSET(name, consoleClass, docs) \
addProtectedField(#name, TypeSoundFilename, Offset(m##name##File, consoleClass), _set##name##Data, &defaultProtectedGetFn, assetDoc(name, file docs.), AbstractClassRep::FIELD_HideInInspectors); \ addProtectedField(#name, TypeSoundFilename, Offset(m##name##File, consoleClass), _set##name##Data, &defaultProtectedGetFn, assetDoc(name, file docs.), AbstractClassRep::FIELD_HideInInspectors); \
@ -384,13 +386,15 @@ void _set##name(StringTableEntry _in, const U32& index){
AssetPtr<SoundAsset> get##name##Asset(const U32& index) { return m##name##Asset[index]; } \ AssetPtr<SoundAsset> get##name##Asset(const U32& index) { return m##name##Asset[index]; } \
static bool _set##name##Data(void* obj, const char* index, const char* data) { static_cast<className*>(obj)->_set##name(_getStringTable()->insert(data), dAtoi(index)); return false; } \ static bool _set##name##Data(void* obj, const char* index, const char* data) { static_cast<className*>(obj)->_set##name(_getStringTable()->insert(data), dAtoi(index)); return false; } \
StringTableEntry get##name##File(const U32& index) { return m##name##Asset[index].notNull() ? m##name##Asset[index]->getSoundFile() : ""; } \ StringTableEntry get##name##File(const U32& index) { return m##name##Asset[index].notNull() ? m##name##Asset[index]->getSoundFile() : ""; } \
bool is##name##Valid(const U32& id) {return (get##name##File(id) != StringTable->EmptyString() && m##name##Asset[id] && m##name##Asset[id]->getStatus() == AssetBase::Ok); } \
SFXDescription* get##name##Description(const U32& index) \ SFXDescription* get##name##Description(const U32& index) \
{ \ { \
if (m##name##Asset[index].notNull()) \ if (m##name##Asset[index].notNull()) \
return m##name##Asset[index]->getSfxDescription(); \ return m##name##Asset[index]->getSfxDescription(); \
return NULL; \ return NULL; \
} \ } \
SimObjectPtr<SFXTrack> get##name##SFXTrack(const U32& index) { return m##name##Asset[index].notNull() ? m##name##Asset[index]->getSFXTrack() : NULL; } SimObjectPtr<SFXTrack> get##name##SFXTrack(const U32& index) { return m##name##Asset[index].notNull() ? m##name##Asset[index]->getSFXTrack() : NULL; } \
SimObjectPtr<SFXTrack> get##name##Profile(const U32& index){ return get##name##SFXTrack(index); }
#define INITPERSISTFIELD_SOUNDASSET_ARRAY(name, arraySize, consoleClass, docs) \ #define INITPERSISTFIELD_SOUNDASSET_ARRAY(name, arraySize, consoleClass, docs) \