Sfoglia il codice sorgente

fix TORQUE_TOOLS = off compilation

AzaezelX 3 anni fa
parent
commit
4a7104e5ea
38 ha cambiato i file con 80 aggiunte e 56 eliminazioni
  1. 2 1
      Engine/source/T3D/assets/CubemapAsset.cpp
  2. 2 2
      Engine/source/T3D/assets/CubemapAsset.h
  3. 1 1
      Engine/source/T3D/assets/GUIAsset.cpp
  4. 2 2
      Engine/source/T3D/assets/GUIAsset.h
  5. 2 0
      Engine/source/T3D/assets/GameObjectAsset.cpp
  6. 2 2
      Engine/source/T3D/assets/GameObjectAsset.h
  7. 2 1
      Engine/source/T3D/assets/ImageAsset.cpp
  8. 2 0
      Engine/source/T3D/assets/ImageAssetInspectors.h
  9. 2 0
      Engine/source/T3D/assets/MaterialAsset.cpp
  10. 2 2
      Engine/source/T3D/assets/MaterialAsset.h
  11. 2 0
      Engine/source/T3D/assets/ParticleAsset.cpp
  12. 2 2
      Engine/source/T3D/assets/ParticleAsset.h
  13. 2 2
      Engine/source/T3D/assets/ShapeAnimationAsset.h
  14. 1 1
      Engine/source/T3D/assets/ShapeAsset.cpp
  15. 1 1
      Engine/source/T3D/assets/ShapeAsset.h
  16. 1 1
      Engine/source/T3D/assets/SoundAsset.cpp
  17. 2 2
      Engine/source/T3D/assets/SoundAsset.h
  18. 2 0
      Engine/source/T3D/assets/TerrainAsset.cpp
  19. 2 2
      Engine/source/T3D/assets/TerrainAsset.h
  20. 1 1
      Engine/source/T3D/assets/TerrainMaterialAsset.cpp
  21. 2 2
      Engine/source/T3D/assets/TerrainMaterialAsset.h
  22. 2 0
      Engine/source/T3D/assets/stateMachineAsset.cpp
  23. 2 2
      Engine/source/T3D/assets/stateMachineAsset.h
  24. 5 2
      Engine/source/T3D/lighting/reflectionProbe.cpp
  25. 2 2
      Engine/source/T3D/tsStatic.cpp
  26. 2 2
      Engine/source/T3D/tsStatic.h
  27. 4 4
      Engine/source/T3D/zone.cpp
  28. 3 1
      Engine/source/T3D/zone.h
  29. 2 0
      Engine/source/Verve/VPath/VPathEditor.cpp
  30. 2 2
      Engine/source/Verve/VPath/VPathEditor.h
  31. 2 1
      Engine/source/afx/ui/afxGuiSubstitutionField.cpp
  32. 2 2
      Engine/source/afx/ui/afxGuiSubstitutionField.h
  33. 1 1
      Engine/source/app/game.cpp
  34. 2 0
      Engine/source/gui/containers/guiWindowCtrl.cpp
  35. 6 7
      Engine/source/gui/core/guiCanvas.cpp
  36. 2 2
      Engine/source/gui/core/guiCanvas.h
  37. 2 1
      Engine/source/navigation/guiNavEditorCtrl.cpp
  38. 2 2
      Engine/source/navigation/guiNavEditorCtrl.h

+ 2 - 1
Engine/source/T3D/assets/CubemapAsset.cpp

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

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

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

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

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

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

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

+ 2 - 0
Engine/source/T3D/assets/GameObjectAsset.cpp

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

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

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

+ 2 - 1
Engine/source/T3D/assets/ImageAsset.cpp

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

+ 2 - 0
Engine/source/T3D/assets/ImageAssetInspectors.h

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

+ 2 - 0
Engine/source/T3D/assets/MaterialAsset.cpp

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

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

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

+ 2 - 0
Engine/source/T3D/assets/ParticleAsset.cpp

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

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

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

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

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

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

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

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

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

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

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

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

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

+ 2 - 0
Engine/source/T3D/assets/TerrainAsset.cpp

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

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

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

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

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

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

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

+ 2 - 0
Engine/source/T3D/assets/stateMachineAsset.cpp

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

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

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

+ 5 - 2
Engine/source/T3D/lighting/reflectionProbe.cpp

