immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored Math::Vector in object implementations

dev
Tomasz Kapuściński 2022-01-04 00:16:59 +01:00
parent 076dce6981
commit 3707daf678
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/object/implementation/programmable_impl.cpp
View File

@ -260,7 +260,7 @@ void CProgrammableObjectImpl::TraceRecordStart()
void CProgrammableObjectImpl::TraceRecordFrame() void CProgrammableObjectImpl::TraceRecordFrame()
{ {
TraceOper oper = TO_STOP; TraceOper oper = TO_STOP;
Math::Vector pos; glm::vec3 pos;
float angle, len, speed; float angle, len, speed;
assert(m_object->Implements(ObjectInterfaceType::TraceDrawing)); assert(m_object->Implements(ObjectInterfaceType::TraceDrawing));

2
src/object/implementation/programmable_impl.h
View File

@ -92,7 +92,7 @@ private:
bool m_traceRecord; bool m_traceRecord;
TraceOper m_traceOper; TraceOper m_traceOper;
Math::Vector m_tracePos; glm::vec3 m_tracePos;
float m_traceAngle; float m_traceAngle;
TraceColor m_traceColor; TraceColor m_traceColor;
int m_traceRecordIndex; int m_traceRecordIndex;

4
src/object/implementation/task_executor_impl.cpp
View File

@ -222,7 +222,7 @@ Error CTaskExecutorObjectImpl::StartTaskFire(float delay)
return StartForegroundTask<CTaskFire>(delay); return StartForegroundTask<CTaskFire>(delay);
} }
Error CTaskExecutorObjectImpl::StartTaskFireAnt(Math::Vector impact) Error CTaskExecutorObjectImpl::StartTaskFireAnt(glm::vec3 impact)
{ {
return StartForegroundTask<CTaskFireAnt>(impact); return StartForegroundTask<CTaskFireAnt>(impact);
} }
@ -253,7 +253,7 @@ Error CTaskExecutorObjectImpl::StartTaskTurn(float angle)
return StartForegroundTask<CTaskTurn>(angle); return StartForegroundTask<CTaskTurn>(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<CTaskGoto>(pos, altitude, goalMode, crashMode); return StartForegroundTask<CTaskGoto>(pos, altitude, goalMode, crashMode);
} }

4
src/object/implementation/task_executor_impl.h
View File

@ -51,14 +51,14 @@ public:
Error StartTaskTerraform() override; Error StartTaskTerraform() override;
Error StartTaskRecover() override; Error StartTaskRecover() override;
Error StartTaskFire(float delay) override; Error StartTaskFire(float delay) override;
Error StartTaskFireAnt(Math::Vector impact) override; Error StartTaskFireAnt(glm::vec3 impact) override;
Error StartTaskSpiderExplo() override; Error StartTaskSpiderExplo() override;
Error StartTaskPen(bool down, TraceColor color = TraceColor::Default) override; Error StartTaskPen(bool down, TraceColor color = TraceColor::Default) override;
Error StartTaskWait(float time) override; Error StartTaskWait(float time) override;
Error StartTaskAdvance(float length) override; Error StartTaskAdvance(float length) override;
Error StartTaskTurn(float angle) 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 StartTaskInfo(const char *name, float value, float power, bool bSend) override;
Error StartTaskShield(TaskShieldMode mode, float delay = 1000.0f) override; Error StartTaskShield(TaskShieldMode mode, float delay = 1000.0f) override;