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

Refactored Math::Point in auto classes

dev
Tomasz Kapuściński 2021-12-24 03:26:25 +01:00
parent 91c19bff55
commit a806bb2657
20 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/object/auto/auto.cpp
View File

@ -175,7 +175,7 @@ bool CAuto::Abort()
bool CAuto::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, dim, ddim;
glm::vec2 pos, dim, ddim;
float ox, oy, sx, sy;
pw = static_cast<Ui::CWindow*>(m_interface->SearchControl(EVENT_WINDOW0));

4
src/object/auto/autobase.cpp
View File

@ -125,7 +125,7 @@ bool CAutoBase::EventProcess(const Event &event)
Math::Matrix* mat;
CObject* pObj;
Math::Vector pos, speed, vibCir, iPos;
Math::Point dim, p;
glm::vec2 dim, p;
float angle, dist, time, h, len, vSpeed;
int i, max;
@ -1170,7 +1170,7 @@ Error CAutoBase::GetError()
bool CAutoBase::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, dim, ddim;
glm::vec2 pos, dim, ddim;
float ox, oy, sx, sy;
float sleep, delay, magnetic, progress;

4
src/object/auto/autoconvert.cpp
View File

@ -101,7 +101,7 @@ bool CAutoConvert::EventProcess(const Event &event)
{
CObject* cargo;
Math::Vector pos, speed;
Math::Point dim, c, p;
glm::vec2 dim, c, p;
float angle;
CAuto::EventProcess(event);
@ -335,7 +335,7 @@ bool CAutoConvert::Abort()
bool CAutoConvert::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, ddim;
glm::vec2 pos, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);

4
src/object/auto/autoderrick.cpp
View File

@ -140,7 +140,7 @@ bool CAutoDerrick::EventProcess(const Event &event)
{
CObject* cargo;
Math::Vector pos, speed;
Math::Point dim;
glm::vec2 dim;
float angle, duration, factor;
CAuto::EventProcess(event);
@ -403,7 +403,7 @@ bool CAutoDerrick::EventProcess(const Event &event)
bool CAutoDerrick::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, ddim;
glm::vec2 pos, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);

4
src/object/auto/autodestroyer.cpp
View File

@ -118,7 +118,7 @@ bool CAutoDestroyer::EventProcess(const Event &event)
{
CObject* scrap;
Math::Vector pos, speed;
Math::Point dim;
glm::vec2 dim;
Ui::CWindow* pw;
CAuto::EventProcess(event);
@ -240,7 +240,7 @@ bool CAutoDestroyer::EventProcess(const Event &event)
bool CAutoDestroyer::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, ddim;
glm::vec2 pos, ddim;
float ox, oy, sx, sy;
CObject* scrap;

4
src/object/auto/autofactory.cpp
View File

@ -210,7 +210,7 @@ bool CAutoFactory::EventProcess(const Event &event)
Math::Matrix* mat;
CPhysics* physics;
Math::Vector pos, speed;
Math::Point dim;
glm::vec2 dim;
float zoom, angle, prog;
int i;
@ -714,7 +714,7 @@ CObject* CAutoFactory::SearchVehicle()
bool CAutoFactory::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, dim, ddim;
glm::vec2 pos, dim, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);

4
src/object/auto/autohouston.cpp
View File

@ -232,7 +232,7 @@ bool CAutoHouston::EventProcess(const Event &event)
{
if ( m_lens[i].parti == -1 )
{
Math::Point dim;
glm::vec2 dim;
dim.x = m_lens[i].dim;
dim.y = dim.x;
@ -260,7 +260,7 @@ bool CAutoHouston::Abort()
bool CAutoHouston::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, ddim;
glm::vec2 pos, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);

4
src/object/auto/autokid.cpp
View File

@ -141,7 +141,7 @@ bool CAutoKid::EventProcess(const Event &event)
speed.y = 0.0f;
speed.x = 0.0f;
speed.z = 0.0f;
Math::Point dim;
glm::vec2 dim;
dim.x = 50.0f;
dim.y = dim.x;
m_particle->CreateParticle(pos, speed, dim, Gfx::PARTIFLIC, 3.0f, 0.0f, 0.0f);
@ -174,7 +174,7 @@ bool CAutoKid::EventProcess(const Event &event)
speed.y = 0.0f;
speed.x = 0.0f;
speed.z = 0.0f;
Math::Point dim;
glm::vec2 dim;
dim.x = 20.0f;
dim.y = dim.x;
m_particle->CreateParticle(pos, speed, dim, Gfx::PARTIFLIC, 3.0f, 0.0f, 0.0f);

6
src/object/auto/autolabo.cpp
View File

@ -165,7 +165,7 @@ bool CAutoLabo::EventProcess(const Event &event)
{
CObject* power;
Math::Vector pos, goal, speed;
Math::Point dim, rot;
glm::vec2 dim, rot;
float angle;
int i;
@ -280,7 +280,7 @@ bool CAutoLabo::EventProcess(const Event &event)
{
m_partiRank[i] = m_particle->CreateRay(pos, goal,
Gfx::PARTIRAY2,
Math::Point(2.9f, 2.9f),
{ 2.9f, 2.9f },
LABO_DELAY);
}
@ -471,7 +471,7 @@ Error CAutoLabo::GetError()
bool CAutoLabo::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, dim, ddim;
glm::vec2 pos, dim, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);

2
src/object/auto/automush.cpp
View File

@ -71,7 +71,7 @@ void CAutoMush::Init()
bool CAutoMush::EventProcess(const Event &event)
{
Math::Vector pos, speed, dir;
Math::Point dim;
glm::vec2 dim;
float factor, zoom, size, angle;
int i, channel;

4
src/object/auto/autonuclearplant.cpp
View File

@ -115,7 +115,7 @@ bool CAutoNuclearPlant::EventProcess(const Event &event)
CObject* cargo;
Math::Matrix* mat;
Math::Vector pos, goal, speed;
Math::Point dim, rot;
glm::vec2 dim, rot;
float angle;
int i, max;
@ -298,7 +298,7 @@ bool CAutoNuclearPlant::EventProcess(const Event &event)
bool CAutoNuclearPlant::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, ddim;
glm::vec2 pos, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);

4
src/object/auto/autopowercaptor.cpp
View File

@ -107,7 +107,7 @@ void CAutoPowerCaptor::StartLightning()
bool CAutoPowerCaptor::EventProcess(const Event &event)
{
Math::Vector pos, speed;
Math::Point dim;
glm::vec2 dim;
int i;
CAuto::EventProcess(event);
@ -200,7 +200,7 @@ bool CAutoPowerCaptor::EventProcess(const Event &event)
bool CAutoPowerCaptor::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, ddim;
glm::vec2 pos, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);

4
src/object/auto/autopowerplant.cpp
View File

@ -121,7 +121,7 @@ bool CAutoPowerPlant::EventProcess(const Event &event)
{
CObject* cargo;
Math::Vector pos, ppos, speed;
Math::Point dim, c, p;
glm::vec2 dim, c, p;
Gfx::TerrainRes res;
float big;
bool bGO;
@ -527,7 +527,7 @@ Error CAutoPowerPlant::GetError()
bool CAutoPowerPlant::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, ddim;
glm::vec2 pos, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);

4
src/object/auto/autopowerstation.cpp
View File

@ -204,7 +204,7 @@ bool CAutoPowerStation::EventProcess(const Event &event)
m_lastParticle = m_time;
Math::Vector pos, ppos, speed;
Math::Point dim;
glm::vec2 dim;
Math::Matrix* mat = m_object->GetWorldMatrix(0);
pos = Math::Vector(-15.0f, 7.0f, 0.0f); // battery position
@ -313,7 +313,7 @@ Error CAutoPowerStation::GetError()
bool CAutoPowerStation::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, ddim;
glm::vec2 pos, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);

2
src/object/auto/autoradar.cpp
View File

@ -206,7 +206,7 @@ Error CAutoRadar::GetError()
bool CAutoRadar::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, dim, ddim;
glm::vec2 pos, dim, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);

