[Orxonox-commit 3901] r8575 - code/branches/gameimmersion/src/orxonox/worldentities/pawns

[dafrick at orxonox.net]

Author: dafrick
Date: 2011-05-25 19:02:08 +0200 (Wed, 25 May 2011)
New Revision: 8575

Modified:
   code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc
   code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc
   code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.h
Log:
Replacing tabs with spaces, renaming member variables to conform with code style convention.


Modified: code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc	2011-05-25 16:23:51 UTC (rev 8574)
+++ code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc	2011-05-25 17:02:08 UTC (rev 8575)
@@ -290,7 +290,7 @@
 
 
 /* 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)
 
 */
 

Modified: code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc
===================================================================
--- code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc	2011-05-25 16:23:51 UTC (rev 8574)
+++ code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc	2011-05-25 17:02:08 UTC (rev 8575)
@@ -78,9 +78,9 @@
         this->setConfigValues();
         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;
         this->shakeAmplitude_ = 5;
@@ -178,7 +178,7 @@
 
                 }
 
-                shakeCamera(dt);    
+                shakeCamera(dt);
             }
         }
     }
@@ -293,8 +293,8 @@
     
         shakeDt_ = 0;
         //
-        c->setPosition(this->cameraOriginalPosition);
-        c->setOrientation(this->cameraOriginalOrientation);
+        c->setPosition(this->cameraOriginalPosition_);
+        c->setOrientation(this->cameraOriginalOrientation_);
     }
 
     void SpaceShip::loadEngineTemplate()

Modified: code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.h
===================================================================
--- code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.h	2011-05-25 16:23:51 UTC (rev 8574)
+++ code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.h	2011-05-25 17:02:08 UTC (rev 8575)
@@ -95,10 +95,9 @@
             btVector3 localLinearAcceleration_;
             btVector3 localAngularAcceleration_;
 
+            float shakeFrequency_;
+            float shakeAmplitude_;
 
-	    float shakeFrequency_;
-	    float shakeAmplitude_;
-
         private:
             void registerVariables();
             virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const;
@@ -106,17 +105,17 @@
             void loadEngineTemplate();
             
             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_;
     };
 }