From 2a8da705e4a59610caf99d7e02c46e42ff0f6ea8 Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Fri, 7 Jul 2023 01:33:52 -0400 Subject: [PATCH] Added Editor Update to scene systems --- Nuake/src/Scene/Systems/TrenchbroomSystem.cpp | 13 +++++++++++++ Nuake/src/Scene/Systems/TrenchbroomSystem.h | 6 +++++- Nuake/src/Scripting/Modules/SceneModule.h | 7 ++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Nuake/src/Scene/Systems/TrenchbroomSystem.cpp b/Nuake/src/Scene/Systems/TrenchbroomSystem.cpp index b3eff865..0dcdf4d3 100644 --- a/Nuake/src/Scene/Systems/TrenchbroomSystem.cpp +++ b/Nuake/src/Scene/Systems/TrenchbroomSystem.cpp @@ -1,5 +1,8 @@ #include "TrenchbroomSystem.h" +#include "src/Scene/Scene.h" +#include "src/Scene/Components/QuakeMap.h" + namespace Nuake { TrenchbroomSystem::TrenchbroomSystem(Scene* scene) @@ -22,6 +25,16 @@ namespace Nuake } + void TrenchbroomSystem::EditorUpdate() + { + auto quakeMapView = m_Scene->m_Registry.view(); + for (auto e : quakeMapView) + { + const auto& quakeMapComponent = quakeMapView.get(e); + + } + } + void TrenchbroomSystem::Exit() { diff --git a/Nuake/src/Scene/Systems/TrenchbroomSystem.h b/Nuake/src/Scene/Systems/TrenchbroomSystem.h index 547a87a0..eacc9170 100644 --- a/Nuake/src/Scene/Systems/TrenchbroomSystem.h +++ b/Nuake/src/Scene/Systems/TrenchbroomSystem.h @@ -8,9 +8,13 @@ namespace Nuake public: TrenchbroomSystem(Scene* scene); bool Init() override; - void Update(Timestep ts) override; + void Draw() override {} + + void Update(Timestep ts) override; void FixedUpdate(Timestep ts) override; + void EditorUpdate() override; + void Exit() override; }; } diff --git a/Nuake/src/Scripting/Modules/SceneModule.h b/Nuake/src/Scripting/Modules/SceneModule.h index 51de9366..b6f3b907 100644 --- a/Nuake/src/Scripting/Modules/SceneModule.h +++ b/Nuake/src/Scripting/Modules/SceneModule.h @@ -2,10 +2,15 @@ #include "wren.h" #include #include + #include "ScriptModule.h" + #include #include #include "Engine.h" + +#include "src/Core/Physics/PhysicsManager.h" + #include "../Scene/Entities/Entity.h" #include #include @@ -194,7 +199,7 @@ namespace Nuake { double handle = wrenGetSlotDouble(vm, 1); Entity ent = Entity((entt::entity)handle, Engine::GetCurrentScene().get()); auto& characterController = ent.GetComponent(); - bool result = characterController.CharacterController->IsOnGround; + bool result = PhysicsManager::Get().GetWorld()->IsCharacterGrounded(ent); wrenSetSlotBool(vm, 0, result); }