From 3b70689abccae5547d5c14a5ea3db906fe1c0751 Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Wed, 26 Mar 2025 21:16:43 +0000 Subject: [PATCH] clean out old macros --- Engine/source/T3D/assets/ImageAsset.cpp | 65 ----- Engine/source/T3D/assets/ImageAsset.h | 363 ------------------------ 2 files changed, 428 deletions(-) diff --git a/Engine/source/T3D/assets/ImageAsset.cpp b/Engine/source/T3D/assets/ImageAsset.cpp index 27fa241f6..1137e9a41 100644 --- a/Engine/source/T3D/assets/ImageAsset.cpp +++ b/Engine/source/T3D/assets/ImageAsset.cpp @@ -59,56 +59,6 @@ StringTableEntry ImageAsset::smNamedTargetAssetFallback = NULL; IMPLEMENT_CONOBJECT(ImageAsset); -ConsoleType(ImageAssetPtr, TypeImageAssetPtr, const char*, "") - -//----------------------------------------------------------------------------- - -ConsoleGetType(TypeImageAssetPtr) -{ - // Fetch asset Id. - return *((const char**)(dptr)); -} - -//----------------------------------------------------------------------------- - -ConsoleSetType(TypeImageAssetPtr) -{ - // Was a single argument specified? - if (argc == 1) - { - // Yes, so fetch field value. - *((const char**)dptr) = StringTable->insert(argv[0]); - - return; - } - - // Warn. - Con::warnf("(TypeImageAssetPtr) - Cannot set multiple args to a single asset."); -} - -ConsoleType(assetIdString, TypeImageAssetId, const char*, "") - -ConsoleGetType(TypeImageAssetId) -{ - // Fetch asset Id. - return *((const char**)(dptr)); -} - -ConsoleSetType(TypeImageAssetId) -{ - // Was a single argument specified? - if (argc == 1) - { - *((const char**)dptr) = StringTable->insert(argv[0]); - - return; - } - - // Warn. - Con::warnf("(TypeImageAssetId) - Cannot set multiple args to a single asset."); -} - -//----------------------------------------------------------------------------- //----------------------------------------------------------------------------- // REFACTOR @@ -978,18 +928,3 @@ void GuiInspectorTypeImageAssetPtr::setPreviewImage(StringTableEntry assetId) if (mPreviewImage->getBitmapAsset().isNull()) mPreviewImage->_setBitmap(StringTable->insert("ToolsModule:genericAssetIcon_image")); } - -IMPLEMENT_CONOBJECT(GuiInspectorTypeImageAssetId); - -ConsoleDocClass(GuiInspectorTypeImageAssetId, - "@brief Inspector field type for Images\n\n" - "Editor use only.\n\n" - "@internal" -); - -void GuiInspectorTypeImageAssetId::consoleInit() -{ - Parent::consoleInit(); - - ConsoleBaseType::getType(TypeImageAssetId)->setInspectorFieldType("GuiInspectorTypeImageAssetId"); -} diff --git a/Engine/source/T3D/assets/ImageAsset.h b/Engine/source/T3D/assets/ImageAsset.h index c1bb9dd58..b363ed8a1 100644 --- a/Engine/source/T3D/assets/ImageAsset.h +++ b/Engine/source/T3D/assets/ImageAsset.h @@ -226,375 +226,12 @@ protected: static bool writeTextureHDR(void* obj, StringTableEntry pFieldName) { return static_cast(obj)->getTextureHDR() == true; } }; -DefineConsoleType(TypeImageAssetPtr, ImageAsset) -DefineConsoleType(TypeImageAssetId, String) - DECLARE_STRUCT(AssetPtr) DefineConsoleType(TypeImageAssetPtrRefactor, AssetPtr ) typedef ImageAsset::ImageTypes ImageAssetType; DefineEnumType(ImageAssetType); -#pragma region Singular Asset Macros - -//Singular assets -/// -/// Declares an image asset -/// This establishes the assetId, asset and legacy filepath fields, along with supplemental getter and setter functions -/// -#define DECLARE_IMAGEASSET(className, name, changeFunc, profile) public: \ - GFXTexHandle m##name = NULL;\ - StringTableEntry m##name##Name; \ - StringTableEntry m##name##AssetId;\ - AssetPtr m##name##Asset;\ - GFXTextureProfile* m##name##Profile = &profile;\ -public: \ - const StringTableEntry get##name##File() const { return m##name##Name; }\ - void set##name##File(const FileName &_in) { m##name##Name = StringTable->insert(_in.c_str());}\ - const AssetPtr & get##name##Asset() const { return m##name##Asset; }\ - void set##name##Asset(const AssetPtr &_in) { m##name##Asset = _in;}\ - \ - bool _set##name(StringTableEntry _in)\ - {\ - if(m##name##AssetId != _in || m##name##Name != _in)\ - {\ - if (_in == NULL || _in == StringTable->EmptyString())\ - {\ - m##name##Name = StringTable->EmptyString();\ - m##name##AssetId = StringTable->EmptyString();\ - m##name##Asset = NULL;\ - m##name.free();\ - m##name = NULL;\ - return true;\ - }\ - else if(_in[0] == '$' || _in[0] == '#')\ - {\ - m##name##Name = _in;\ - m##name##AssetId = StringTable->EmptyString();\ - m##name##Asset = NULL;\ - m##name.free();\ - m##name = NULL;\ - return true;\ - }\ - \ - if (AssetDatabase.isDeclaredAsset(_in))\ - {\ - m##name##AssetId = _in;\ - \ - U32 assetState = ImageAsset::getAssetById(m##name##AssetId, &m##name##Asset);\ - \ - if (ImageAsset::Ok == assetState)\ - {\ - m##name##Name = StringTable->EmptyString();\ - }\ - }\ - else\ - {\ - StringTableEntry assetId = ImageAsset::getAssetIdByFilename(_in);\ - if (assetId != StringTable->EmptyString())\ - {\ - m##name##AssetId = assetId;\ - if (ImageAsset::getAssetById(m##name##AssetId, &m##name##Asset) == ImageAsset::Ok)\ - {\ - m##name##Name = StringTable->EmptyString();\ - }\ - }\ - else\ - {\ - m##name##Name = _in;\ - m##name##AssetId = StringTable->EmptyString();\ - m##name##Asset = NULL;\ - }\ - }\ - }\ - if (get##name() != StringTable->EmptyString() && m##name##Name != StringTable->insert("texhandle"))\ - {\ - \ - if (get##name()[0] != '$' && get##name()[0] != '#') {\ - m##name.set(get##name(), m##name##Profile, avar("%s() - mTextureObject (line %d)", __FUNCTION__, __LINE__));\ - }\ - }\ - else\ - {\ - m##name.free();\ - m##name = NULL;\ - }\ - \ - if(get##name() == StringTable->EmptyString())\ - return true;\ - \ - if (m##name##Asset.notNull() && m##name##Asset->getStatus() != ImageAsset::Ok)\ - {\ - Con::errorf("%s(%s)::_set%s() - image asset failure\"%s\" due to [%s]", macroText(className), getName(), macroText(name), _in, ImageAsset::getAssetErrstrn(m##name##Asset->getStatus()).c_str());\ - return false; \ - }\ - else if (!m##name)\ - {\ - if (GFX->getAdapterType() != NullDevice)\ - Con::errorf("%s(%s)::_set%s() - Couldn't load image \"%s\"", macroText(className), getName(), macroText(name), _in);\ - return false;\ - }\ - return true;\ - }\ - \ - const StringTableEntry get##name() const\ - {\ - if (m##name##Asset && (m##name##Asset->getImageFile() != StringTable->EmptyString()))\ - if (m##name##Asset->getImageFile()[0] == '#' || m##name##Asset->getImageFile()[0] == '$')\ - return m##name##Asset->getImageFile();\ - else\ - return Platform::makeRelativePathName(m##name##Asset->getImageFile(), Platform::getMainDotCsDir());\ - else if (m##name##AssetId != StringTable->EmptyString())\ - return m##name##AssetId;\ - else if (m##name##Name != StringTable->EmptyString())\ - return StringTable->insert(Platform::makeRelativePathName(m##name##Name, Platform::getMainDotCsDir()));\ - else\ - return StringTable->EmptyString();\ - }\ - GFXTexHandle get##name##Resource() \ - {\ - if (m##name##Asset && (m##name##Asset->getImageFile() != StringTable->EmptyString()))\ - return m##name##Asset->getTexture(m##name##Profile);\ - return m##name;\ - }\ - bool name##Valid() {return (get##name() != StringTable->EmptyString() && m##name##Asset->getStatus() == AssetBase::Ok); } - -#ifdef TORQUE_SHOW_LEGACY_FILE_FIELDS - -#define INITPERSISTFIELD_IMAGEASSET(name, consoleClass, docs) \ - addProtectedField(#name, TypeImageFilename, Offset(m##name##Name, consoleClass), _set##name##Data, &defaultProtectedGetFn, assetDoc(name, docs)); \ - addProtectedField(assetText(name, Asset), TypeImageAssetId, Offset(m##name##AssetId, consoleClass), _set##name##Data, &defaultProtectedGetFn, assetDoc(name, asset docs.)); - -#else - -#define INITPERSISTFIELD_IMAGEASSET(name, consoleClass, docs) \ - addProtectedField(#name, TypeImageFilename, Offset(m##name##Name, consoleClass), _set##name##Data, &defaultProtectedGetFn, assetDoc(name, docs), AbstractClassRep::FIELD_HideInInspectors); \ - addProtectedField(assetText(name, Asset), TypeImageAssetId, Offset(m##name##AssetId, consoleClass), _set##name##Data, &defaultProtectedGetFn, assetDoc(name, asset docs.)); - -#endif // SHOW_LEGACY_FILE_FIELDS - -#define LOAD_IMAGEASSET(name)\ -if (m##name##AssetId != StringTable->EmptyString())\ -{\ - S32 assetState = ImageAsset::getAssetById(m##name##AssetId, &m##name##Asset);\ - if (assetState == ImageAsset::Ok )\ - {\ - m##name##Name = StringTable->EmptyString();\ - }\ - else Con::warnf("Warning: %s::LOAD_IMAGEASSET(%s)-%s", mClassName, m##name##AssetId, ImageAsset::getAssetErrstrn(assetState).c_str());\ -} - - -#pragma endregion - -#pragma region Arrayed Asset Macros - -//Arrayed Assets -#define DECLARE_IMAGEASSET_ARRAY(className, name, max, changeFunc) public: \ - static const U32 sm##name##Count = max;\ - GFXTexHandle m##name[max];\ - StringTableEntry m##name##Name[max]; \ - StringTableEntry m##name##AssetId[max];\ - AssetPtr m##name##Asset[max];\ - GFXTextureProfile * m##name##Profile[max];\ -public: \ - const StringTableEntry get##name##File(const U32& index) const { return m##name##Name[index]; }\ - void set##name##File(const FileName &_in, const U32& index) { m##name##Name[index] = StringTable->insert(_in.c_str());}\ - const AssetPtr & get##name##Asset(const U32& index) const { return m##name##Asset[index]; }\ - void set##name##Asset(const AssetPtr &_in, const U32& index) { m##name##Asset[index] = _in;}\ - \ - bool _set##name(StringTableEntry _in, const U32& index)\ - {\ - if(m##name##AssetId[index] != _in || m##name##Name[index] != _in)\ - {\ - if(index >= sm##name##Count || index < 0)\ - return false;\ - if (_in == NULL || _in == StringTable->EmptyString())\ - {\ - m##name##Name[index] = StringTable->EmptyString();\ - m##name##AssetId[index] = StringTable->EmptyString();\ - m##name##Asset[index] = NULL;\ - m##name[index].free();\ - m##name[index] = NULL;\ - return true;\ - }\ - else if(_in[0] == '$' || _in[0] == '#')\ - {\ - m##name##Name[index] = _in;\ - m##name##AssetId[index] = StringTable->EmptyString();\ - m##name##Asset[index] = NULL;\ - m##name[index].free();\ - m##name[index] = NULL;\ - return true;\ - }\ - \ - if (AssetDatabase.isDeclaredAsset(_in))\ - {\ - m##name##AssetId[index] = _in;\ - \ - U32 assetState = ImageAsset::getAssetById(m##name##AssetId[index], &m##name##Asset[index]);\ - \ - if (ImageAsset::Ok == assetState)\ - {\ - m##name##Name[index] = StringTable->EmptyString();\ - }\ - }\ - else\ - {\ - StringTableEntry assetId = ImageAsset::getAssetIdByFilename(_in);\ - if (assetId != StringTable->EmptyString())\ - {\ - m##name##AssetId[index] = assetId;\ - if (ImageAsset::getAssetById(m##name##AssetId[index], &m##name##Asset[index]) == ImageAsset::Ok)\ - {\ - m##name##Name[index] = StringTable->EmptyString();\ - }\ - }\ - else\ - {\ - m##name##Name[index] = _in;\ - m##name##AssetId[index] = StringTable->EmptyString();\ - m##name##Asset[index] = NULL;\ - }\ - }\ - }\ - if (get##name(index) != StringTable->EmptyString() && m##name##Name[index] != StringTable->insert("texhandle"))\ - {\ - if (get##name(index)[0] != '$' && get##name(index)[0] != '#')\ - m##name[index].set(get##name(index), m##name##Profile[index], avar("%s() - mTextureObject (line %d)", __FUNCTION__, __LINE__));\ - }\ - else\ - {\ - m##name[index].free();\ - m##name[index] = NULL;\ - }\ - \ - if(get##name(index) == StringTable->EmptyString())\ - return true;\ - \ - if (m##name##Asset[index].notNull() && m##name##Asset[index]->getStatus() != ImageAsset::Ok)\ - {\ - Con::errorf("%s(%s)::_set%s(%i) - image asset failure\"%s\" due to [%s]", macroText(className), getName(), macroText(name), index, _in, ImageAsset::getAssetErrstrn(m##name##Asset[index]->getStatus()).c_str());\ - return false; \ - }\ - else if (!m##name[index])\ - {\ - if (GFX->getAdapterType() != NullDevice)\ - Con::errorf("%s(%s)::_set%s(%i) - Couldn't load image \"%s\"", macroText(className), getName(), macroText(name), index, _in);\ - return false; \ - }\ - return true;\ - }\ - \ - const StringTableEntry get##name(const U32& index) const\ - {\ - if (m##name##Asset[index] && (m##name##Asset[index]->getImageFile() != StringTable->EmptyString()))\ - if (m##name##Asset[index]->getImageFile()[0] == '#' || m##name##Asset[index]->getImageFile()[0] == '$')\ - return m##name##Asset[index]->getImageFile();\ - else\ - return Platform::makeRelativePathName(m##name##Asset[index]->getImageFile(), Platform::getMainDotCsDir());\ - else if (m##name##AssetId[index] != StringTable->EmptyString())\ - return m##name##AssetId[index];\ - else if (m##name##Name[index] != StringTable->EmptyString())\ - {\ - if (String(m##name##Name[index]).startsWith("#") || String(m##name##Name[index]).startsWith("$"))\ - return StringTable->insert(m##name##Name[index]);\ - else\ - return StringTable->insert(Platform::makeRelativePathName(m##name##Name[index], Platform::getMainDotCsDir()));\ - }\ - else\ - return StringTable->EmptyString();\ - }\ - GFXTexHandle get##name##Resource(const U32& index) \ - {\ - if(index >= sm##name##Count || index < 0)\ - return nullptr;\ - if (m##name##Asset[index] && (m##name##Asset[index]->getImageFile() != StringTable->EmptyString()))\ - return m##name##Asset[index]->getTexture(m##name##Profile[index]);\ - return m##name[index];\ - }\ - bool name##Valid(const U32& id) {return (get##name(id) != StringTable->EmptyString() && m##name##Asset[id]->getStatus() == AssetBase::Ok); } - -#define DECLARE_IMAGEASSET_ARRAY_SETGET(className, name)\ - static bool _set##name##Data(void* obj, const char* index, const char* data)\ - {\ - if (!index) return false;\ - U32 idx = dAtoi(index);\ - if (idx >= sm##name##Count)\ - return false;\ - bool ret = false;\ - className* object = static_cast(obj);\ - ret = object->_set##name(StringTable->insert(data),idx);\ - return ret;\ - } - -#define DECLARE_IMAGEASSET_ARRAY_NET_SETGET(className, name, bitmask)\ - static bool _set##name##Data(void* obj, const char* index, const char* data)\ - {\ - if (!index) return false;\ - U32 idx = dAtoi(index);\ - if (idx >= sm##name##Count)\ - return false;\ - bool ret = false;\ - className* object = static_cast(obj);\ - ret = object->_set##name(StringTable->insert(data),idx);\ - if(ret)\ - object->setMaskBits(bitmask);\ - return ret;\ - } - -#define INIT_IMAGEASSET_ARRAY(name, profile, index) \ -{\ - m##name##Name[index] = StringTable->EmptyString(); \ - m##name##AssetId[index] = StringTable->EmptyString(); \ - m##name##Asset[index] = NULL;\ - m##name[index] = NULL;\ - m##name##Profile[index] = &profile;\ -} - -#define DEF_IMAGEASSET_ARRAY_BINDS(className,name)\ -DefineEngineMethod(className, get##name, const char*, (S32 index), , "get name")\ -{\ - return object->get##name(index); \ -}\ -DefineEngineMethod(className, get##name##Asset, const char*, (S32 index), , assetText(name, asset reference))\ -{\ - if(index >= className::sm##name##Count || index < 0)\ - return "";\ - return object->m##name##AssetId[index]; \ -}\ -DefineEngineMethod(className, set##name, bool, (const char* map, S32 index), , assetText(name,assignment. first tries asset then flat file.))\ -{\ - return object->_set##name(StringTable->insert(map), index);\ -} - -#ifdef TORQUE_SHOW_LEGACY_FILE_FIELDS - -#define INITPERSISTFIELD_IMAGEASSET_ARRAY(name, arraySize, consoleClass, docs) \ - addProtectedField(#name, TypeImageFilename, Offset(m##name##Name, consoleClass), _set##name##Data, &defaultProtectedGetFn, arraySize, assetDoc(name, docs)); \ - addProtectedField(assetText(name, Asset), TypeImageAssetId, Offset(m##name##AssetId, consoleClass), _set##name##Data, &defaultProtectedGetFn, arraySize, assetDoc(name, asset docs.)); - -#else - -#define INITPERSISTFIELD_IMAGEASSET_ARRAY(name, arraySize, consoleClass, docs) \ - addProtectedField(#name, TypeImageFilename, Offset(m##name##Name, consoleClass), _set##name##Data, &defaultProtectedGetFn, arraySize, assetDoc(name, docs), AbstractClassRep::FIELD_HideInInspectors); \ - addProtectedField(assetText(name, Asset), TypeImageAssetId, Offset(m##name##AssetId, consoleClass), _set##name##Data, &defaultProtectedGetFn, arraySize, assetDoc(name, asset docs.)); - -#endif - -#define LOAD_IMAGEASSET_ARRAY(name, index)\ -if (m##name##AssetId[index] != StringTable->EmptyString())\ -{\ - S32 assetState = ImageAsset::getAssetById(m##name##AssetId[index], &m##name##Asset[index]);\ - if (assetState == ImageAsset::Ok )\ - {\ - m##name##Name[index] = StringTable->EmptyString();\ - }\ - else Con::warnf("Warning: %s::LOAD_IMAGEASSET(%s)-%s", mClassName, m##name##AssetId[index], ImageAsset::getAssetErrstrn(assetState).c_str());\ -} - -#pragma endregion - #pragma region Refactor Asset Macros #define DECLARE_IMAGEASSET_REFACTOR(className, name, profile) \