Browse Source

keep same naming

marauder2k7 2 months ago
parent
commit
ff442f5230

+ 1 - 1
Engine/source/T3D/assets/ShapeAsset.cpp

@@ -190,7 +190,7 @@ void ShapeAsset::initPersistFields()
    addProtectedField("diffuseImposterFileName", TypeAssetLooseFilePath, Offset(mDiffuseImposterFileName, ShapeAsset),
    addProtectedField("diffuseImposterFileName", TypeAssetLooseFilePath, Offset(mDiffuseImposterFileName, ShapeAsset),
       &setDiffuseImposterFile, &getDiffuseImposterFile, "Path to the diffuse imposter file we want to render");
       &setDiffuseImposterFile, &getDiffuseImposterFile, "Path to the diffuse imposter file we want to render");
    addProtectedField("normalImposterFileName", TypeAssetLooseFilePath, Offset(mNormalImposterFileName, ShapeAsset),
    addProtectedField("normalImposterFileName", TypeAssetLooseFilePath, Offset(mNormalImposterFileName, ShapeAsset),
-      &setNormalImposterFile, &getNormalImposterFilePath, "Path to the normal imposter file we want to render");
+      &setNormalImposterFile, &getNormalImposterFile, "Path to the normal imposter file we want to render");
 
 
 }
 }
 
 

+ 2 - 2
Engine/source/T3D/assets/ShapeAsset.h

@@ -161,7 +161,7 @@ public:
    inline StringTableEntry getDiffuseImposterFile(void) const { return mDiffuseImposterFileName; };
    inline StringTableEntry getDiffuseImposterFile(void) const { return mDiffuseImposterFileName; };
 
 
    void                    setNormalImposterFile(const char* pImageFile);
    void                    setNormalImposterFile(const char* pImageFile);
-   inline StringTableEntry getNormalImposterFilePath(void) const { return mNormalImposterFileName; };
+   inline StringTableEntry getNormalImposterFile(void) const { return mNormalImposterFileName; };
 
 
    static U32 getAssetByFilename(StringTableEntry fileName, AssetPtr<ShapeAsset>* shapeAsset);
    static U32 getAssetByFilename(StringTableEntry fileName, AssetPtr<ShapeAsset>* shapeAsset);
 
 
@@ -193,7 +193,7 @@ protected:
    static const char* getDiffuseImposterFile(void* obj, const char* data) { return static_cast<ShapeAsset*>(obj)->getDiffuseImposterFile(); }
    static const char* getDiffuseImposterFile(void* obj, const char* data) { return static_cast<ShapeAsset*>(obj)->getDiffuseImposterFile(); }
 
 
    static bool setNormalImposterFile(void* obj, StringTableEntry index, StringTableEntry data) { static_cast<ShapeAsset*>(obj)->setNormalImposterFile(data); return false; }
    static bool setNormalImposterFile(void* obj, StringTableEntry index, StringTableEntry data) { static_cast<ShapeAsset*>(obj)->setNormalImposterFile(data); return false; }
-   static const char* getNormalImposterFilePath(void* obj, const char* data) { return static_cast<ShapeAsset*>(obj)->getNormalImposterFilePath(); }
+   static const char* getNormalImposterFile(void* obj, const char* data) { return static_cast<ShapeAsset*>(obj)->getNormalImposterFile(); }
 };
 };
 
 
 DefineConsoleType(TypeShapeAssetId, String)
 DefineConsoleType(TypeShapeAssetId, String)