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

fix TORQUE_TOOLS = off compilation

Browse source
This commit is contained in:
AzaezelX 2022-06-13 12:38:08 -05:00
parent 9836f6eb30
commit 4a7104e5ea
38 changed files with 80 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/T3D/assets/CubemapAsset.cpp
View file

@ -169,7 +169,7 @@ void CubemapAsset::setScriptFile(const char* pScriptFile)
// Refresh the asset.
refreshAsset();
}
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId
//-----------------------------------------------------------------------------
@ -249,3 +249,4 @@ bool GuiInspectorTypeCubemapAssetPtr::updateRects()
return resized;
}
#endif

4
Engine/source/T3D/assets/CubemapAsset.h
View file

@ -92,7 +92,7 @@ protected:
};
DefineConsoleType(TypeCubemapAssetPtr, CubemapAsset)
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// TypeAssetId GuiInspectorField Class
//-----------------------------------------------------------------------------
@ -109,6 +109,6 @@ public:
virtual GuiControl* constructEditControl();
virtual bool updateRects();
};
#endif
#endif // _ASSET_BASE_H_

2
Engine/source/T3D/assets/GUIAsset.cpp
View file

@ -233,7 +233,6 @@ DefineEngineMethod(GUIAsset, getGUIPath, const char*, (), ,
{
return object->getGUIPath();
}
#endif
//-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId
@ -312,3 +311,4 @@ bool GuiInspectorTypeGUIAssetPtr::updateRects()
return resized;
}
#endif

4
Engine/source/T3D/assets/GUIAsset.h
View file

@ -85,7 +85,7 @@ protected:
DefineConsoleType(TypeGUIAssetPtr, GUIAsset)
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// TypeAssetId GuiInspectorField Class
//-----------------------------------------------------------------------------
@ -102,6 +102,6 @@ public:
virtual GuiControl* constructEditControl();
virtual bool updateRects();
};
#endif
#endif // _ASSET_BASE_H_

2
Engine/source/T3D/assets/GameObjectAsset.cpp
View file

@ -231,6 +231,7 @@ DefineEngineMethod(GameObjectAsset, createObject, const char*, (),,
return object->create();
}
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId
//-----------------------------------------------------------------------------
@ -316,3 +317,4 @@ bool GuiInspectorTypeGameObjectAssetPtr::updateRects()
return resized;
}
#endif

4
Engine/source/T3D/assets/GameObjectAsset.h
View file

@ -86,7 +86,7 @@ protected:
DefineConsoleType(TypeGameObjectAssetPtr, GameObjectAsset)
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// TypeAssetId GuiInspectorField Class
//-----------------------------------------------------------------------------
@ -103,6 +103,6 @@ public:
virtual GuiControl* constructEditControl();
virtual bool updateRects();
};
#endif
#endif // _ASSET_BASE_H_

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

@ -448,7 +448,6 @@ DefineEngineStaticMethod(ImageAsset, getAssetIdByFilename, const char*, (const c
{
return ImageAsset::getAssetIdByFilename(StringTable->insert(filePath));
}
#endif
//-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId
@ -620,3 +619,5 @@ void GuiInspectorTypeImageAssetId::consoleInit()
ConsoleBaseType::getType(TypeImageAssetId)->setInspectorFieldType("GuiInspectorTypeImageAssetId");
}
#endif

2
Engine/source/T3D/assets/ImageAssetInspectors.h
View file

@ -6,6 +6,7 @@
#include "gui/editor/guiInspectorTypes.h"
#endif
#ifdef TORQUE_TOOLS
class GuiInspectorTypeImageAssetPtr : public GuiInspectorTypeFileName
{
typedef GuiInspectorTypeFileName Parent;
@ -29,3 +30,4 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeImageAssetId);
static void consoleInit();
};
#endif

2
Engine/source/T3D/assets/MaterialAsset.cpp
View file

@ -450,6 +450,7 @@ DefineEngineMethod(MaterialAsset, getScriptPath, const char*, (), ,
}
#endif
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId
//-----------------------------------------------------------------------------
@ -544,3 +545,4 @@ void GuiInspectorTypeMaterialAssetId::consoleInit()
ConsoleBaseType::getType(TypeMaterialAssetId)->setInspectorFieldType("GuiInspectorTypeMaterialAssetId");
}
#endif

4
Engine/source/T3D/assets/MaterialAsset.h
View file

@ -131,7 +131,7 @@ protected:
DefineConsoleType(TypeMaterialAssetPtr, MaterialAsset)
DefineConsoleType(TypeMaterialAssetId, String)
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// TypeAssetId GuiInspectorField Class
//-----------------------------------------------------------------------------
@ -157,7 +157,7 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeMaterialAssetId);
static void consoleInit();
};
#endif
#pragma region Singular Asset Macros
//Singular assets

2
Engine/source/T3D/assets/ParticleAsset.cpp
View file

@ -122,6 +122,7 @@ void ParticleAsset::copyTo(SimObject* object)
}
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId
//-----------------------------------------------------------------------------
@ -199,3 +200,4 @@ bool GuiInspectorTypeParticleAssetPtr::updateRects()
return resized;
}
#endif

4
Engine/source/T3D/assets/ParticleAsset.h
View file

@ -67,7 +67,7 @@ protected:
DefineConsoleType(TypeParticleAssetPtr, ParticleAsset)
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// TypeAssetId GuiInspectorField Class
//-----------------------------------------------------------------------------
@ -84,6 +84,6 @@ public:
virtual GuiControl* constructEditControl();
virtual bool updateRects();
};
#endif
#endif // _ASSET_BASE_H_

4
Engine/source/T3D/assets/ShapeAnimationAsset.h
View file

