summaryrefslogtreecommitdiffhomepage
path: root/Stars45/CameraDirector.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Stars45/CameraDirector.cpp')
-rw-r--r--Stars45/CameraDirector.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/Stars45/CameraDirector.cpp b/Stars45/CameraDirector.cpp
index 5358e97..e1eea21 100644
--- a/Stars45/CameraDirector.cpp
+++ b/Stars45/CameraDirector.cpp
@@ -337,7 +337,7 @@ CameraDirector::CycleViewObject()
if (c_ship && !current) {
external_ship = c_ship;
}
-
+
else if (current && c_ship == current) {
while (++iter && !external_ship) {
c = iter.value();
@@ -407,7 +407,7 @@ CameraDirector::SetViewObject(Ship* obj, bool quick)
if (obj->GetIFF() != ship->GetIFF() && !stars->InCutscene()) {
// only view solid contacts:
Contact* c = ship->FindContact(obj);
- if (!c || !c->ActLock())
+ if (!c || !c->ActLock())
return;
}
@@ -439,7 +439,7 @@ CameraDirector::SetViewObject(Ship* obj, bool quick)
if (!quick)
SetMode(MODE_ZOOM);
}
-
+
else if (external_ship) {
external_ship = 0;
}
@@ -816,7 +816,7 @@ CameraDirector::ExecFrame(double seconds)
case MODE_DROP: Drop(seconds); break;
}
- if (ship->Shake() > 0 &&
+ if (ship->Shake() > 0 &&
(op_mode < MODE_ORBIT ||
(op_mode == MODE_VIRTUAL && ship->Cockpit()))) {
@@ -877,7 +877,7 @@ CameraDirector::Cockpit(double seconds)
camera.Clone(ship->Cam());
Point bridge = ship->BridgeLocation();
- Point cpos = camera.Pos() +
+ Point cpos = camera.Pos() +
camera.vrt() * bridge.x +
camera.vpn() * bridge.y +
camera.vup() * bridge.z;
@@ -893,7 +893,7 @@ CameraDirector::Virtual(double seconds)
camera.Clone(ship->Cam());
Point bridge = ship->BridgeLocation();
- Point cpos = camera.Pos() +
+ Point cpos = camera.Pos() +
camera.vrt() * (bridge.x + virt_x) +
camera.vpn() * (bridge.y + virt_z) +
camera.vup() * (bridge.z + virt_y);
@@ -951,11 +951,11 @@ CameraDirector::Chase(double seconds)
Point chase = ship->ChaseLocation();
Point bridge = ship->BridgeLocation();
- Point cpos = camera.Pos() +
+ Point cpos = camera.Pos() +
camera.vrt() * bridge.x * (1-step) +
camera.vpn() * bridge.y * (1-step) +
camera.vup() * bridge.z * (1-step) +
- velocity * chase.y * step +
+ velocity * chase.y * step +
camera.vup() * chase.z * step;
camera.MoveTo(cpos);
@@ -1000,7 +1000,7 @@ CameraDirector::Target(double seconds)
Point delta = target_loc - ship->Location();
delta.Normalize();
delta *= -5 * ship->Radius() * step;
- delta.y += ship->Radius() * step;
+ delta.y += ship->Radius() * step;
camera.MoveTo(ship->Location() + delta);
camera.LookAt(target_loc);