xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Merge pull request #370 from SHADE-DP/SP3-6-c-scripting 

Fixed behaviour of script Awake() and Start() not getting called as intended (first frame that object is active)
This commit is contained in:
XiaoQiDigipen 2023-02-27 13:10:35 +08:00 committed by GitHub
parent 0eae325b5f 99c1eebe70
commit 725da6254d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SHADE_Managed/src/Scripts/ScriptStore.cxx
View File

@ -482,11 +482,20 @@ namespace SHADE
{ {
SAFE_NATIVE_CALL_BEGIN SAFE_NATIVE_CALL_BEGIN
// Clear the awake queue // Clear the awake queue
for each (Script^ script in awakeList) for each (Script ^ script in awakeList)
{ {
script->Awake(); if (script->Owner.IsActiveInHierarchy)
{
script->Awake();
}
else
{
inactiveAwakeList.Add(script);
}
} }
awakeList.Clear(); awakeList.Clear();
awakeList.UnionWith(%inactiveAwakeList);
inactiveAwakeList.Clear();
// Clear the start queue // Clear the start queue
for each (Script^ script in startList) for each (Script^ script in startList)
@ -501,10 +510,7 @@ namespace SHADE
} }
} }
startList.Clear(); startList.Clear();
for each (Script ^ script in startList) startList.UnionWith(%inactiveStartList);
{
startList.Add(script);
}
inactiveStartList.Clear(); inactiveStartList.Clear();
SAFE_NATIVE_CALL_END_N("SHADE_Managed.ScriptStore") SAFE_NATIVE_CALL_END_N("SHADE_Managed.ScriptStore")

1
SHADE_Managed/src/Scripts/ScriptStore.hxx
View File

@ -353,6 +353,7 @@ namespace SHADE
/*-----------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------*/
static ScriptDictionary scripts; static ScriptDictionary scripts;
static ScriptSet awakeList; static ScriptSet awakeList;
static ScriptSet inactiveAwakeList;
static ScriptSet startList; static ScriptSet startList;
static ScriptSet inactiveStartList; static ScriptSet inactiveStartList;
static ScriptSet disposalQueue; static ScriptSet disposalQueue;