Droog71
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move rotation/zoom defaults out to config

master
Robert Norris 2011-08-16 08:30:18 +10:00
parent c7c4c82db1
commit 27a570588f
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/GameConfig.cpp
View File

@ -22,6 +22,9 @@ GameConfig::GameConfig(const std::string &filename) : IniConfig(filename)
(*this)["MasterMuted"] = "0";
(*this)["SfxMuted"] = "0";
(*this)["MusicMuted"] = "0";
(*this)["SectorViewXRotation"] = "-10.0";
(*this)["SectorViewZRotation"] = "0";
(*this)["SectorViewZoom"] = "2.0";
KeyBindings::SetDefaults();

19
src/SectorView.cpp
View File

@ -20,10 +20,17 @@ SectorView::SectorView() :
m_infoBoxVisible(true)
{
SetTransparency(true);
m_rotXDefault = Pi::config.Float("SectorViewXRotation");
m_rotZDefault = Pi::config.Float("SectorViewZRotation");
m_zoomDefault = Pi::config.Float("SectorViewZoom");
m_rotXDefault = Clamp(m_rotXDefault, -170.0f, -10.0f);
m_zoomDefault = Clamp(m_zoomDefault, 0.1f, 5.0f);
m_pos = m_posMovingTo = vector3f(0.0f);
m_rotX = m_rotXMovingTo = -10.0f;
m_rotZ = m_rotZMovingTo = 0;
m_zoom = m_zoomMovingTo = 2.0f;
m_rotX = m_rotXMovingTo = m_rotXDefault;
m_rotZ = m_rotZMovingTo = m_rotZDefault;
m_zoom = m_zoomMovingTo = m_zoomDefault;
Gui::Screen::PushFont("OverlayFont");
m_clickableLabels = new Gui::LabelSet();
@ -615,9 +622,9 @@ void SectorView::OnKeyPress(SDL_keysym *keysym)
if (Pi::KeyState(SDLK_r)) {
while (m_rotZ < -180.0f) m_rotZ += 360.0f;
while (m_rotZ > 180.0f) m_rotZ -= 360.0f;
m_rotXMovingTo = -10.0f;
m_rotZMovingTo = 0;
m_zoomMovingTo = 2.0f;
m_rotXMovingTo = m_rotXDefault;
m_rotZMovingTo = m_rotZDefault;
m_zoomMovingTo = m_zoomDefault;
}
}

2
src/SectorView.h
View File

@ -63,6 +63,8 @@ private:
vector3f m_pos;
vector3f m_posMovingTo;
float m_rotXDefault, m_rotZDefault, m_zoomDefault;
float m_rotX, m_rotZ;
float m_rotXMovingTo, m_rotZMovingTo;