From b28ca14e157ac210233126ef6d6e21f71f23090f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20L=C3=BCbe=C3=9F?= Date: Thu, 10 Aug 2023 20:38:49 +0200 Subject: [PATCH] Updated Box2D --- GlitchyEngine/src/Scripting/ScriptGlue.bf | 6 +++--- GlitchyEngine/src/World/Components/Components.bf | 4 ++-- GlitchyEngine/src/World/Scene.bf | 2 +- GlitchyEngine/vendor/box2D | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/GlitchyEngine/src/Scripting/ScriptGlue.bf b/GlitchyEngine/src/Scripting/ScriptGlue.bf index bd72ea1..ad2a040 100644 --- a/GlitchyEngine/src/Scripting/ScriptGlue.bf +++ b/GlitchyEngine/src/Scripting/ScriptGlue.bf @@ -247,7 +247,7 @@ static class ScriptGlue Entity entity = scene.GetEntityByID(entityId); var rigidBody = entity.GetComponent(); - Box2D.Body.ApplyForce(rigidBody.[Friend]RuntimeBody, ref *(Box2D.b2Vec2*)&force, ref *(Box2D.b2Vec2*)&point, wakeUp); + Box2D.Body.ApplyForce(rigidBody.[Friend]RuntimeBody, force, point, wakeUp); } [RegisterCall("ScriptGlue::RigidBody2D_ApplyForceToCenter")] @@ -257,7 +257,7 @@ static class ScriptGlue Entity entity = scene.GetEntityByID(entityId); var rigidBody = entity.GetComponent(); - Box2D.Body.ApplyForceToCenter(rigidBody.[Friend]RuntimeBody, ref *(Box2D.b2Vec2*)&force, wakeUp); + Box2D.Body.ApplyForceToCenter(rigidBody.[Friend]RuntimeBody, force, wakeUp); } #endregion RigidBody2D @@ -281,7 +281,7 @@ static class ScriptGlue Scene scene = ScriptEngine.Context; #unwarn - Box2D.World.SetGravity(scene.[Friend]_physicsWorld2D, ref *(b2Vec2*)&gravity); + Box2D.World.SetGravity(scene.[Friend]_physicsWorld2D, gravity); } #endregion Physics2D diff --git a/GlitchyEngine/src/World/Components/Components.bf b/GlitchyEngine/src/World/Components/Components.bf index c1f4f5c..c2318ce 100644 --- a/GlitchyEngine/src/World/Components/Components.bf +++ b/GlitchyEngine/src/World/Components/Components.bf @@ -413,7 +413,7 @@ namespace GlitchyEngine.World { float angle = Box2D.Body.GetAngle(RuntimeBody); - Box2D.Body.SetTransform(RuntimeBody, ref *(Box2D.b2Vec2*)&position, angle); + Box2D.Body.SetTransform(RuntimeBody, position, angle); } } @@ -433,7 +433,7 @@ namespace GlitchyEngine.World { var pos = Box2D.Body.GetPosition(RuntimeBody); - Box2D.Body.SetTransform(RuntimeBody, ref pos, angle); + Box2D.Body.SetTransform(RuntimeBody, pos, angle); } } } diff --git a/GlitchyEngine/src/World/Scene.bf b/GlitchyEngine/src/World/Scene.bf index 94d6a20..a94094c 100644 --- a/GlitchyEngine/src/World/Scene.bf +++ b/GlitchyEngine/src/World/Scene.bf @@ -177,7 +177,7 @@ namespace GlitchyEngine.World public void OnSimulationStart() { - _physicsWorld2D = World.Create(ref _gravity2D); + _physicsWorld2D = World.Create(_gravity2D); _contactListener = b2ContactListener(); _contactListener.beginContactCallback = (contact, userData) => diff --git a/GlitchyEngine/vendor/box2D b/GlitchyEngine/vendor/box2D index 5990578..e80bdab 160000 --- a/GlitchyEngine/vendor/box2D +++ b/GlitchyEngine/vendor/box2D @@ -1 +1 @@ -Subproject commit 5990578fdcfba275c96f91453d7150203865d2a1 +Subproject commit e80bdab82d811261a412645dc6a30ddbed8fa862