TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-27 15:25:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Console Refactor

Browse source
This commit is contained in:
Lukas Aldershaab 2023-04-23 10:39:54 +02:00
parent 626de074cc
commit 89b0c7f73b
89 changed files with 1883 additions and 1553 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/gui/editor/inspector/dynamicGroup.cpp
View file

@ -25,6 +25,7 @@
#include "gui/editor/inspector/dynamicGroup.h"
#include "gui/editor/inspector/dynamicField.h"
#include "console/engineAPI.h"
#include "console/script.h"
IMPLEMENT_CONOBJECT(GuiInspectorDynamicGroup);

6
Engine/source/gui/editor/inspector/field.cpp
View file

@ -23,6 +23,8 @@
#include "console/engineAPI.h"
#include "platform/platform.h"
#include "gui/editor/inspector/field.h"
#include "console/script.h"
#include "gui/buttons/guiIconButtonCtrl.h"
#include "gui/editor/guiInspector.h"
#include "core/util/safeDelete.h"
@ -321,7 +323,7 @@ void GuiInspectorField::setData( const char* data, bool callbacks )
{
char buffer[ 2048 ];
expandEscape( buffer, newValue );
evaluationResult = Con::evaluatef("$f = \"%s\"; return ( %s );", oldValue.c_str(), buffer);
evaluationResult = Con::evaluatef("$f = \"%s\"; return ( %s );", oldValue.c_str(), buffer).value;
newValue = evaluationResult.getString();
Con::evaluatef("$f=0;");
}
@ -359,7 +361,7 @@ void GuiInspectorField::setData( const char* data, bool callbacks )
expandEscape( buffer, newComponentExpr );
evaluationResult = Con::evaluatef("$f = \"%s\"; $v = \"%s\"; return ( %s );",
oldComponentVal, oldValue.c_str(), buffer);
oldComponentVal, oldValue.c_str(), buffer).value;
Con::evaluatef("$f=0;$v=0;");
if( !isFirst )

2
Engine/source/gui/editor/inspector/group.cpp
View file

@ -22,6 +22,8 @@
#include "gui/editor/guiInspector.h"
#include "gui/editor/inspector/group.h"
#include "console/script.h"
#include "gui/editor/inspector/dynamicField.h"
#include "gui/editor/inspector/datablockField.h"
#include "gui/buttons/guiIconButtonCtrl.h"

5
Engine/source/gui/editor/inspector/variableGroup.cpp
View file

@ -25,8 +25,7 @@
#include "gui/editor/guiInspector.h"
#include "gui/buttons/guiIconButtonCtrl.h"
#include "console/consoleInternal.h"
extern ExprEvalState gEvalState;
#include "console/script.h"
//-----------------------------------------------------------------------------
// GuiInspectorVariableGroup
@ -65,7 +64,7 @@ bool GuiInspectorVariableGroup::inspectGroup()
{
Vector<String> names;
gEvalState.globalVars.exportVariables(mSearchString, &names, NULL);
Con::gGlobalVars.exportVariables(mSearchString, &names, NULL);
for (U32 i = 0; i < names.size(); i++)
{