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

Fixes in [object/auto]

dev-ui
Michał Konopacki 2012-09-13 18:28:50 +02:00
parent 8f285465e8
commit 9bfdcacc52
5 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/CMakeLists.txt
View File

@ -87,32 +87,32 @@ graphics/engine/terrain.cpp
graphics/engine/text.cpp graphics/engine/text.cpp
graphics/engine/water.cpp graphics/engine/water.cpp
graphics/opengl/gldevice.cpp graphics/opengl/gldevice.cpp
# object/auto/auto.cpp object/auto/auto.cpp
# object/auto/autobase.cpp object/auto/autobase.cpp
# object/auto/autoconvert.cpp object/auto/autoconvert.cpp
# object/auto/autoderrick.cpp object/auto/autoderrick.cpp
# object/auto/autodestroyer.cpp object/auto/autodestroyer.cpp
# object/auto/autoegg.cpp object/auto/autoegg.cpp
# object/auto/autoenergy.cpp object/auto/autoenergy.cpp
# object/auto/autofactory.cpp object/auto/autofactory.cpp
# object/auto/autoflag.cpp object/auto/autoflag.cpp
# object/auto/autohuston.cpp object/auto/autohuston.cpp
# object/auto/autoinfo.cpp object/auto/autoinfo.cpp
# object/auto/autojostle.cpp object/auto/autojostle.cpp
# object/auto/autokid.cpp object/auto/autokid.cpp
# object/auto/autolabo.cpp object/auto/autolabo.cpp
# object/auto/automush.cpp object/auto/automush.cpp
# object/auto/autonest.cpp object/auto/autonest.cpp
# object/auto/autonuclear.cpp object/auto/autonuclear.cpp
# object/auto/autopara.cpp object/auto/autopara.cpp
# object/auto/autoportico.cpp object/auto/autoportico.cpp
# object/auto/autoradar.cpp object/auto/autoradar.cpp
# object/auto/autorepair.cpp object/auto/autorepair.cpp
# object/auto/autoresearch.cpp object/auto/autoresearch.cpp
# object/auto/autoroot.cpp object/auto/autoroot.cpp
# object/auto/autosafe.cpp object/auto/autosafe.cpp
# object/auto/autostation.cpp object/auto/autostation.cpp
# object/auto/autotower.cpp object/auto/autotower.cpp
# object/brain.cpp # object/brain.cpp
# object/mainmovie.cpp # object/mainmovie.cpp
object/motion/motion.cpp object/motion/motion.cpp

4
src/object/auto/auto.h
View File

@ -95,8 +95,8 @@ protected:
Gfx::CLightManager* m_lightMan; Gfx::CLightManager* m_lightMan;
Gfx::CTerrain* m_terrain; Gfx::CTerrain* m_terrain;
Gfx::CWater* m_water; Gfx::CWater* m_water;
Gfx::CCloud * m_cloud; Gfx::CCloud* m_cloud;
Gfx::CPlanet * m_planet; Gfx::CPlanet* m_planet;
Gfx::CLightning* m_lightning; Gfx::CLightning* m_lightning;
Gfx::CCamera* m_camera; Gfx::CCamera* m_camera;
Ui::CInterface* m_interface; Ui::CInterface* m_interface;

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

@ -197,7 +197,7 @@ begin:
pos = m_pos; pos = m_pos;
pos.x -= 150.0f; pos.x -= 150.0f;
m_terrain->MoveOnFloor(pos); m_terrain->AdjustToFloor(pos);
pos.y += 10.0f; pos.y += 10.0f;
m_camera->SetScriptEye(pos); m_camera->SetScriptEye(pos);
m_posSound = pos; m_posSound = pos;
@ -335,7 +335,7 @@ begin:
pos = m_pos; pos = m_pos;
pos.x -= 110.0f; pos.x -= 110.0f;
m_terrain->MoveOnFloor(pos); m_terrain->AdjustToFloor(pos);
pos.y += 10.0f; pos.y += 10.0f;
m_camera->SetScriptEye(pos); m_camera->SetScriptEye(pos);
m_posSound = pos; m_posSound = pos;
@ -382,7 +382,7 @@ begin:
pos = m_pos; pos = m_pos;
pos.x -= 150.0f; pos.x -= 150.0f;
m_terrain->MoveOnFloor(pos); m_terrain->AdjustToFloor(pos);
pos.y += 10.0f; pos.y += 10.0f;
m_camera->SetScriptEye(pos); m_camera->SetScriptEye(pos);
@ -416,7 +416,7 @@ begin:
// Particles are ejected from the jet engine. // Particles are ejected from the jet engine.
pos = m_object->GetPosition(0); pos = m_object->GetPosition(0);
pos.y += 6.0f; pos.y += 6.0f;
h = m_terrain->GetFloorHeight(pos)/300.0f; h = m_terrain->GetHeightToFloor(pos)/300.0f;
speed.x = (Math::Rand()-0.5f)*(80.0f-50.0f*h); speed.x = (Math::Rand()-0.5f)*(80.0f-50.0f*h);
speed.z = (Math::Rand()-0.5f)*(80.0f-50.0f*h); speed.z = (Math::Rand()-0.5f)*(80.0f-50.0f*h);
speed.y = -(Math::Rand()*(h+1.0f)*40.0f+(h+1.0f)*40.0f); speed.y = -(Math::Rand()*(h+1.0f)*40.0f+(h+1.0f)*40.0f);
@ -526,7 +526,7 @@ begin:
pos = m_pos; pos = m_pos;
pos.x += p.x; pos.x += p.x;
pos.z += p.y; pos.z += p.y;
m_terrain->MoveOnFloor(pos); m_terrain->AdjustToFloor(pos);
pos.y += 10.0f; pos.y += 10.0f;
pos.y += m_progress*40.0f; pos.y += m_progress*40.0f;
m_camera->SetScriptEye(pos); m_camera->SetScriptEye(pos);
@ -588,7 +588,7 @@ begin:
pos = m_pos; pos = m_pos;
pos.x += p.x; pos.x += p.x;
pos.z += p.y; pos.z += p.y;
m_terrain->MoveOnFloor(pos); m_terrain->AdjustToFloor(pos);
pos.y += 10.0f; pos.y += 10.0f;
pos.y += m_progress*40.0f; pos.y += m_progress*40.0f;
m_camera->SetScriptEye(pos); m_camera->SetScriptEye(pos);
@ -785,7 +785,7 @@ begin:
pos = m_pos; pos = m_pos;
pos.x -= 110.0f+m_progress*250.0f; pos.x -= 110.0f+m_progress*250.0f;
m_terrain->MoveOnFloor(pos); m_terrain->AdjustToFloor(pos);
pos.y += 10.0f; pos.y += 10.0f;
m_camera->SetScriptEye(pos); m_camera->SetScriptEye(pos);
@ -1413,10 +1413,13 @@ void CAutoBase::BeginTransit()
m_engine->GetBackground(m_bgName, m_bgUp, m_bgDown, m_bgCloudUp, m_bgCloudDown, bFull, bQuarter); m_engine->GetBackground(m_bgName, m_bgUp, m_bgDown, m_bgCloudUp, m_bgCloudDown, bFull, bQuarter);
m_engine->DeleteTexture(m_bgName); m_engine->DeleteTexture(m_bgName);
m_engine->SetBackground(m_bgBack, 0x00000000, 0x00000000, 0x00000000, 0x00000000); m_engine->SetBackground(m_bgBack, Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f),
Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f),
Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f),
Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f));
m_engine->LoadTexture(m_bgBack); m_engine->LoadTexture(m_bgBack);
m_cloud->SetEnable(false); // cache clouds m_cloud->SetEnabled(false); // cache clouds
m_planet->SetMode(1); m_planet->SetMode(1);
} }
@ -1433,7 +1436,7 @@ void CAutoBase::EndTransit()
m_engine->SetBackground(m_bgName, m_bgUp, m_bgDown, m_bgCloudUp, m_bgCloudDown); m_engine->SetBackground(m_bgName, m_bgUp, m_bgDown, m_bgCloudUp, m_bgCloudDown);
m_engine->LoadTexture(m_bgName); m_engine->LoadTexture(m_bgName);
m_cloud->SetEnable(true); // gives the clouds m_cloud->SetEnabled(true); // gives the clouds
m_planet->SetMode(0); m_planet->SetMode(0);
m_main->StartMusic(); m_main->StartMusic();

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

@ -126,7 +126,7 @@ void CAutoDerrick::Init()
pos = Math::Vector(7.0f, 0.0f, 0.0f); pos = Math::Vector(7.0f, 0.0f, 0.0f);
mat = m_object->GetWorldMatrix(0); mat = m_object->GetWorldMatrix(0);
pos = Math::Transform(*mat, pos); pos = Math::Transform(*mat, pos);
m_terrain->MoveOnFloor(pos); m_terrain->AdjustToFloor(pos);
m_fretPos = pos; m_fretPos = pos;
} }

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

@ -76,7 +76,7 @@ void CAutoNest::Init()
m_lastParticle = 0.0f; m_lastParticle = 0.0f;
pos = m_object->GetPosition(0); pos = m_object->GetPosition(0);
m_terrain->MoveOnFloor(pos); m_terrain->AdjustToFloor(pos);
m_fretPos = pos; m_fretPos = pos;
} }