TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more console refactor.

Browse source
This commit is contained in:
Jeff Hutchinson 2021-03-31 21:09:23 -04:00
parent 5e81c021f5
commit 50df52ecfc
15 changed files with 150 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Engine/source/console/simEvents.cpp
View file

@ -28,30 +28,23 @@
// Stupid globals not declared in a header
extern ExprEvalState gEvalState;
SimConsoleEvent::SimConsoleEvent(S32 argc, ConsoleValueRef *argv, bool onObject)
SimConsoleEvent::SimConsoleEvent(S32 argc, ConsoleValue *argv, bool onObject)
{
mOnObject = onObject;
mArgc = argc;
mArgv = new ConsoleValueRef[argc];
mArgv = new ConsoleValue[argc];
for (int i=0; i<argc; i++)
{
mArgv[i].value = new ConsoleValue();
mArgv[i].value->type = ConsoleValue::TypeInternalString;
mArgv[i].value->init();
if (argv)
{
mArgv[i].value->setStringValue((const char*)argv[i]);
}
if (argv)
{
mArgv->setString(argv[i].getString(), dStrlen(argv[i].getString()));
}
}
}
SimConsoleEvent::~SimConsoleEvent()
{
for (int i=0; i<mArgc; i++)
{
delete mArgv[i].value;
}
delete[] mArgv;
}
@ -67,7 +60,7 @@ void SimConsoleEvent::process(SimObject* object)
// Grab the function name. If '::' doesn't exist, then the schedule is
// on a global function.
char funcName[256];
dStrncpy(funcName, (const char*)mArgv[0], 256);
dStrncpy(funcName, mArgv[0].getString(), 256);
char* func = dStrstr( funcName, (char*)"::" );
if( func )
{
@ -95,11 +88,11 @@ void SimConsoleEvent::process(SimObject* object)
}
}
void SimConsoleEvent::populateArgs(ConsoleValueRef *argv)
void SimConsoleEvent::populateArgs(ConsoleValue *argv)
{
for (U32 i=0; i<mArgc; i++)
{
argv[i].value = mArgv[i].value;
argv[i].setString(mArgv[i].getString(), dStrlen(mArgv[i].getString()));
}
}
@ -107,7 +100,6 @@ void SimConsoleEvent::populateArgs(ConsoleValueRef *argv)
SimConsoleThreadExecCallback::SimConsoleThreadExecCallback()
{
retVal.value = NULL;
sem = new Semaphore(0);
}
@ -116,37 +108,44 @@ SimConsoleThreadExecCallback::~SimConsoleThreadExecCallback()
delete sem;
}
void SimConsoleThreadExecCallback::handleCallback(ConsoleValueRef ret)
void SimConsoleThreadExecCallback::handleCallback(ConsoleValue ret)
{
retVal = ret;
// can we move this pls?
retVal.setString(ret.getString(), dStrlen(ret.getString()));
sem->release();
}
ConsoleValueRef SimConsoleThreadExecCallback::waitForResult()
ConsoleValue SimConsoleThreadExecCallback::waitForResult()
{
if(sem->acquire(true))
{
return retVal;
return std::move(retVal);
}
return ConsoleValueRef();
return ConsoleValue();
}
//-----------------------------------------------------------------------------
SimConsoleThreadExecEvent::SimConsoleThreadExecEvent(S32 argc, ConsoleValueRef *argv, bool onObject, SimConsoleThreadExecCallback *callback) :
SimConsoleThreadExecEvent::SimConsoleThreadExecEvent(S32 argc, ConsoleValue *argv, bool onObject, SimConsoleThreadExecCallback *callback) :
SimConsoleEvent(argc, argv, onObject), cb(callback)
{
}
void SimConsoleThreadExecEvent::process(SimObject* object)
{
ConsoleValueRef retVal;
if(mOnObject)
retVal = Con::execute(object, mArgc, mArgv);
if (cb)
{
if (mOnObject)
cb->handleCallback(std::move(Con::execute(object, mArgc, mArgv)));
else
cb->handleCallback(std::move(Con::execute(mArgc, mArgv)));
}
else
retVal = Con::execute(mArgc, mArgv);
if(cb)
cb->handleCallback(retVal);
{
if (mOnObject)
Con::execute(object, mArgc, mArgv);
else
Con::execute(mArgc, mArgv);
}
}