@@ -115,9 +115,10 @@ ReflectionProbe::ReflectionProbe()
    mStaticCubemap = NULL;
    mStaticCubemap = NULL;
    mProbeUniqueID = "";
    mProbeUniqueID = "";
 
 
+#ifdef TORQUE_TOOLS
    mEditorShapeInst = NULL;
    mEditorShapeInst = NULL;
    mEditorShape = NULL;
    mEditorShape = NULL;
-
+#endif
    mRefreshRateMS = 200;
    mRefreshRateMS = 200;
    mDynamicLastBakeMS = 0;
    mDynamicLastBakeMS = 0;
 
 
@@ -135,9 +136,11 @@ ReflectionProbe::ReflectionProbe()
 
 
 ReflectionProbe::~ReflectionProbe()
 ReflectionProbe::~ReflectionProbe()
 {
 {
+
+#ifdef TORQUE_TOOLS
    if (mEditorShapeInst)
    if (mEditorShapeInst)
       SAFE_DELETE(mEditorShapeInst);
       SAFE_DELETE(mEditorShapeInst);
-
+#endif
    if (mReflectionModeType == StaticCubemap && mStaticCubemap)
    if (mReflectionModeType == StaticCubemap && mStaticCubemap)
       mStaticCubemap->deleteObject();
       mStaticCubemap->deleteObject();
 }
 }

+ 2 - 2
Engine/source/T3D/tsStatic.cpp

@@ -1635,7 +1635,7 @@ void TSStatic::getUtilizedAssets(Vector<StringTableEntry>* usedAssetsList)
 //These functions are duplicated in tsStatic and shapeBase.
 //These functions are duplicated in tsStatic and shapeBase.
 //They each function a little differently; but achieve the same purpose of gathering
 //They each function a little differently; but achieve the same purpose of gathering
 //target names/counts without polluting simObject.
 //target names/counts without polluting simObject.
-
+#ifdef TORQUE_TOOLS
 void TSStatic::onInspect(GuiInspector* inspector)
 void TSStatic::onInspect(GuiInspector* inspector)
 {
 {
    if (mShapeAsset == nullptr)
    if (mShapeAsset == nullptr)
@@ -1716,7 +1716,7 @@ void TSStatic::onInspect(GuiInspector* inspector)
       }
       }
    }
    }
 }
 }
-
+#endif
 DefineEngineMethod(TSStatic, getTargetName, const char*, (S32 index), (0),
 DefineEngineMethod(TSStatic, getTargetName, const char*, (S32 index), (0),
    "Get the name of the indexed shape material.\n"
    "Get the name of the indexed shape material.\n"
    "@param index index of the material to get (valid range is 0 - getTargetCount()-1).\n"
    "@param index index of the material to get (valid range is 0 - getTargetCount()-1).\n"

+ 2 - 2
Engine/source/T3D/tsStatic.h

@@ -270,9 +270,9 @@ public:
 
 
    const Vector<S32>& getLOSDetails() const { return mLOSDetails; }
    const Vector<S32>& getLOSDetails() const { return mLOSDetails; }
    bool hasAnim() { return mAmbientThread != NULL; }
    bool hasAnim() { return mAmbientThread != NULL; }
-
+#ifdef TORQUE_TOOLS
    virtual void onInspect(GuiInspector*);
    virtual void onInspect(GuiInspector*);
-
+#endif
    void updateMaterials();
    void updateMaterials();
 
 
    bool isAnimated() { return mPlayAmbient; }
    bool isAnimated() { return mPlayAmbient; }

+ 4 - 4
Engine/source/T3D/zone.cpp

@@ -82,6 +82,7 @@ void Zone::consoleInit()
    getStaticClassRep()->mIsRenderEnabled = false;
    getStaticClassRep()->mIsRenderEnabled = false;
 }
 }
 
 
+#ifdef TORQUE_TOOLS
 void Zone::initPersistFields()
 void Zone::initPersistFields()
 {
 {
    addProtectedField("selectAll", TypeBool, Offset(mSelecting, Zone),
    addProtectedField("selectAll", TypeBool, Offset(mSelecting, Zone),
@@ -90,13 +91,10 @@ void Zone::initPersistFields()
    Parent::initPersistFields();
    Parent::initPersistFields();
 }
 }
 
 
-
 bool Zone::_doSelect(void* object, const char* index, const char* data)
 bool Zone::_doSelect(void* object, const char* index, const char* data)
 {
 {
    Zone* zone = reinterpret_cast<Zone*>(object);
    Zone* zone = reinterpret_cast<Zone*>(object);
-
    zone->selectWithin();
    zone->selectWithin();
-
    return false;
    return false;
 }
 }
 
 
@@ -138,6 +136,7 @@ void Zone::selectWithin()
       }
       }
    }
    }
 }
 }
