Changeset 8575 for code/branches

Timestamp:

May 25, 2011, 7:02:08 PM (14 years ago)

Author:

dafrick

Message:

Replacing tabs with spaces, renaming member variables to conform with code style convention.

Location:

code/branches/gameimmersion/src/orxonox/worldentities/pawns

Files:

• Pawn.cc (modified) (1 diff)
• SpaceShip.cc (modified) (3 diffs)
• SpaceShip.h (modified) (2 diffs)

code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc

@@ -291 +291 @@
 
 /* HIT-Funktionen
-        Die hit-Funktionen muessen auch in src/orxonox/controllers/Controller.h angepasst werden! (Visuelle Effekte)
+    Die hit-Funktionen muessen auch in src/orxonox/controllers/Controller.h angepasst werden! (Visuelle Effekte)
 
 */

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

@@ -79 +79 @@
         this->registerVariables();
         
-        Camera* c = CameraManager::getInstance().getActiveCamera();
-        this->cameraOriginalPosition = c->getPosition();
-        this->cameraOriginalOrientation = c->getOrientation();
+        Camera* camera = CameraManager::getInstance().getActiveCamera();
+        this->cameraOriginalPosition_ = camera->getPosition();
+        this->cameraOriginalOrientation_ = camera->getOrientation();
 
         this->shakeFrequency_ = 15;
@@ -179 +179 @@
                 }
 
-                shakeCamera(dt);    
+                shakeCamera(dt);
             }
         }
@@ -294 +294 @@
         shakeDt_ = 0;
         //
-        c->setPosition(this->cameraOriginalPosition);
-        c->setOrientation(this->cameraOriginalOrientation);
+        c->setPosition(this->cameraOriginalPosition_);
+        c->setOrientation(this->cameraOriginalOrientation_);
     }
 

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

@@ -96 +96 @@
             btVector3 localAngularAcceleration_;
 
-
-            float shakeFrequency_;
-            float shakeAmplitude_;
+            float shakeFrequency_;
+            float shakeAmplitude_;
 
         private:
@@ -107 +106 @@
             
             void boostCooledDown(void);
-            
-            void resetCamera();
-            void shakeCamera(float dt);
+        
+            void resetCamera();
+            void shakeCamera(float dt);
 
             std::string enginetemplate_;
             Engine* engine_;
             Timer timer_;
-            Vector3 cameraOriginalPosition;
-            Quaternion cameraOriginalOrientation;
-            
-            float shakeDt_;
+            Vector3 cameraOriginalPosition_;
+            Quaternion cameraOriginalOrientation_;
+        
+            float shakeDt_;
     };
 }