Changeset 8582 for code/branches/presentation/src/orxonox

Timestamp:

May 25, 2011, 10:10:09 PM (14 years ago)

Author:

dafrick

Message:

Fixing segfault, that occured when a SpaceShip was created without a camera.

Location:

code/branches/presentation/src/orxonox/worldentities/pawns

Files:

• SpaceShip.cc (modified) (5 diffs)
• SpaceShip.h (modified) (1 diff)

code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -79 +79 @@
         this->registerVariables();
         
-        Camera* camera = CameraManager::getInstance().getActiveCamera();
-        this->cameraOriginalPosition_ = camera->getPosition();
-        this->cameraOriginalOrientation_ = camera->getOrientation();
+        this->cameraOriginalPosition_ = Vector3::UNIT_SCALE;
+        this->cameraOriginalOrientation_ = Quaternion::IDENTITY;
+        
 
         this->shakeFrequency_ = 15;
@@ -182 +182 @@
                 }
 
-                shakeCamera(dt);
+                this->shakeCamera(dt);
             }
         }
@@ -242 +242 @@
             //COUT(0) << "Boost startet!\n";
             this->bBoost_ = true;
+            Camera* camera = CameraManager::getInstance().getActiveCamera();
+            this->cameraOriginalPosition_ = camera->getPosition();
+            this->cameraOriginalOrientation_ = camera->getOrientation();
         }
         if(!bBoost)
@@ -273 +276 @@
     
             //COUT(0) << "Angle: " << angle << std::endl;
-            Camera* c = this->getCamera();
+            Camera* camera = this->getCamera();
 
             //Shaking Camera effect
-            if (c != 0)
-            {
-                c->setOrientation(Vector3::UNIT_X, angle);
-            }
-        }
-    }
-    
+            if (camera != 0)
+            {
+                camera->setOrientation(Vector3::UNIT_X, angle);
+            }
+        }
+    }
+
     void SpaceShip::resetCamera()
     {
-    
-        //COUT(0) << "Resetting camera\n";
-        Camera *c = this->getCamera();
-    
-        if (c == 0)
+        Camera *camera = this->getCamera();
+
+        if (camera == 0)
         {
             COUT(2) << "Failed to reset camera!";
@@ -295 +296 @@
         }
     
-        shakeDt_ = 0;
-        //
-        c->setPosition(this->cameraOriginalPosition_);
-        c->setOrientation(this->cameraOriginalOrientation_);
+        this->shakeDt_ = 0;
+        camera->setPosition(this->cameraOriginalPosition_);
+        camera->setOrientation(this->cameraOriginalOrientation_);
+    }
+
+    void SpaceShip::backupCamera()
+    {
+        Camera* camera = CameraManager::getInstance().getActiveCamera();
+        if(camera != NULL)
+        {
+            this->cameraOriginalPosition_ = camera->getPosition();
+            this->cameraOriginalOrientation_ = camera->getOrientation();
+        }
     }
 

code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -108 +108 @@
         
             void resetCamera();
+            void backupCamera();
             void shakeCamera(float dt);