Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 21:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ScriptClass leaking

Browse Source
This commit is contained in:
Simon Lübeß
2023-03-30 15:13:21 +02:00
parent 4fd9a924a0
commit ef5e4ba64f
7 changed files with 66 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/World/Components/Components.bf
-2
View File
@@ -462,8 +462,6 @@ namespace GlitchyEngine.World
public void Dispose() mut
{
ReleaseRefAndNullify!(_instance);
}
}
}
GlitchyEngine/src/World/Scene.bf
+31 -2
View File
@@ -76,8 +76,21 @@ namespace GlitchyEngine.World
CopyComponents<Rigidbody2DComponent>(this, target);
CopyComponents<BoxCollider2DComponent>(this, target);
CopyComponents<CircleCollider2DComponent>(this, target);
CopyComponents<ScriptComponent>(this, target);
//CopyComponents<ScriptComponent>(this, target);
for (let (sourceHandle, sourceComponent) in _ecsWorld.Enumerate<ScriptComponent>())
{
Entity sourceEntity = .(sourceHandle, this);
Entity targetEntity = target.GetEntityByID(sourceEntity.UUID);
ScriptComponent* targetComponent = targetEntity.AddComponent<ScriptComponent>();
// TODO: Do proper copy
targetComponent.Instance = new ScriptInstance(sourceComponent.Instance.ScriptClass);
targetComponent.Instance..ReleaseRef();
}
// Copy transforms
for (let (sourceHandle, sourceTransform) in _ecsWorld.Enumerate<TransformComponent>())
{
@@ -134,8 +147,8 @@ namespace GlitchyEngine.World
public void OnRuntimeStop()
{
ScriptEngine.SetContext(null);
OnSimulationStop();
ScriptEngine.OnRuntimeStop();
}
public void OnSimulationStart()
@@ -244,11 +257,27 @@ namespace GlitchyEngine.World
if (!script.InInstantiated)
{
ScriptEngine.InitializeInstance(Entity(entity, this), script);
script.Instance.InvokeOnCreate();
}
script.Instance.InvokeOnUpdate(gameTime.DeltaTime);
}
}
/*if (mode.HasFlag(.Editor))
{
// Run editor scripts
for (var (entity, script) in _ecsWorld.Enumerate<ScriptComponent>())
{
if (!script.InInstantiated)
{
ScriptEngine.InitializeInstance(Entity(entity, this), script);
}
// TODO: Editor update
//script.Instance.InvokeOnUpdate(gameTime.DeltaTime);
}
}*/
if (mode.HasFlag(.Physics))
{