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

Adds the necessary ifdef flags to re-enable the ability to build with tools disabled

Browse source
This commit is contained in:
JeffR 2025-05-17 18:41:15 -05:00
parent a0838b58f2
commit cac068d2c5
6 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/T3D/SceneGroup.cpp
View file

@ -117,6 +117,8 @@ void SceneGroup::inspectPostApply()
void SceneGroup::onInspect(GuiInspector* inspector) void SceneGroup::onInspect(GuiInspector* inspector)
{ {
Parent::onInspect(inspector); Parent::onInspect(inspector);
#ifdef TORQUE_TOOLS
//Put the SubScene group before everything that'd be SubScene-effecting, for orginazational purposes //Put the SubScene group before everything that'd be SubScene-effecting, for orginazational purposes
GuiInspectorGroup* sceneGroupGrp = inspector->findExistentGroup(StringTable->insert("Editing")); GuiInspectorGroup* sceneGroupGrp = inspector->findExistentGroup(StringTable->insert("Editing"));
@ -154,6 +156,7 @@ void SceneGroup::onInspect(GuiInspector* inspector)
regenButton->setConsoleCommand(rgBuffer); regenButton->setConsoleCommand(rgBuffer);
regenFieldGui->addObject(regenButton); regenFieldGui->addObject(regenButton);
#endif
} }
void SceneGroup::setTransform(const MatrixF& mat) void SceneGroup::setTransform(const MatrixF& mat)

3
Engine/source/T3D/SubScene.cpp
View file

@ -129,6 +129,8 @@ void SubScene::onInspect(GuiInspector* inspector)
{ {
Parent::onInspect(inspector); Parent::onInspect(inspector);
#ifdef TORQUE_TOOLS
//Put the SubScene group before everything that'd be SubScene-effecting, for orginazational purposes //Put the SubScene group before everything that'd be SubScene-effecting, for orginazational purposes
GuiInspectorGroup* subsceneGrp = inspector->findExistentGroup(StringTable->insert("SubScene")); GuiInspectorGroup* subsceneGrp = inspector->findExistentGroup(StringTable->insert("SubScene"));
if (!subsceneGrp) if (!subsceneGrp)
@ -165,6 +167,7 @@ void SubScene::onInspect(GuiInspector* inspector)
saveButton->setConsoleCommand(szBuffer); saveButton->setConsoleCommand(szBuffer);
saveFieldGui->addObject(saveButton); saveFieldGui->addObject(saveButton);
#endif
} }
void SubScene::inspectPostApply() void SubScene::inspectPostApply()

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

@ -765,7 +765,7 @@ DefineEngineStaticMethod(ImageAsset, getAssetIdByFilename, const char*, (const c
{ {
return ImageAsset::getAssetIdByFilename(StringTable->insert(filePath)); return ImageAsset::getAssetIdByFilename(StringTable->insert(filePath));
} }
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId // GuiInspectorTypeAssetId
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -1048,3 +1048,4 @@ void GuiInspectorTypeImageAssetPtr::setPreviewImage(StringTableEntry assetId)
if (mPreviewImage->getBitmapAsset().isNull()) if (mPreviewImage->getBitmapAsset().isNull())
mPreviewImage->_setBitmap(StringTable->insert("ToolsModule:genericAssetIcon_image")); mPreviewImage->_setBitmap(StringTable->insert("ToolsModule:genericAssetIcon_image"));
} }
#endif

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

@ -72,7 +72,7 @@ void SubSceneAsset::initPersistFields()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId // GuiInspectorTypeAssetId
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifdef TORQUE_TOOLS
IMPLEMENT_CONOBJECT(GuiInspectorTypeSubSceneAssetPtr); IMPLEMENT_CONOBJECT(GuiInspectorTypeSubSceneAssetPtr);
ConsoleDocClass(GuiInspectorTypeSubSceneAssetPtr, ConsoleDocClass(GuiInspectorTypeSubSceneAssetPtr,
@ -164,3 +164,4 @@ void GuiInspectorTypeSubSceneAssetId::consoleInit()
ConsoleBaseType::getType(TypeSubSceneAssetId)->setInspectorFieldType("GuiInspectorTypeSubSceneAssetId"); ConsoleBaseType::getType(TypeSubSceneAssetId)->setInspectorFieldType("GuiInspectorTypeSubSceneAssetId");
} }
#endif

3
Engine/source/T3D/sfx/sfxEmitter.cpp
View file

@ -102,6 +102,7 @@ ConsoleSetType(TypeSoundControls)
{ {
} }
#ifdef TORQUE_TOOLS
IMPLEMENT_CONOBJECT(GuiInspectorTypeSoundControls); IMPLEMENT_CONOBJECT(GuiInspectorTypeSoundControls);
ConsoleDocClass(GuiInspectorTypeSoundControls, ConsoleDocClass(GuiInspectorTypeSoundControls,
"@brief Inspector field type for Controlling playback of sounds\n\n" "@brief Inspector field type for Controlling playback of sounds\n\n"
@ -201,7 +202,7 @@ bool GuiInspectorTypeSoundControls::updateRects()
return resized; return resized;
} }
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
Engine/source/T3D/sfx/sfxEmitter.h
View file

@ -42,6 +42,7 @@ class SFXSource;
class SFXTrack; class SFXTrack;
DefineConsoleType(TypeSoundControls, bool) DefineConsoleType(TypeSoundControls, bool)
#ifdef TORQUE_TOOLS
class GuiInspectorTypeSoundControls : public GuiInspectorField class GuiInspectorTypeSoundControls : public GuiInspectorField
{ {
typedef GuiInspectorField Parent; typedef GuiInspectorField Parent;
@ -56,6 +57,7 @@ public:
GuiControl* constructEditControl() override; GuiControl* constructEditControl() override;
bool updateRects() override; bool updateRects() override;
}; };
#endif
//RDTODO: make 3D sound emitters yield their source when being culled //RDTODO: make 3D sound emitters yield their source when being culled
/// The SFXEmitter is used to place 2D or 3D sounds into a /// The SFXEmitter is used to place 2D or 3D sounds into a