@ -115,7 +115,7 @@ public:
};
DefineConsoleType(TypeShapeAnimationAssetPtr, ShapeAnimationAsset)
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// TypeAssetId GuiInspectorField Class
//-----------------------------------------------------------------------------
@ -132,6 +132,6 @@ public:
virtual GuiControl* constructEditControl();
virtual bool updateRects();
};*/
#endif
#endif // _ASSET_BASE_H_

2
Engine/source/T3D/assets/ShapeAsset.cpp
View file

@ -720,11 +720,11 @@ DefineEngineStaticMethod(ShapeAsset, getAssetIdByFilename, const char*, (const c
}
#endif
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId
//-----------------------------------------------------------------------------
#ifdef TORQUE_TOOLS
IMPLEMENT_CONOBJECT(GuiInspectorTypeShapeAssetPtr);
ConsoleDocClass(GuiInspectorTypeShapeAssetPtr,

2
Engine/source/T3D/assets/ShapeAsset.h
View file

@ -209,10 +209,10 @@ protected:
static const char* getNormalImposterFile(void* obj, const char* data) { return static_cast<ShapeAsset*>(obj)->getNormalImposterFile(); }
};
#ifdef TORQUE_TOOLS
DefineConsoleType(TypeShapeAssetPtr, S32)
DefineConsoleType(TypeShapeAssetId, String)
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// TypeAssetId GuiInspectorField Class
//-----------------------------------------------------------------------------

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

@ -360,7 +360,6 @@ DefineEngineStaticMethod(SoundAsset, getAssetIdByFilename, const char*, (const c
{
return SoundAsset::getAssetIdByFileName(StringTable->insert(filePath));
}
#endif
IMPLEMENT_CONOBJECT(GuiInspectorTypeSoundAssetPtr);
ConsoleDocClass(GuiInspectorTypeSoundAssetPtr,
@ -451,3 +450,4 @@ void GuiInspectorTypeSoundAssetId::consoleInit()
ConsoleBaseType::getType(TypeSoundAssetId)->setInspectorFieldType("GuiInspectorTypeSoundAssetId");
}
#endif

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

@ -145,7 +145,7 @@ protected:
DefineConsoleType(TypeSoundAssetPtr, SoundAsset)
DefineConsoleType(TypeSoundAssetId, String)
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// TypeAssetId GuiInspectorField Class
//-----------------------------------------------------------------------------
@ -171,7 +171,7 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeSoundAssetId);
static void consoleInit();
};
#endif
#pragma region Singular Asset Macros
//Singular assets

2
Engine/source/T3D/assets/TerrainAsset.cpp
View file

@ -436,6 +436,7 @@ DefineEngineMethod(TerrainAsset, getTerrainFilePath, const char*, (), ,
return object->getTerrainFilePath();
}
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId
//-----------------------------------------------------------------------------
@ -529,3 +530,4 @@ void GuiInspectorTypeTerrainAssetId::consoleInit()
ConsoleBaseType::getType(TypeTerrainAssetId)->setInspectorFieldType("GuiInspectorTypeTerrainAssetId");
}
#endif

4
Engine/source/T3D/assets/TerrainAsset.h
View file

@ -101,7 +101,7 @@ protected:
DefineConsoleType(TypeTerrainAssetPtr, TerrainAsset)
DefineConsoleType(TypeTerrainAssetId, String)
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// TypeAssetId GuiInspectorField Class
//-----------------------------------------------------------------------------
@ -127,6 +127,6 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeTerrainAssetId);
static void consoleInit();
};
#endif
#endif // _ASSET_BASE_H_

2
Engine/source/T3D/assets/TerrainMaterialAsset.cpp
View file

@ -482,7 +482,6 @@ DefineEngineMethod(TerrainMaterialAsset, getFXMaterialDefinition, S32, (), ,
else
return 0;
}
#endif
//-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId
//-----------------------------------------------------------------------------
@ -577,3 +576,4 @@ void GuiInspectorTypeTerrainMaterialAssetId::consoleInit()
ConsoleBaseType::getType(TypeTerrainMaterialAssetId)->setInspectorFieldType("GuiInspectorTypeTerrainMaterialAssetId");
}
#endif

4
Engine/source/T3D/assets/TerrainMaterialAsset.h
View file

@ -130,7 +130,7 @@ protected:
DefineConsoleType(TypeTerrainMaterialAssetPtr, TerrainMaterialAsset)
DefineConsoleType(TypeTerrainMaterialAssetId, String)
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// TypeAssetId GuiInspectorField Class
//-----------------------------------------------------------------------------
@ -155,6 +155,6 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeTerrainMaterialAssetId);
static void consoleInit();
};
#endif
#endif // _ASSET_BASE_H_

2
Engine/source/T3D/assets/stateMachineAsset.cpp
View file

@ -156,6 +156,7 @@ DefineEngineMethod(StateMachineAsset, notifyAssetChanged, void, (),,"")
ResourceManager::get().getChangedSignal().trigger(object->getStateMachineFile());
}
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId
//-----------------------------------------------------------------------------
@ -233,3 +234,4 @@ bool GuiInspectorTypeStateMachineAssetPtr::updateRects()
return resized;
}
#endif

4
Engine/source/T3D/assets/stateMachineAsset.h
View file

@ -74,7 +74,7 @@ protected:
};
DefineConsoleType(TypeStateMachineAssetPtr, StateMachineAsset)
#ifdef TORQUE_TOOLS
//-----------------------------------------------------------------------------
// TypeAssetId GuiInspectorField Class
//-----------------------------------------------------------------------------
@ -91,6 +91,6 @@ public:
virtual GuiControl* constructEditControl();
virtual bool updateRects();
};
#endif
#endif