diff --git a/Engine/source/T3D/assets/ImageAsset.cpp b/Engine/source/T3D/assets/ImageAsset.cpp index 1137e9a41..6ee7d1d96 100644 --- a/Engine/source/T3D/assets/ImageAsset.cpp +++ b/Engine/source/T3D/assets/ImageAsset.cpp @@ -67,16 +67,16 @@ IMPLEMENT_CONOBJECT(ImageAsset); IMPLEMENT_STRUCT(AssetPtr, AssetPtrImageAsset,, "") END_IMPLEMENT_STRUCT -ConsoleType(ImageAssetPtr, TypeImageAssetPtrRefactor, AssetPtr, ASSET_ID_FIELD_PREFIX) +ConsoleType(ImageAssetPtr, TypeImageAssetPtr, AssetPtr, ASSET_ID_FIELD_PREFIX) -ConsoleGetType(TypeImageAssetPtrRefactor) +ConsoleGetType(TypeImageAssetPtr) { // Fetch asset Id. return (*((AssetPtr*)dptr)).getAssetId(); } -ConsoleSetType(TypeImageAssetPtrRefactor) +ConsoleSetType(TypeImageAssetPtr) { // Was a single argument specified? if (argc == 1) @@ -662,7 +662,7 @@ void GuiInspectorTypeImageAssetPtr::consoleInit() { Parent::consoleInit(); - ConsoleBaseType::getType(TypeImageAssetPtrRefactor)->setInspectorFieldType("GuiInspectorTypeImageAssetPtr"); + ConsoleBaseType::getType(TypeImageAssetPtr)->setInspectorFieldType("GuiInspectorTypeImageAssetPtr"); } GuiControl* GuiInspectorTypeImageAssetPtr::constructEditControl() diff --git a/Engine/source/T3D/assets/ImageAsset.h b/Engine/source/T3D/assets/ImageAsset.h index b363ed8a1..20234ea03 100644 --- a/Engine/source/T3D/assets/ImageAsset.h +++ b/Engine/source/T3D/assets/ImageAsset.h @@ -227,7 +227,7 @@ protected: }; DECLARE_STRUCT(AssetPtr) -DefineConsoleType(TypeImageAssetPtrRefactor, AssetPtr ) +DefineConsoleType(TypeImageAssetPtr, AssetPtr ) typedef ImageAsset::ImageTypes ImageAssetType; DefineEnumType(ImageAssetType); @@ -317,7 +317,7 @@ public: #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) \ @@ -404,7 +404,7 @@ public: #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)\ DefineEngineMethod(className, get##name, const char*, (S32 index), , "get name")\ diff --git a/Engine/source/gui/controls/guiPopUpCtrl.cpp b/Engine/source/gui/controls/guiPopUpCtrl.cpp index 9ffa82929..9ec981352 100644 --- a/Engine/source/gui/controls/guiPopUpCtrl.cpp +++ b/Engine/source/gui/controls/guiPopUpCtrl.cpp @@ -299,7 +299,7 @@ void GuiPopUpMenuCtrl::initPersistFields(void) addField("sbUsesNAColor", TypeBool, Offset(mRenderScrollInNA, 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)); diff --git a/Engine/source/gui/controls/guiPopUpCtrlEx.cpp b/Engine/source/gui/controls/guiPopUpCtrlEx.cpp index a33538ef4..7e99f20d9 100644 --- a/Engine/source/gui/controls/guiPopUpCtrlEx.cpp +++ b/Engine/source/gui/controls/guiPopUpCtrlEx.cpp @@ -354,7 +354,7 @@ void GuiPopUpMenuCtrlEx::initPersistFields(void) addField("sbUsesNAColor", TypeBool, Offset(mRenderScrollInNA, GuiPopUpMenuCtrlEx), "Deprecated" "@internal"); 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("hotTrackCallback", TypeBool, Offset(mHotTrackItems, GuiPopUpMenuCtrlEx), diff --git a/Engine/source/gui/core/guiTypes.cpp b/Engine/source/gui/core/guiTypes.cpp index 13135d7ef..bcfcf2123 100644 --- a/Engine/source/gui/core/guiTypes.cpp +++ b/Engine/source/gui/core/guiTypes.cpp @@ -442,7 +442,7 @@ void GuiControlProfile::initPersistFields() "Texture to use for rendering control.", AbstractClassRep::FIELD_HideInInspectors); #endif - addProtectedField("bitmapAsset", TypeImageAssetPtrRefactor, Offset(mBitmapAsset, GuiControlProfile), + addProtectedField("bitmapAsset", TypeImageAssetPtr, Offset(mBitmapAsset, GuiControlProfile), &GuiControlProfile::protectedSetBitmap, &defaultProtectedGetFn, "Texture to use for rendering control."); diff --git a/Engine/source/gui/editor/inspector/group.cpp b/Engine/source/gui/editor/inspector/group.cpp index 2254f38dd..6bd243d60 100644 --- a/Engine/source/gui/editor/inspector/group.cpp +++ b/Engine/source/gui/editor/inspector/group.cpp @@ -663,7 +663,7 @@ void GuiInspectorGroup::addInspectorField(StringTableEntry name, StringTableEntr else if (typeName == StringTable->insert("material")) fieldType = TypeMaterialAssetId; else if (typeName == StringTable->insert("image")) - fieldType = TypeImageAssetPtrRefactor; + fieldType = TypeImageAssetPtr; else if (typeName == StringTable->insert("shape")) fieldType = TypeShapeAssetId; else if (typeName == StringTable->insert("sound")) diff --git a/Engine/source/gui/editor/inspector/variableInspector.cpp b/Engine/source/gui/editor/inspector/variableInspector.cpp index 80195fc00..41a165d32 100644 --- a/Engine/source/gui/editor/inspector/variableInspector.cpp +++ b/Engine/source/gui/editor/inspector/variableInspector.cpp @@ -203,7 +203,7 @@ void GuiVariableInspector::addField(const char* name, const char* label, const c else if (newField->mFieldTypeName == StringTable->insert("material")) fieldTypeMask = TypeMaterialAssetId; else if (newField->mFieldTypeName == StringTable->insert("image")) - fieldTypeMask = TypeImageAssetPtrRefactor; + fieldTypeMask = TypeImageAssetPtr; else if (newField->mFieldTypeName == StringTable->insert("shape")) fieldTypeMask = TypeShapeAssetId; else if (newField->mFieldTypeName == StringTable->insert("bool")) diff --git a/Engine/source/materials/materialManager.cpp b/Engine/source/materials/materialManager.cpp index 86efe3c17..194449ae2 100644 --- a/Engine/source/materials/materialManager.cpp +++ b/Engine/source/materials/materialManager.cpp @@ -358,7 +358,7 @@ void MaterialManager::flushAndReInitInstances() (*iter)->reInit(); } -void MaterialManager::_flushInstance( BaseMaterialDefinition *target ) +void MaterialManager::flushInstance( BaseMaterialDefinition *target ) { Vector::iterator iter = mMatInstanceList.begin(); while ( iter != mMatInstanceList.end() ) @@ -372,7 +372,7 @@ void MaterialManager::_flushInstance( BaseMaterialDefinition *target ) } } -void MaterialManager::_reInitInstance( BaseMaterialDefinition *target ) +void MaterialManager::reInitInstance( BaseMaterialDefinition *target ) { Vector::iterator iter = mMatInstanceList.begin(); for ( ; iter != mMatInstanceList.end(); iter++ ) diff --git a/Engine/source/materials/materialManager.h b/Engine/source/materials/materialManager.h index 8dd4d28a3..3a52363a3 100644 --- a/Engine/source/materials/materialManager.h +++ b/Engine/source/materials/materialManager.h @@ -117,20 +117,19 @@ public: /// 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); + protected: // MatInstance tracks it's instances here friend class MatInstance; void _track(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 void _onLMActivate( const char *lm, bool activate );