+#endif
 //=============================================================================
 //=============================================================================
 //    Console API.
 //    Console API.
 //=============================================================================
 //=============================================================================
@@ -162,9 +161,10 @@ DefineEngineMethod( Zone, dumpZoneState, void, ( bool updateFirst ), ( true ),
 {
 {
    object->dumpZoneState( updateFirst );
    object->dumpZoneState( updateFirst );
 }
 }
-
+#ifdef TORQUE_TOOLS
 DefineEngineMethod(Zone, selectWithin, void, () ,,
 DefineEngineMethod(Zone, selectWithin, void, () ,,
    "select a list of all objects assigned to the zone")
    "select a list of all objects assigned to the zone")
 {
 {
    object->selectWithin();
    object->selectWithin();
 }
 }
+#endif

+ 3 - 1
Engine/source/T3D/zone.h

@@ -45,11 +45,13 @@
 class Zone : public SceneAmbientSoundObject< ScenePolyhedralZone >
 class Zone : public SceneAmbientSoundObject< ScenePolyhedralZone >
 {
 {
    public:
    public:
+      typedef SceneAmbientSoundObject< ScenePolyhedralZone > Parent;
       bool mSelecting = false;
       bool mSelecting = false;
+#ifdef TORQUE_TOOLS
       static void initPersistFields();
       static void initPersistFields();
       static bool _doSelect(void* object, const char* index, const char* data);
       static bool _doSelect(void* object, const char* index, const char* data);
-      typedef SceneAmbientSoundObject< ScenePolyhedralZone > Parent;
       void selectWithin();
       void selectWithin();
+#endif
    protected:
    protected:
 
 
       // SceneVolume.
       // SceneVolume.

+ 2 - 0
Engine/source/Verve/VPath/VPathEditor.cpp

@@ -20,6 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
+#ifdef TORQUE_TOOLS
 #include "VPathEditor.h"
 #include "VPathEditor.h"
 
 
 #include "console/consoleTypes.h"
 #include "console/consoleTypes.h"
@@ -2188,3 +2189,4 @@ F32 Utility::GetYaw( const VectorF &pVec )
 
 
     return yaw;
     return yaw;
 }
 }
+#endif

+ 2 - 2
Engine/source/Verve/VPath/VPathEditor.h

@@ -22,7 +22,7 @@
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 #ifndef _VT_VPATHEDITOR_H_
 #ifndef _VT_VPATHEDITOR_H_
 #define _VT_VPATHEDITOR_H_
 #define _VT_VPATHEDITOR_H_
-
+#ifdef TORQUE_TOOLS
 #ifndef _EDITTSCTRL_H_
 #ifndef _EDITTSCTRL_H_
 #include "gui/worldEditor/editTSCtrl.h"
 #include "gui/worldEditor/editTSCtrl.h"
 #endif
 #endif
@@ -291,5 +291,5 @@ namespace Utility
 };
 };
 
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-
+#endif
 #endif // _VT_VPATHEDITOR_H_
 #endif // _VT_VPATHEDITOR_H_

+ 2 - 1
Engine/source/afx/ui/afxGuiSubstitutionField.cpp

@@ -22,7 +22,7 @@
 // IN THE SOFTWARE.
 // IN THE SOFTWARE.
 //
 //
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
-
+#ifdef TORQUE_TOOLS
 #include "afx/arcaneFX.h"
 #include "afx/arcaneFX.h"
 
 
 #include "gui/editor/inspector/customField.h"
 #include "gui/editor/inspector/customField.h"
@@ -203,3 +203,4 @@ void afxGuiSubstitutionField::_executeSelectedCallback()
 }
 }
 
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
+#endif

+ 2 - 2
Engine/source/afx/ui/afxGuiSubstitutionField.h

