From 3707daf6783683d18c0a3425225d692f7e3d0ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Kapu=C5=9Bci=C5=84ski?= Date: Tue, 4 Jan 2022 00:16:59 +0100 Subject: [PATCH] Refactored Math::Vector in object implementations --- src/object/implementation/programmable_impl.cpp | 2 +- src/object/implementation/programmable_impl.h | 2 +- src/object/implementation/task_executor_impl.cpp | 4 ++-- src/object/implementation/task_executor_impl.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/object/implementation/programmable_impl.cpp b/src/object/implementation/programmable_impl.cpp index 82902ca4..b1dfa206 100644 --- a/src/object/implementation/programmable_impl.cpp +++ b/src/object/implementation/programmable_impl.cpp @@ -260,7 +260,7 @@ void CProgrammableObjectImpl::TraceRecordStart() void CProgrammableObjectImpl::TraceRecordFrame() { TraceOper oper = TO_STOP; - Math::Vector pos; + glm::vec3 pos; float angle, len, speed; assert(m_object->Implements(ObjectInterfaceType::TraceDrawing)); diff --git a/src/object/implementation/programmable_impl.h b/src/object/implementation/programmable_impl.h index a17113de..6fc375fb 100644 --- a/src/object/implementation/programmable_impl.h +++ b/src/object/implementation/programmable_impl.h @@ -92,7 +92,7 @@ private: bool m_traceRecord; TraceOper m_traceOper; - Math::Vector m_tracePos; + glm::vec3 m_tracePos; float m_traceAngle; TraceColor m_traceColor; int m_traceRecordIndex; diff --git a/src/object/implementation/task_executor_impl.cpp b/src/object/implementation/task_executor_impl.cpp index 63d7cf1f..892f2a1f 100644 --- a/src/object/implementation/task_executor_impl.cpp +++ b/src/object/implementation/task_executor_impl.cpp @@ -222,7 +222,7 @@ Error CTaskExecutorObjectImpl::StartTaskFire(float delay) return StartForegroundTask(delay); } -Error CTaskExecutorObjectImpl::StartTaskFireAnt(Math::Vector impact) +Error CTaskExecutorObjectImpl::StartTaskFireAnt(glm::vec3 impact) { return StartForegroundTask(impact); } @@ -253,7 +253,7 @@ Error CTaskExecutorObjectImpl::StartTaskTurn(float angle) return StartForegroundTask(angle); } -Error CTaskExecutorObjectImpl::StartTaskGoto(Math::Vector pos, float altitude, TaskGotoGoal goalMode, TaskGotoCrash crashMode) +Error CTaskExecutorObjectImpl::StartTaskGoto(glm::vec3 pos, float altitude, TaskGotoGoal goalMode, TaskGotoCrash crashMode) { return StartForegroundTask(pos, altitude, goalMode, crashMode); } diff --git a/src/object/implementation/task_executor_impl.h b/src/object/implementation/task_executor_impl.h index 3b1e0267..70728580 100644 --- a/src/object/implementation/task_executor_impl.h +++ b/src/object/implementation/task_executor_impl.h @@ -51,14 +51,14 @@ public: Error StartTaskTerraform() override; Error StartTaskRecover() override; Error StartTaskFire(float delay) override; - Error StartTaskFireAnt(Math::Vector impact) override; + Error StartTaskFireAnt(glm::vec3 impact) override; Error StartTaskSpiderExplo() override; Error StartTaskPen(bool down, TraceColor color = TraceColor::Default) override; Error StartTaskWait(float time) override; Error StartTaskAdvance(float length) override; Error StartTaskTurn(float angle) override; - Error StartTaskGoto(Math::Vector pos, float altitude, TaskGotoGoal goalMode, TaskGotoCrash crashMode) override; + Error StartTaskGoto(glm::vec3 pos, float altitude, TaskGotoGoal goalMode, TaskGotoCrash crashMode) override; Error StartTaskInfo(const char *name, float value, float power, bool bSend) override; Error StartTaskShield(TaskShieldMode mode, float delay = 1000.0f) override;