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

Modified how scripts are added and updated to support runtime adding of scripts

This commit is contained in:
Kah Wei 2022-11-13 16:07:14 +08:00
parent 23320863e3
commit af361062e7
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,8 +73,16 @@ namespace SHADE
// Add the script in // Add the script in
entityScriptList->Insert(System::Math::Clamp(index, 0, entityScriptList->Count), script); entityScriptList->Insert(System::Math::Clamp(index, 0, entityScriptList->Count), script);
awakeList.Add(script); if (Application::IsPlaying)
startList.Add(script); {
script->Awake();
script->Start();
}
else
{
awakeList.Add(script);
startList.Add(script);
}
script->OnAttached(); script->OnAttached();
return script; return script;
@ -451,9 +459,10 @@ namespace SHADE
continue; continue;
// Update each script // Update each script
for each (Script^ script in entity.Value) ScriptList^ scripts = entity.Value;
for (int i = 0; i < scripts->Count; ++i)
{ {
script->FixedUpdate(); scripts[i]->FixedUpdate();
} }
} }
SAFE_NATIVE_CALL_END_N("SHADE_Managed.ScriptStore") SAFE_NATIVE_CALL_END_N("SHADE_Managed.ScriptStore")
@ -468,9 +477,10 @@ namespace SHADE
continue; continue;
// Update each script // Update each script
for each (Script^ script in entity.Value) ScriptList^ scripts = entity.Value;
for (int i = 0; i < scripts->Count; ++i)
{ {
script->Update(); scripts[i]->Update();
} }
} }
SAFE_NATIVE_CALL_END_N("SHADE_Managed.ScriptStore") SAFE_NATIVE_CALL_END_N("SHADE_Managed.ScriptStore")
@ -485,9 +495,10 @@ namespace SHADE
continue; continue;
// Update each script // Update each script
for each (Script^ script in entity.Value) ScriptList^ scripts = entity.Value;
for (int i = 0; i < scripts->Count; ++i)
{ {
script->LateUpdate(); scripts[i]->LateUpdate();
} }
} }
SAFE_NATIVE_CALL_END_N("SHADE_Managed.ScriptStore") SAFE_NATIVE_CALL_END_N("SHADE_Managed.ScriptStore")
@ -503,9 +514,10 @@ namespace SHADE
continue; continue;
// Update each script // Update each script
for each (Script^ script in entity.Value) ScriptList^ scripts = entity.Value;
for (int i = 0; i < scripts->Count; ++i)
{ {
script->OnDrawGizmos(); scripts[i]->OnDrawGizmos();
} }
} }
SAFE_NATIVE_CALL_END_N("SHADE_Managed.ScriptStore") SAFE_NATIVE_CALL_END_N("SHADE_Managed.ScriptStore")
@ -537,8 +549,9 @@ namespace SHADE
auto entityScripts = scripts[entity.first]; auto entityScripts = scripts[entity.first];
if (entityScripts->Count > 0) if (entityScripts->Count > 0)
{ {
for each (Script ^ script in entityScripts) for (int i = 0; i < entityScripts->Count; ++i)
{ {
Script^ script = entityScripts[i];
switch (collisionInfo.GetCollisionState()) switch (collisionInfo.GetCollisionState())
{ {
case SHCollisionEvent::State::ENTER: case SHCollisionEvent::State::ENTER:
@ -578,8 +591,9 @@ namespace SHADE
auto entityScripts = scripts[entity.first]; auto entityScripts = scripts[entity.first];
if (entityScripts->Count > 0) if (entityScripts->Count > 0)
{ {
for each (Script ^ script in entityScripts) for (int i = 0; i < entityScripts->Count; ++i)
{ {
Script^ script = entityScripts[i];
switch (triggerInfo.GetCollisionState()) switch (triggerInfo.GetCollisionState())
{ {
case SHCollisionEvent::State::ENTER: case SHCollisionEvent::State::ENTER: