Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8575


Ignore:
Timestamp:
May 25, 2011, 7:02:08 PM (13 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:
3 edited

Legend:

Unmodified
Added
Removed

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

    r8553 r8575  
    291291
    292292/* HIT-Funktionen
    293         Die hit-Funktionen muessen auch in src/orxonox/controllers/Controller.h angepasst werden! (Visuelle Effekte)
     293    Die hit-Funktionen muessen auch in src/orxonox/controllers/Controller.h angepasst werden! (Visuelle Effekte)
    294294
    295295*/

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

    r8574 r8575  
    7979        this->registerVariables();
    8080       
    81         Camera* c = CameraManager::getInstance().getActiveCamera();
    82         this->cameraOriginalPosition = c->getPosition();
    83         this->cameraOriginalOrientation = c->getOrientation();
     81        Camera* camera = CameraManager::getInstance().getActiveCamera();
     82        this->cameraOriginalPosition_ = camera->getPosition();
     83        this->cameraOriginalOrientation_ = camera->getOrientation();
    8484
    8585        this->shakeFrequency_ = 15;
    … …  
    179179                }
    180180
    181                 shakeCamera(dt);   
     181                shakeCamera(dt);
    182182            }
    183183        }
    … …  
    294294        shakeDt_ = 0;
    295295        //
    296         c->setPosition(this->cameraOriginalPosition);
    297         c->setOrientation(this->cameraOriginalOrientation);
     296        c->setPosition(this->cameraOriginalPosition_);
     297        c->setOrientation(this->cameraOriginalOrientation_);
    298298    }
    299299

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

    r8490 r8575  
    9696            btVector3 localAngularAcceleration_;
    9797
    98 
    99             float shakeFrequency_;
    100             float shakeAmplitude_;
     98            float shakeFrequency_;
     99            float shakeAmplitude_;
    101100
    102101        private:
    … …  
    107106           
    108107            void boostCooledDown(void);
    109            
    110             void resetCamera();
    111             void shakeCamera(float dt);
     108       
     109            void resetCamera();
     110            void shakeCamera(float dt);
    112111
    113112            std::string enginetemplate_;
    114113            Engine* engine_;
    115114            Timer timer_;
    116             Vector3 cameraOriginalPosition;
    117             Quaternion cameraOriginalOrientation;
    118            
    119             float shakeDt_;
     115            Vector3 cameraOriginalPosition_;
     116            Quaternion cameraOriginalOrientation_;
     117       
     118            float shakeDt_;
    120119    };
    121120}
Note: See TracChangeset for help on using the changeset viewer.