@@ -25,7 +25,7 @@
 
 
 #ifndef _AFX_GUI_SUBSTITUTION_FIELD_H_
 #ifndef _AFX_GUI_SUBSTITUTION_FIELD_H_
 #define _AFX_GUI_SUBSTITUTION_FIELD_H_
 #define _AFX_GUI_SUBSTITUTION_FIELD_H_
-
+#ifdef TORQUE_TOOLS
 #include "console/simFieldDictionary.h"
 #include "console/simFieldDictionary.h"
 #include "gui/editor/inspector/field.h"
 #include "gui/editor/inspector/field.h"
 
 
@@ -62,5 +62,5 @@ protected:
 
 
    String subs_string;
    String subs_string;
 };
 };
-
+#endif
 #endif // _AFX_SUBSTITUTION_FIELD_H_
 #endif // _AFX_SUBSTITUTION_FIELD_H_

+ 1 - 1
Engine/source/app/game.cpp

@@ -58,7 +58,7 @@
 #include "afx/arcaneFX.h"
 #include "afx/arcaneFX.h"
 #endif
 #endif
 
 
-#ifdef TORQUE_PLAYER
+#if defined(TORQUE_PLAYER) || !defined(TORQUE_TOOLS)
 // See matching #ifdef in editor/editor.cpp
 // See matching #ifdef in editor/editor.cpp
 bool gEditingMission = false;
 bool gEditingMission = false;
 #endif
 #endif

+ 2 - 0
Engine/source/gui/containers/guiWindowCtrl.cpp

@@ -870,11 +870,13 @@ void GuiWindowCtrl::onMouseDragged(const GuiEvent &event)
          GuiCanvas* guiCanvas = getRoot();
          GuiCanvas* guiCanvas = getRoot();
          if (guiCanvas)
          if (guiCanvas)
          {
          {
+#ifdef TORQUE_TOOLS
             GuiMenuBar* menuBar = dynamic_cast<GuiMenuBar*>(guiCanvas->getMenuBar());
             GuiMenuBar* menuBar = dynamic_cast<GuiMenuBar*>(guiCanvas->getMenuBar());
             if (menuBar)
             if (menuBar)
             {
             {
                menuBarHeight = menuBar->getHeight();
                menuBarHeight = menuBar->getHeight();
             }
             }
+#endif
          }
          }
          
          
          // Build valid snap and window vectors to compare against
          // Build valid snap and window vectors to compare against

+ 6 - 7
Engine/source/gui/core/guiCanvas.cpp

@@ -330,7 +330,7 @@ void GuiCanvas::onRemove()
 
 
    Parent::onRemove();
    Parent::onRemove();
 }
 }
-
+#ifdef TORQUE_TOOLS
 void GuiCanvas::setMenuBar(SimObject *obj)
 void GuiCanvas::setMenuBar(SimObject *obj)
 {
 {
     GuiControl *oldMenuBar = mMenuBarCtrl;
     GuiControl *oldMenuBar = mMenuBarCtrl;
@@ -382,7 +382,7 @@ void GuiCanvas::setMenuBar(SimObject *obj)
            newMenu->buildWindowAcceleratorMap(*getPlatformWindow()->getInputGenerator());
            newMenu->buildWindowAcceleratorMap(*getPlatformWindow()->getInputGenerator());
     }
     }
 }
 }
-
+#endif
 void GuiCanvas::setWindowTitle(const char *newTitle)
 void GuiCanvas::setWindowTitle(const char *newTitle)
 {
 {
    if (mPlatformWindow)
    if (mPlatformWindow)
@@ -705,9 +705,6 @@ bool GuiCanvas::processInputEvent(InputEventInfo &inputEvent)
       if (mCursorEnabled || mForceMouseToGUI || 
       if (mCursorEnabled || mForceMouseToGUI || 
          (mAlwaysHandleMouseButtons && inputEvent.objType == SI_BUTTON) )
          (mAlwaysHandleMouseButtons && inputEvent.objType == SI_BUTTON) )
       {
       {
-         if (inputEvent.objType != SI_AXIS && inputEvent.action == SI_MAKE)
-            bool asdfasdf = true;
-
          return processMouseEvent(inputEvent);
          return processMouseEvent(inputEvent);
       }
       }
       break;
       break;
@@ -1441,10 +1438,10 @@ void GuiCanvas::setContentControl(GuiControl *gui)
 
 
       Sim::getGuiGroup()->addObject( ctrl );
       Sim::getGuiGroup()->addObject( ctrl );
    }
    }
