TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #940 from Areloch/ModuleRootScopeNamespace

Browse source 
Establishes a common namespace for Module ScopeSet objects to make it easier to work with function calls out of module namespaces
This commit is contained in:
Brian Roberts 2022-12-22 02:25:01 -06:00 committed by GitHub
parent 6f0a93bdcc 00c27095f7
commit 54a2235128
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/module/moduleManager.cpp
View file

@ -385,6 +385,8 @@ bool ModuleManager::loadModuleGroup( const char* pModuleGroup )
// Create a scope set.
SimSet* pScopeSet = new SimSet;
pScopeSet->registerObject( pLoadReadyModuleDefinition->getModuleId() );
pScopeSet->setClassNamespace("ModuleRoot");
pReadyEntry->mpModuleDefinition->mScopeSet = pScopeSet->getId();
// Increase load count.
@ -773,6 +775,8 @@ bool ModuleManager::loadModuleExplicit( const char* pModuleId, const U32 version
// Create a scope set.
SimSet* pScopeSet = new SimSet;
pScopeSet->registerObject( pLoadReadyModuleDefinition->getModuleId() );
pScopeSet->setClassNamespace("ModuleRoot");
pReadyEntry->mpModuleDefinition->mScopeSet = pScopeSet->getId();
// Increase load count.

18
Templates/BaseGame/game/core/utility/scripts/module.tscript
View file

@ -104,7 +104,7 @@ function loadAssetsByType(%assetType)
}
}
function SimSet::getModulePath(%scopeSet)
function ModuleRoot::getModulePath(%scopeSet)
{
%name = %scopeSet.getName();
%moduleDef = ModuleDatabase.findModule(%name);
@ -115,7 +115,7 @@ function SimSet::getModulePath(%scopeSet)
return "";
}
function SimSet::registerDatablock(%scopeSet, %datablockFilePath, %isExclusive)
function ModuleRoot::registerDatablock(%scopeSet, %datablockFilePath, %isExclusive)
{
if ($traceModuleCalls)
warn("SimSet::registerDatablock");
@ -171,7 +171,7 @@ function SimSet::registerDatablock(%scopeSet, %datablockFilePath, %isExclusive)
DatablockFilesList.echo();
}
function SimSet::unRegisterDatablock(%scopeSet, %datablockFilePath)
function ModuleRoot::unRegisterDatablock(%scopeSet, %datablockFilePath)
{
if ($traceModuleCalls)
warn("SimSet::unRegisterDatablock");
@ -215,7 +215,7 @@ function SimSet::unRegisterDatablock(%scopeSet, %datablockFilePath)
DatablockFilesList.echo();
}
function SimSet::queueExec(%scopeSet, %execFilePath, %isExclusive)
function ModuleRoot::queueExec(%scopeSet, %execFilePath, %isExclusive)
{
if ($traceModuleCalls)
warn("SimSet::queueExec");
@ -272,7 +272,7 @@ function SimSet::queueExec(%scopeSet, %execFilePath, %isExclusive)
%execFileList.echo();
}
function SimSet::unQueueExec(%scopeSet, %execFilePath)
function ModuleRoot::unQueueExec(%scopeSet, %execFilePath)
{
if ($traceModuleCalls)
warn("SimSet::unRegisterDatablock");
@ -317,10 +317,10 @@ function SimSet::unQueueExec(%scopeSet, %execFilePath)
%execFileList.echo();
}
function SimSet::GetEventManager(%this)
function ModuleRoot::GetEventManager(%scopeSet)
{
if( !isObject( %this.eventManager ) )
%this.eventManager = new EventManager() { queue = "ModuleEventManager"; };
if( !isObject( %scopeSet.eventManager ) )
%scopeSet.eventManager = new EventManager() { queue = "ModuleEventManager"; };
return %this.eventManager;
return %scopeSet.eventManager;
}