4
src/object/auto/autorepair.cpp
View File

@ -82,7 +82,7 @@ bool CAutoRepair::EventProcess(const Event &event)
{
CObject* vehicle;
Math::Vector pos, speed;
Math::Point dim;
glm::vec2 dim;
float angle;
CAuto::EventProcess(event);
@ -208,7 +208,7 @@ bool CAutoRepair::EventProcess(const Event &event)
bool CAutoRepair::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, ddim;
glm::vec2 pos, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);

6
src/object/auto/autoresearch.cpp
View File

@ -156,7 +156,7 @@ bool CAutoResearch::EventProcess(const Event &event)
CPowerContainerObject* power;
Math::Vector pos, speed;
Error message;
Math::Point dim;
glm::vec2 dim;
float angle;
CAuto::EventProcess(event);
@ -325,7 +325,7 @@ Error CAutoResearch::GetError()
bool CAutoResearch::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, dim, ddim;
glm::vec2 pos, dim, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);
@ -501,7 +501,7 @@ void CAutoResearch::FireStopUpdate(float progress, bool bLightOn)
{
Math::Matrix* mat;
Math::Vector pos, speed;
Math::Point dim;
glm::vec2 dim;
int i;
static float listpos[12] =

4
src/object/auto/autoroot.cpp
View File

@ -57,7 +57,7 @@ void CAutoRoot::Init()
{
Math::Matrix* mat;
Math::Vector pos, speed;
Math::Point dim;
glm::vec2 dim;
m_time = 0.0f;
m_lastParticle = 0.0f;
@ -81,7 +81,7 @@ void CAutoRoot::Init()
bool CAutoRoot::EventProcess(const Event &event)
{
Math::Vector pos, speed;
Math::Point dim;
glm::vec2 dim;
CAuto::EventProcess(event);

6
src/object/auto/autotower.cpp
View File

@ -247,7 +247,7 @@ bool CAutoTower::EventProcess(const Event &event)
pos = m_object->GetPosition();
pos.y += 24.5f;
m_particle->CreateRay(pos, m_targetPos, Gfx::PARTIRAY1,
Math::Point(5.0f, 5.0f), 1.5f);
{ 5.0f, 5.0f }, 1.5f);
}
if ( m_progress >= 1.0f )
{
@ -341,7 +341,7 @@ void CAutoTower::FireStopUpdate(float progress, bool bLightOn)
{
Math::Matrix* mat;
Math::Vector pos, speed;
Math::Point dim;
glm::vec2 dim;
int i;
static float listpos[8] =
@ -404,7 +404,7 @@ void CAutoTower::FireStopUpdate(float progress, bool bLightOn)
bool CAutoTower::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, ddim;
glm::vec2 pos, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);

6
src/object/auto/autovault.cpp
View File

@ -113,7 +113,7 @@ bool CAutoVault::EventProcess(const Event &event)
{
CObject* pObj;
Math::Vector pos, speed;
Math::Point dim;
glm::vec2 dim;
int i, count;
CAuto::EventProcess(event);
@ -314,7 +314,7 @@ bool CAutoVault::EventProcess(const Event &event)
bool CAutoVault::CreateInterface(bool bSelect)
{
Ui::CWindow* pw;
Math::Point pos, ddim;
glm::vec2 pos, ddim;
float ox, oy, sx, sy;
CAuto::CreateInterface(bSelect);
@ -442,7 +442,7 @@ int CAutoVault::CountKeys()
if ( !Math::TestAngle(angle, limit-8.0f*Math::PI/180.0f, limit+8.0f*Math::PI/180.0f) ) continue;
// Key changes the shape of the base.
Math::Point rot = Math::RotatePoint(Math::Point(cPos.x, cPos.z), limit-cAngle, Math::Point(cPos.x+16.0f, cPos.z));
glm::vec2 rot = Math::RotatePoint({ cPos.x, cPos.z }, limit - cAngle, { cPos.x + 16.0f, cPos.z });
oPos.x = rot.x;
oPos.z = rot.y;
oPos.y = cPos.y+1.0f;