-
+#ifdef TORQUE_TOOLS
    // set current menu bar
    // set current menu bar
    setMenuBar( mMenuBarCtrl );
    setMenuBar( mMenuBarCtrl );
-
+#endif
    // lose the first responder from the old GUI
    // lose the first responder from the old GUI
    GuiControl* responder = gui->findFirstTabable();
    GuiControl* responder = gui->findFirstTabable();
    if(responder)
    if(responder)
@@ -2795,6 +2792,7 @@ DefineEngineMethod( GuiCanvas, setFocus, void, (), , "() - Claim OS input focus
    }
    }
 }
 }
 
 
+#ifdef TORQUE_TOOLS
 DefineEngineMethod( GuiCanvas, setMenuBar, void, ( GuiControl* menu ),,
 DefineEngineMethod( GuiCanvas, setMenuBar, void, ( GuiControl* menu ),,
    "Translate a coordinate from canvas window-space to screen-space.\n"
    "Translate a coordinate from canvas window-space to screen-space.\n"
    "@param coordinate The coordinate in window-space.\n"
    "@param coordinate The coordinate in window-space.\n"
@@ -2802,6 +2800,7 @@ DefineEngineMethod( GuiCanvas, setMenuBar, void, ( GuiControl* menu ),,
 {
 {
    return object->setMenuBar( menu );
    return object->setMenuBar( menu );
 }
 }
+#endif
 
 
 DefineEngineMethod( GuiCanvas, setVideoMode, void, 
 DefineEngineMethod( GuiCanvas, setVideoMode, void, 
                (U32 width, U32 height, bool fullscreen, U32 bitDepth, U32 refreshRate, U32 antialiasLevel), 
                (U32 width, U32 height, bool fullscreen, U32 bitDepth, U32 refreshRate, U32 antialiasLevel), 

+ 2 - 2
Engine/source/gui/core/guiCanvas.h

@@ -222,10 +222,10 @@ public:
 
 
    virtual bool onAdd();
    virtual bool onAdd();
    virtual void onRemove();
    virtual void onRemove();
-
+#ifdef TORQUE_TOOLS
    void setMenuBar(SimObject *obj);
    void setMenuBar(SimObject *obj);
    SimObject* getMenuBar() { return mMenuBarCtrl; }
    SimObject* getMenuBar() { return mMenuBarCtrl; }
-
+#endif
    static void initPersistFields();
    static void initPersistFields();
 
 
    static CanvasSizeChangeSignal& getCanvasSizeChangeSignal() { return smCanvasSizeChangeSignal; }
    static CanvasSizeChangeSignal& getCanvasSizeChangeSignal() { return smCanvasSizeChangeSignal; }

+ 2 - 1
Engine/source/navigation/guiNavEditorCtrl.cpp

@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-
+#ifdef TORQUE_TOOLS
 #include "platform/platform.h"
 #include "platform/platform.h"
 #include "guiNavEditorCtrl.h"
 #include "guiNavEditorCtrl.h"
 #include "duDebugDrawTorque.h"
 #include "duDebugDrawTorque.h"
@@ -636,3 +636,4 @@ DefineEngineMethod(GuiNavEditorCtrl, setMode, void, (String mode),, "setMode(Str
 {
 {
    object->setMode(mode);
    object->setMode(mode);
 }
 }
+#endif

+ 2 - 2
Engine/source/navigation/guiNavEditorCtrl.h

@@ -22,7 +22,7 @@
 
 
 #ifndef _GUINAVEDITORCTRL_H_
 #ifndef _GUINAVEDITORCTRL_H_
 #define _GUINAVEDITORCTRL_H_
 #define _GUINAVEDITORCTRL_H_
-
+#ifdef TORQUE_TOOLS
 #ifndef _EDITTSCTRL_H_
 #ifndef _EDITTSCTRL_H_
 #include "gui/worldEditor/editTSCtrl.h"
 #include "gui/worldEditor/editTSCtrl.h"
 #endif
 #endif
@@ -179,7 +179,7 @@ public:
    virtual void undo();
    virtual void undo();
    virtual void redo() { undo(); }
    virtual void redo() { undo(); }
 };
 };
-
+#endif
 #endif
 #endif