From dabd9c01a619be92b66d20f119f7757d17273b44 Mon Sep 17 00:00:00 2001 From: WiggleWizard <1405402+WiggleWizard@users.noreply.github.com> Date: Fri, 13 Sep 2024 23:54:43 +0100 Subject: [PATCH] Removed trigger zone component --- Nuake/src/Scene/Components/TriggerZone.h | 26 --------------------- Nuake/src/Scene/Systems/PhysicsSystem.cpp | 1 - Nuake/src/Scene/Systems/QuakeMapBuilder.cpp | 1 - Nuake/src/Scripting/Modules/SceneModule.h | 5 ---- 4 files changed, 33 deletions(-) delete mode 100644 Nuake/src/Scene/Components/TriggerZone.h diff --git a/Nuake/src/Scene/Components/TriggerZone.h b/Nuake/src/Scene/Components/TriggerZone.h deleted file mode 100644 index 8c07debb..00000000 --- a/Nuake/src/Scene/Components/TriggerZone.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include - -namespace Nuake -{ - class TriggerZone - { - public: - std::string target = ""; - - std::vector Targets; - bool Enabled = true; - - TriggerZone() - { - Targets = std::vector(); - } - - std::vector GetTargets() - { - return Targets; - } - - }; -} diff --git a/Nuake/src/Scene/Systems/PhysicsSystem.cpp b/Nuake/src/Scene/Systems/PhysicsSystem.cpp index 6de93c66..fe3fb0c3 100644 --- a/Nuake/src/Scene/Systems/PhysicsSystem.cpp +++ b/Nuake/src/Scene/Systems/PhysicsSystem.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include namespace Nuake diff --git a/Nuake/src/Scene/Systems/QuakeMapBuilder.cpp b/Nuake/src/Scene/Systems/QuakeMapBuilder.cpp index 1d49ac55..cb1ad4f7 100644 --- a/Nuake/src/Scene/Systems/QuakeMapBuilder.cpp +++ b/Nuake/src/Scene/Systems/QuakeMapBuilder.cpp @@ -22,7 +22,6 @@ extern "C" { #include "src/Scene/Components/TransformComponent.h" #include "src/Scene/Components/LightComponent.h" #include "src/Scene/Components/NameComponent.h" -#include "src/Scene/Components/TriggerZone.h" #include "src/Resource/FGD/FGDClass.h" #include "src/Scene/Components/WrenScriptComponent.h" #include "src/Scene/Components/PrefabComponent.h" diff --git a/Nuake/src/Scripting/Modules/SceneModule.h b/Nuake/src/Scripting/Modules/SceneModule.h index 704997ac..b10d176b 100644 --- a/Nuake/src/Scripting/Modules/SceneModule.h +++ b/Nuake/src/Scripting/Modules/SceneModule.h @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -406,8 +405,6 @@ namespace Nuake double handle = wrenGetSlotDouble(vm, 1); Entity ent = Entity((entt::entity)handle, Engine::GetCurrentScene().get()); - TriggerZone trigger = ent.GetComponent(); - int count = 0; wrenSetSlotDouble(vm, 0, count); @@ -418,8 +415,6 @@ namespace Nuake double handle = wrenGetSlotDouble(vm, 1); Entity ent = Entity((entt::entity)handle, Engine::GetCurrentScene().get()); - TriggerZone trigger = ent.GetComponent(); - std::vector entities = {}; wrenEnsureSlots(vm, static_cast(entities.size()));