Skip to content

OnCreate invoke after all instances created #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WhereIsMyID wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OnCreate invoke after all instances created #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Hazel/src/Hazel/Scene/Scene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,9 @@ namespace Hazel {
for (auto e : view)
{
Entity entity = { e, this };
ScriptEngine::OnCreateEntity(entity);
ScriptEngine::CreateEntity(entity);
}
ScriptEngine::OnCreateEntities();
}
}

Expand Down
10 changes: 8 additions & 2 deletions Hazel/src/Hazel/Scripting/ScriptEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,10 +283,10 @@ namespace Hazel {
return s_Data->EntityClasses.find(fullClassName) != s_Data->EntityClasses.end();
}

void ScriptEngine::OnCreateEntity(Entity entity)
void ScriptEngine::CreateEntity(Entity entity)
{
const auto& sc = entity.GetComponent<ScriptComponent>();
if (ScriptEngine::EntityClassExists(sc.ClassName))
if (EntityClassExists(sc.ClassName))
{
UUID entityID = entity.GetUUID();

Expand All @@ -300,7 +300,13 @@ namespace Hazel {
for (const auto& [name, fieldInstance] : fieldMap)
instance->SetFieldValueInternal(name, fieldInstance.m_Buffer);
}
}
}

void ScriptEngine::OnCreateEntities()
{
for (auto& [entity, instance] : s_Data->EntityInstances)
{
instance->InvokeOnCreate();
}
}
Expand Down
3 changes: 2 additions & 1 deletion Hazel/src/Hazel/Scripting/ScriptEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ namespace Hazel {
static void OnRuntimeStop();

static bool EntityClassExists(const std::string& fullClassName);
static void OnCreateEntity(Entity entity);
static void CreateEntity(Entity entity);
static void OnCreateEntities();
static void OnUpdateEntity(Entity entity, Timestep ts);

static Scene* GetSceneContext();
Expand Down