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

more cleanups

Browse source 
cleanup the type removing the refactor tag
materialManager restored to its original state
This commit is contained in:
marauder2k7 2025-03-27 08:59:50 +00:00
parent a8d7664fc2
commit c025ea86b4
9 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -67,16 +67,16 @@ IMPLEMENT_CONOBJECT(ImageAsset);
IMPLEMENT_STRUCT(AssetPtr<ImageAsset>, AssetPtrImageAsset,, "") IMPLEMENT_STRUCT(AssetPtr<ImageAsset>, AssetPtrImageAsset,, "")
END_IMPLEMENT_STRUCT END_IMPLEMENT_STRUCT
ConsoleType(ImageAssetPtr, TypeImageAssetPtrRefactor, AssetPtr<ImageAsset>, ASSET_ID_FIELD_PREFIX) ConsoleType(ImageAssetPtr, TypeImageAssetPtr, AssetPtr<ImageAsset>, ASSET_ID_FIELD_PREFIX)
ConsoleGetType(TypeImageAssetPtrRefactor) ConsoleGetType(TypeImageAssetPtr)
{ {
// Fetch asset Id. // Fetch asset Id.
return (*((AssetPtr<ImageAsset>*)dptr)).getAssetId(); return (*((AssetPtr<ImageAsset>*)dptr)).getAssetId();
} }
ConsoleSetType(TypeImageAssetPtrRefactor) ConsoleSetType(TypeImageAssetPtr)
{ {
// Was a single argument specified? // Was a single argument specified?
if (argc == 1) if (argc == 1)
@ -662,7 +662,7 @@ void GuiInspectorTypeImageAssetPtr::consoleInit()
{ {
Parent::consoleInit(); Parent::consoleInit();
ConsoleBaseType::getType(TypeImageAssetPtrRefactor)->setInspectorFieldType("GuiInspectorTypeImageAssetPtr"); ConsoleBaseType::getType(TypeImageAssetPtr)->setInspectorFieldType("GuiInspectorTypeImageAssetPtr");
} }
GuiControl* GuiInspectorTypeImageAssetPtr::constructEditControl() GuiControl* GuiInspectorTypeImageAssetPtr::constructEditControl()

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

@ -227,7 +227,7 @@ protected:
}; };
DECLARE_STRUCT(AssetPtr<ImageAsset>) DECLARE_STRUCT(AssetPtr<ImageAsset>)
DefineConsoleType(TypeImageAssetPtrRefactor, AssetPtr<ImageAsset> ) DefineConsoleType(TypeImageAssetPtr, AssetPtr<ImageAsset> )
typedef ImageAsset::ImageTypes ImageAssetType; typedef ImageAsset::ImageTypes ImageAssetType;
DefineEnumType(ImageAssetType); DefineEnumType(ImageAssetType);
@ -317,7 +317,7 @@ public:
#define INITPERSISTFIELD_IMAGEASSET_REFACTOR(name, consoleClass, docs) \ #define INITPERSISTFIELD_IMAGEASSET_REFACTOR(name, consoleClass, docs) \
addProtectedField(assetText(name, Asset), TypeImageAssetPtrRefactor, Offset(m##name##Asset, consoleClass), _set##name##Data, &defaultProtectedGetFn, assetDoc(name, asset docs.)); addProtectedField(assetText(name, Asset), TypeImageAssetPtr, Offset(m##name##Asset, consoleClass), _set##name##Data, &defaultProtectedGetFn, assetDoc(name, asset docs.));
#define DECLARE_IMAGEASSET_ARRAY_REFACTOR(className, name, profile, max) \ #define DECLARE_IMAGEASSET_ARRAY_REFACTOR(className, name, profile, max) \
@ -404,7 +404,7 @@ public:
#define INITPERSISTFIELD_IMAGEASSET_ARRAY_REFACTOR(name, arraySize, consoleClass, docs) \ #define INITPERSISTFIELD_IMAGEASSET_ARRAY_REFACTOR(name, arraySize, consoleClass, docs) \
addProtectedField(assetText(name, Asset), TypeImageAssetPtrRefactor, Offset(m##name##Asset, consoleClass), _set##name##Data, &defaultProtectedGetFn, arraySize, assetDoc(name, asset docs.)); addProtectedField(assetText(name, Asset), TypeImageAssetPtr, Offset(m##name##Asset, consoleClass), _set##name##Data, &defaultProtectedGetFn, arraySize, assetDoc(name, asset docs.));
#define DEF_IMAGEASSET_ARRAY_BINDS_REFACTOR(className,name, max)\ #define DEF_IMAGEASSET_ARRAY_BINDS_REFACTOR(className,name, max)\
DefineEngineMethod(className, get##name, const char*, (S32 index), , "get name")\ DefineEngineMethod(className, get##name, const char*, (S32 index), , "get name")\

2
Engine/source/gui/controls/guiPopUpCtrl.cpp
View file

@ -299,7 +299,7 @@ void GuiPopUpMenuCtrl::initPersistFields(void)
addField("sbUsesNAColor", TypeBool, Offset(mRenderScrollInNA, GuiPopUpMenuCtrl)); addField("sbUsesNAColor", TypeBool, Offset(mRenderScrollInNA, GuiPopUpMenuCtrl));
addField("reverseTextList", TypeBool, Offset(mReverseTextList, GuiPopUpMenuCtrl)); addField("reverseTextList", TypeBool, Offset(mReverseTextList, GuiPopUpMenuCtrl));
addProtectedField("BitmapAsset", TypeImageAssetPtrRefactor, Offset(mBitmapAsset, GuiPopUpMenuCtrl), _setBitmaps, &defaultProtectedGetFn, "@brief ""Bitmap"" ""asset \"\"."); addProtectedField("BitmapAsset", TypeImageAssetPtr, Offset(mBitmapAsset, GuiPopUpMenuCtrl), _setBitmaps, &defaultProtectedGetFn, "@brief ""Bitmap"" ""asset \"\".");
addField("bitmapBounds", TypePoint2I, Offset(mBitmapBounds, GuiPopUpMenuCtrl)); addField("bitmapBounds", TypePoint2I, Offset(mBitmapBounds, GuiPopUpMenuCtrl));

2
Engine/source/gui/controls/guiPopUpCtrlEx.cpp
View file

@ -354,7 +354,7 @@ void GuiPopUpMenuCtrlEx::initPersistFields(void)
addField("sbUsesNAColor", TypeBool, Offset(mRenderScrollInNA, GuiPopUpMenuCtrlEx), "Deprecated" "@internal"); addField("sbUsesNAColor", TypeBool, Offset(mRenderScrollInNA, GuiPopUpMenuCtrlEx), "Deprecated" "@internal");
addField("reverseTextList", TypeBool, Offset(mReverseTextList, GuiPopUpMenuCtrlEx), "Reverses text list if popup extends up, instead of down"); addField("reverseTextList", TypeBool, Offset(mReverseTextList, GuiPopUpMenuCtrlEx), "Reverses text list if popup extends up, instead of down");
addProtectedField("BitmapAsset", TypeImageAssetPtrRefactor, Offset(mBitmapAsset, GuiPopUpMenuCtrlEx), _setBitmaps, &defaultProtectedGetFn, "@brief ""Bitmap"" ""asset \"Name of bitmap asset to use\"."); addProtectedField("BitmapAsset", TypeImageAssetPtr, Offset(mBitmapAsset, GuiPopUpMenuCtrlEx), _setBitmaps, &defaultProtectedGetFn, "@brief ""Bitmap"" ""asset \"Name of bitmap asset to use\".");
addField("bitmapBounds", TypePoint2I, Offset(mBitmapBounds, GuiPopUpMenuCtrlEx), "Boundaries of bitmap displayed"); addField("bitmapBounds", TypePoint2I, Offset(mBitmapBounds, GuiPopUpMenuCtrlEx), "Boundaries of bitmap displayed");
addField("hotTrackCallback", TypeBool, Offset(mHotTrackItems, GuiPopUpMenuCtrlEx), addField("hotTrackCallback", TypeBool, Offset(mHotTrackItems, GuiPopUpMenuCtrlEx),

2
Engine/source/gui/core/guiTypes.cpp
View file

@ -442,7 +442,7 @@ void GuiControlProfile::initPersistFields()
"Texture to use for rendering control.", AbstractClassRep::FIELD_HideInInspectors); "Texture to use for rendering control.", AbstractClassRep::FIELD_HideInInspectors);
#endif #endif
addProtectedField("bitmapAsset", TypeImageAssetPtrRefactor, Offset(mBitmapAsset, GuiControlProfile), addProtectedField("bitmapAsset", TypeImageAssetPtr, Offset(mBitmapAsset, GuiControlProfile),
&GuiControlProfile::protectedSetBitmap, &defaultProtectedGetFn, &GuiControlProfile::protectedSetBitmap, &defaultProtectedGetFn,
"Texture to use for rendering control."); "Texture to use for rendering control.");

2
Engine/source/gui/editor/inspector/group.cpp
View file

@ -663,7 +663,7 @@ void GuiInspectorGroup::addInspectorField(StringTableEntry name, StringTableEntr
else if (typeName == StringTable->insert("material")) else if (typeName == StringTable->insert("material"))
fieldType = TypeMaterialAssetId; fieldType = TypeMaterialAssetId;
else if (typeName == StringTable->insert("image")) else if (typeName == StringTable->insert("image"))
fieldType = TypeImageAssetPtrRefactor; fieldType = TypeImageAssetPtr;
else if (typeName == StringTable->insert("shape")) else if (typeName == StringTable->insert("shape"))
fieldType = TypeShapeAssetId; fieldType = TypeShapeAssetId;
else if (typeName == StringTable->insert("sound")) else if (typeName == StringTable->insert("sound"))

2
Engine/source/gui/editor/inspector/variableInspector.cpp
View file

@ -203,7 +203,7 @@ void GuiVariableInspector::addField(const char* name, const char* label, const c
else if (newField->mFieldTypeName == StringTable->insert("material")) else if (newField->mFieldTypeName == StringTable->insert("material"))
fieldTypeMask = TypeMaterialAssetId; fieldTypeMask = TypeMaterialAssetId;
else if (newField->mFieldTypeName == StringTable->insert("image")) else if (newField->mFieldTypeName == StringTable->insert("image"))
fieldTypeMask = TypeImageAssetPtrRefactor; fieldTypeMask = TypeImageAssetPtr;
else if (newField->mFieldTypeName == StringTable->insert("shape")) else if (newField->mFieldTypeName == StringTable->insert("shape"))
fieldTypeMask = TypeShapeAssetId; fieldTypeMask = TypeShapeAssetId;
else if (newField->mFieldTypeName == StringTable->insert("bool")) else if (newField->mFieldTypeName == StringTable->insert("bool"))

4
Engine/source/materials/materialManager.cpp
View file

@ -358,7 +358,7 @@ void MaterialManager::flushAndReInitInstances()
(*iter)->reInit(); (*iter)->reInit();
} }
void MaterialManager::_flushInstance( BaseMaterialDefinition *target ) void MaterialManager::flushInstance( BaseMaterialDefinition *target )
{ {
Vector<BaseMatInstance*>::iterator iter = mMatInstanceList.begin(); Vector<BaseMatInstance*>::iterator iter = mMatInstanceList.begin();
while ( iter != mMatInstanceList.end() ) while ( iter != mMatInstanceList.end() )
@ -372,7 +372,7 @@ void MaterialManager::_flushInstance( BaseMaterialDefinition *target )
} }
} }
void MaterialManager::_reInitInstance( BaseMaterialDefinition *target ) void MaterialManager::reInitInstance( BaseMaterialDefinition *target )
{ {
Vector<BaseMatInstance*>::iterator iter = mMatInstanceList.begin(); Vector<BaseMatInstance*>::iterator iter = mMatInstanceList.begin();
for ( ; iter != mMatInstanceList.end(); iter++ ) for ( ; iter != mMatInstanceList.end(); iter++ )

13
Engine/source/materials/materialManager.h
View file

@ -117,20 +117,19 @@ public:
/// the active materials instances immediately. /// the active materials instances immediately.
void flushAndReInitInstances(); void flushAndReInitInstances();
// Flush the instance
void flushInstance(BaseMaterialDefinition* target);
/// Re-initializes the material instances for a specific target material.
void reInitInstance(BaseMaterialDefinition* target);
protected: protected:
// MatInstance tracks it's instances here // MatInstance tracks it's instances here
friend class MatInstance; friend class MatInstance;
void _track(MatInstance*); void _track(MatInstance*);
void _untrack(MatInstance*); void _untrack(MatInstance*);
/// Flushes all the procedural shaders and re-initializes all
/// the active materials instances immediately.
void _flushAndReInitInstances();
// Flush the instance
void _flushInstance(BaseMaterialDefinition* target);
/// Re-initializes the material instances for a specific target material.
void _reInitInstance(BaseMaterialDefinition* target);
/// @see LightManager::smActivateSignal /// @see LightManager::smActivateSignal
void _onLMActivate( const char *lm, bool activate ); void _onLMActivate( const char *lm, bool activate );