Permalink
Browse files

Revert "Rename to 'Stationary View'"

This reverts commit 660afbb.

Also updates Quickstart.txt.
  • Loading branch information...
1 parent 1904e41 commit bc66bc57fd92cc09bad20122f2ac104581c7f286 @WaveMotion WaveMotion committed Jan 27, 2012
Showing with 59 additions and 59 deletions.
  1. +2 −2 Quickstart.txt
  2. +2 −2 data/lang/English.txt
  3. +1 −1 src/Lang.h
  4. +1 −1 src/Ship.cpp
  5. +1 −1 src/ShipCpanel.cpp
  6. +45 −45 src/WorldView.cpp
  7. +7 −7 src/WorldView.h
View
@@ -47,8 +47,8 @@ RightShift: Set speed slower
You can also steer the ship with your mouse while holding the right mouse
button.
-Use the cursor keys to move the camera in external and stationary view. In
-stationary view, use ',' (comma) and '.' (period) to roll the camera in place.
+Use the cursor keys to move the camera in external and sidereal view. In
+sidereal view, use ',' (comma) and '.' (period) to roll the camera in place.
To jump to another system, use the map (F2) and click on another system. Systems
with ports are labelled in blue. You need enough Hydrogen to get there, and it
View
@@ -738,8 +738,8 @@ REAR_VIEW
Rear view
EXTERNAL_VIEW
External view
-STATIONARY_VIEW
- Stationary view
+SIDEREAL_VIEW
+ Sidereal view
NAVIGATION_STAR_MAPS
Navigation and star maps
COMMS
View
@@ -380,7 +380,7 @@ DECLARE_STRING(YOU_DO_NOT_HAVE_ANY_X);
DECLARE_STRING(FRONT_VIEW);
DECLARE_STRING(REAR_VIEW);
DECLARE_STRING(EXTERNAL_VIEW);
-DECLARE_STRING(STATIONARY_VIEW);
+DECLARE_STRING(SIDEREAL_VIEW);
DECLARE_STRING(NAVIGATION_STAR_MAPS);
DECLARE_STRING(COMMS);
DECLARE_STRING(GALAXY_SECTOR_VIEW);
View
@@ -1038,7 +1038,7 @@ void Ship::Render(const vector3d &viewCoords, const matrix4x4d &viewTransform)
if ( (!this->IsType(Object::PLAYER)) ||
(Pi::worldView->GetCamType() == WorldView::CAM_EXTERNAL) ||
- (Pi::worldView->GetCamType() == WorldView::CAM_STATIONARY)) {
+ (Pi::worldView->GetCamType() == WorldView::CAM_SIDEREAL)) {
m_shipFlavour.ApplyTo(&params);
SetLmrTimeParams();
params.angthrust[0] = float(-m_angThrusters.x);
View
@@ -102,7 +102,7 @@ void ShipCpanel::InitObject()
cam_button->AddState(WorldView::CAM_FRONT, PIONEER_DATA_DIR "/icons/cam_front.png", PIONEER_DATA_DIR "/icons/cam_front_on.png", Lang::FRONT_VIEW);
cam_button->AddState(WorldView::CAM_REAR, PIONEER_DATA_DIR "/icons/cam_rear.png", PIONEER_DATA_DIR "/icons/cam_rear_on.png", Lang::REAR_VIEW);
cam_button->AddState(WorldView::CAM_EXTERNAL, PIONEER_DATA_DIR "/icons/cam_external.png", PIONEER_DATA_DIR "/icons/cam_external_on.png", Lang::EXTERNAL_VIEW);
- cam_button->AddState(WorldView::CAM_STATIONARY, PIONEER_DATA_DIR "/icons/cam_external.png", PIONEER_DATA_DIR "/icons/cam_external_on.png", Lang::STATIONARY_VIEW);
+ cam_button->AddState(WorldView::CAM_SIDEREAL, PIONEER_DATA_DIR "/icons/cam_external.png", PIONEER_DATA_DIR "/icons/cam_external_on.png", Lang::SIDEREAL_VIEW);
cam_button->SetShortcut(SDLK_F1, KMOD_NONE);
cam_button->onClick.connect(sigc::mem_fun(this, &ShipCpanel::OnChangeCamView));
Add(cam_button, 2, 56);
View
@@ -29,8 +29,8 @@ WorldView::WorldView(): View()
m_showHyperspaceButton = false;
m_externalViewRotX = m_externalViewRotY = 0;
m_externalViewDist = 200;
- m_stationaryViewOrient = matrix4x4d::Identity();
- m_stationaryViewDist = 200;
+ m_siderealViewOrient = matrix4x4d::Identity();
+ m_siderealViewDist = 200;
m_prevShipOrient = Pi::player->GetTransformRelTo(Pi::game->GetSpace()->GetRootFrame());
m_camType = CAM_FRONT;
@@ -42,8 +42,8 @@ WorldView::WorldView(Serializer::Reader &rd): View()
m_externalViewRotX = rd.Float();
m_externalViewRotY = rd.Float();
m_externalViewDist = rd.Float();
- for (int i = 0; i < 16; i++) m_stationaryViewOrient[i] = rd.Float();
- m_stationaryViewDist = rd.Float();
+ for (int i = 0; i < 16; i++) m_siderealViewOrient[i] = rd.Float();
+ m_siderealViewDist = rd.Float();
m_prevShipOrient = Pi::player->GetTransformRelTo(Pi::game->GetSpace()->GetRootFrame());
m_camType = CamType(rd.Int32());
m_showHyperspaceButton = rd.Bool();
@@ -177,7 +177,7 @@ void WorldView::InitObject()
m_frontCamera = new Camera(Pi::player, Pi::GetScrWidth(), Pi::GetScrHeight());
m_rearCamera = new Camera(Pi::player, Pi::GetScrWidth(), Pi::GetScrHeight());
m_externalCamera = new Camera(Pi::player, Pi::GetScrWidth(), Pi::GetScrHeight());
- m_stationaryCamera = new Camera(Pi::player, Pi::GetScrWidth(), Pi::GetScrHeight());
+ m_siderealCamera = new Camera(Pi::player, Pi::GetScrWidth(), Pi::GetScrHeight());
m_rearCamera->SetOrientation(matrix4x4d::RotateYMatrix(M_PI));
@@ -203,7 +203,7 @@ WorldView::~WorldView()
delete m_frontCamera;
delete m_rearCamera;
delete m_externalCamera;
- delete m_stationaryCamera;
+ delete m_siderealCamera;
m_onHyperspaceTargetChangedCon.disconnect();
m_onPlayerEquipmentChangeCon.disconnect();
@@ -218,8 +218,8 @@ void WorldView::Save(Serializer::Writer &wr)
wr.Float(float(m_externalViewRotX));
wr.Float(float(m_externalViewRotY));
wr.Float(float(m_externalViewDist));
- for (int i = 0; i < 16; i++) wr.Float(float(m_stationaryViewOrient[i]));
- wr.Float(float(m_stationaryViewDist));
+ for (int i = 0; i < 16; i++) wr.Float(float(m_siderealViewOrient[i]));
+ wr.Float(float(m_siderealViewDist));
wr.Int32(int(m_camType));
wr.Bool(bool(m_showHyperspaceButton));
}
@@ -248,27 +248,27 @@ matrix4x4d WorldView::GetExternalViewRotation()
matrix4x4d::RotateXMatrix(-DEG2RAD(m_externalViewRotX));
}
-void WorldView::UpdateStationaryView()
+void WorldView::UpdateSiderealView()
{
matrix4x4d curShipOrient = Pi::player->GetInterpolatedTransformRelTo(Pi::game->GetSpace()->GetRootFrame());
matrix4x4d invAngDisp = curShipOrient.InverseOf() * m_prevShipOrient;
- m_stationaryViewOrient = invAngDisp * m_stationaryViewOrient;
+ m_siderealViewOrient = invAngDisp * m_siderealViewOrient;
- m_stationaryViewOrient.Renormalize();
- m_stationaryViewOrient.ClearToRotOnly();
+ m_siderealViewOrient.Renormalize();
+ m_siderealViewOrient.ClearToRotOnly();
m_prevShipOrient = curShipOrient;
}
-vector3d WorldView::GetStationaryViewTranslation()
+vector3d WorldView::GetSiderealViewTranslation()
{
- return m_stationaryViewOrient * vector3d(0, 0, m_stationaryViewDist);
+ return m_siderealViewOrient * vector3d(0, 0, m_siderealViewDist);
}
-matrix4x4d WorldView::GetStationaryViewRotation()
+matrix4x4d WorldView::GetSiderealViewRotation()
{
- return m_stationaryViewOrient;
+ return m_siderealViewOrient;
}
void WorldView::OnChangeWheelsState(Gui::MultiStateImageButton *b)
@@ -378,7 +378,7 @@ static void position_system_lights(Frame *camFrame, Frame *frame, int &lightNum)
WorldView::CamType WorldView::GetCamType() const
{
- if (m_camType == CAM_EXTERNAL || m_camType == CAM_STATIONARY) {
+ if (m_camType == CAM_EXTERNAL || m_camType == CAM_SIDEREAL) {
// don't allow external view when docked with an orbital starport
if (Pi::player->GetFlightState() == Ship::DOCKED && !Pi::player->GetDockedWith()->IsGroundStation()) {
return CAM_FRONT;
@@ -774,38 +774,38 @@ void WorldView::Update()
if (Pi::player->GetFlightState() == Ship::LANDED || Pi::player->GetFlightState() == Ship::DOCKED)
m_externalViewRotX = Clamp(m_externalViewRotX, -170.0, -10.0);
}
- if (GetCamType() == CAM_STATIONARY) {
+ if (GetCamType() == CAM_SIDEREAL) {
if (Pi::KeyState(SDLK_UP)) {
- vector3d rotAxis = m_stationaryViewOrient * vector3d(1,0,0);
- m_stationaryViewOrient = matrix4x4d::RotateMatrix(-M_PI/4 * frameTime, rotAxis.x, rotAxis.y, rotAxis.z)
- * m_stationaryViewOrient;
+ vector3d rotAxis = m_siderealViewOrient * vector3d(1,0,0);
+ m_siderealViewOrient = matrix4x4d::RotateMatrix(-M_PI/4 * frameTime, rotAxis.x, rotAxis.y, rotAxis.z)
+ * m_siderealViewOrient;
}
if (Pi::KeyState(SDLK_DOWN)) {
- vector3d rotAxis = m_stationaryViewOrient * vector3d(1,0,0);
- m_stationaryViewOrient = matrix4x4d::RotateMatrix(M_PI/4 * frameTime, rotAxis.x, rotAxis.y, rotAxis.z)
- * m_stationaryViewOrient;
+ vector3d rotAxis = m_siderealViewOrient * vector3d(1,0,0);
+ m_siderealViewOrient = matrix4x4d::RotateMatrix(M_PI/4 * frameTime, rotAxis.x, rotAxis.y, rotAxis.z)
+ * m_siderealViewOrient;
}
if (Pi::KeyState(SDLK_LEFT)) {
- vector3d rotAxis = m_stationaryViewOrient * vector3d(0,1,0);
- m_stationaryViewOrient = matrix4x4d::RotateMatrix(-M_PI/4 * frameTime, rotAxis.x, rotAxis.y, rotAxis.z)
- * m_stationaryViewOrient;
+ vector3d rotAxis = m_siderealViewOrient * vector3d(0,1,0);
+ m_siderealViewOrient = matrix4x4d::RotateMatrix(-M_PI/4 * frameTime, rotAxis.x, rotAxis.y, rotAxis.z)
+ * m_siderealViewOrient;
}
if (Pi::KeyState(SDLK_RIGHT)) {
- vector3d rotAxis = m_stationaryViewOrient * vector3d(0,1,0);
- m_stationaryViewOrient = matrix4x4d::RotateMatrix(M_PI/4 * frameTime, rotAxis.x, rotAxis.y, rotAxis.z)
- * m_stationaryViewOrient;
+ vector3d rotAxis = m_siderealViewOrient * vector3d(0,1,0);
+ m_siderealViewOrient = matrix4x4d::RotateMatrix(M_PI/4 * frameTime, rotAxis.x, rotAxis.y, rotAxis.z)
+ * m_siderealViewOrient;
}
if (Pi::KeyState(SDLK_PERIOD)) {
- vector3d rotAxis = m_stationaryViewOrient * vector3d(0,0,1);
- m_stationaryViewOrient = matrix4x4d::RotateMatrix(-M_PI/4 * frameTime, rotAxis.x, rotAxis.y, rotAxis.z)
- * m_stationaryViewOrient;
+ vector3d rotAxis = m_siderealViewOrient * vector3d(0,0,1);
+ m_siderealViewOrient = matrix4x4d::RotateMatrix(-M_PI/4 * frameTime, rotAxis.x, rotAxis.y, rotAxis.z)
+ * m_siderealViewOrient;
}
if (Pi::KeyState(SDLK_COMMA)) {
- vector3d rotAxis = m_stationaryViewOrient * vector3d(0,0,1);
- m_stationaryViewOrient = matrix4x4d::RotateMatrix(M_PI/4 * frameTime, rotAxis.x, rotAxis.y, rotAxis.z)
- * m_stationaryViewOrient;
+ vector3d rotAxis = m_siderealViewOrient * vector3d(0,0,1);
+ m_siderealViewOrient = matrix4x4d::RotateMatrix(M_PI/4 * frameTime, rotAxis.x, rotAxis.y, rotAxis.z)
+ * m_siderealViewOrient;
}
- m_stationaryViewDist = std::max(Pi::player->GetBoundingRadius(), m_stationaryViewDist);
+ m_siderealViewDist = std::max(Pi::player->GetBoundingRadius(), m_siderealViewDist);
}
if (KeyBindings::targetObject.IsActive()) {
/* Hitting tab causes objects in the crosshairs to be selected */
@@ -820,17 +820,17 @@ void WorldView::Update()
m_externalCamera->SetOrientation(GetExternalViewRotation());
}
- if (GetCamType() == CAM_STATIONARY) {
- UpdateStationaryView();
- m_stationaryCamera->SetPosition(GetStationaryViewTranslation());
- m_stationaryCamera->SetOrientation(GetStationaryViewRotation());
+ if (GetCamType() == CAM_SIDEREAL) {
+ UpdateSiderealView();
+ m_siderealCamera->SetPosition(GetSiderealViewTranslation());
+ m_siderealCamera->SetOrientation(GetSiderealViewRotation());
}
m_activeCamera =
GetCamType() == CAM_FRONT ? m_frontCamera :
GetCamType() == CAM_REAR ? m_rearCamera :
GetCamType() == CAM_EXTERNAL ? m_externalCamera :
- m_stationaryCamera;
+ m_siderealCamera;
m_activeCamera->Update();
UpdateProjectedObjects();
@@ -1686,11 +1686,11 @@ void WorldView::MouseButtonDown(int button, int x, int y)
if (Pi::MouseButtonState(SDL_BUTTON_WHEELUP))
m_externalViewDist -= 400*ft;
}
- if (GetCamType() == CAM_STATIONARY) {
+ if (GetCamType() == CAM_SIDEREAL) {
if (Pi::MouseButtonState(SDL_BUTTON_WHEELDOWN))
- m_stationaryViewDist += 400*ft;
+ m_siderealViewDist += 400*ft;
if (Pi::MouseButtonState(SDL_BUTTON_WHEELUP))
- m_stationaryViewDist -= 400*ft;
+ m_siderealViewDist -= 400*ft;
}
}
}
View
@@ -30,10 +30,10 @@ class WorldView: public View {
void DrawBgStars();
vector3d GetExternalViewTranslation();
matrix4x4d GetExternalViewRotation();
- vector3d GetStationaryViewTranslation();
- matrix4x4d GetStationaryViewRotation();
+ vector3d GetSiderealViewTranslation();
+ matrix4x4d GetSiderealViewRotation();
virtual void Save(Serializer::Writer &wr);
- enum CamType { CAM_FRONT, CAM_REAR, CAM_EXTERNAL, CAM_STATIONARY };
+ enum CamType { CAM_FRONT, CAM_REAR, CAM_EXTERNAL, CAM_SIDEREAL };
void SetCamType(enum CamType);
enum CamType GetCamType() const;
int GetNumLights() const { return m_numLights; }
@@ -46,8 +46,8 @@ class WorldView: public View {
double m_externalViewRotX, m_externalViewRotY;
double m_externalViewDist;
- matrix4x4d m_stationaryViewOrient;
- double m_stationaryViewDist;
+ matrix4x4d m_siderealViewOrient;
+ double m_siderealViewDist;
private:
void InitObject();
@@ -75,7 +75,7 @@ class WorldView: public View {
}
};
- void UpdateStationaryView();
+ void UpdateSiderealView();
void UpdateProjectedObjects();
void UpdateIndicator(Indicator &indicator, const vector3d &direction);
@@ -143,7 +143,7 @@ class WorldView: public View {
Gui::LabelSet *m_bodyLabels;
std::map<Body*,vector3d> m_projectedPos;
- Camera *m_frontCamera, *m_rearCamera, *m_externalCamera, *m_stationaryCamera;
+ Camera *m_frontCamera, *m_rearCamera, *m_externalCamera, *m_siderealCamera;
Camera *m_activeCamera;
Indicator m_velIndicator;

0 comments on commit bc66bc5

Please sign in to comment.