Changeset 8575 for code/branches/gameimmersion
- Timestamp:
- May 25, 2011, 7:02:08 PM (14 years ago)
- 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 291 291 292 292 /* HIT-Funktionen 293 293 Die hit-Funktionen muessen auch in src/orxonox/controllers/Controller.h angepasst werden! (Visuelle Effekte) 294 294 295 295 */ -
code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.cc
r8574 r8575 79 79 this->registerVariables(); 80 80 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(); 84 84 85 85 this->shakeFrequency_ = 15; … … 179 179 } 180 180 181 shakeCamera(dt); 181 shakeCamera(dt); 182 182 } 183 183 } … … 294 294 shakeDt_ = 0; 295 295 // 296 c->setPosition(this->cameraOriginalPosition );297 c->setOrientation(this->cameraOriginalOrientation );296 c->setPosition(this->cameraOriginalPosition_); 297 c->setOrientation(this->cameraOriginalOrientation_); 298 298 } 299 299 -
code/branches/gameimmersion/src/orxonox/worldentities/pawns/SpaceShip.h
r8490 r8575 96 96 btVector3 localAngularAcceleration_; 97 97 98 99 float shakeFrequency_; 100 float shakeAmplitude_; 98 float shakeFrequency_; 99 float shakeAmplitude_; 101 100 102 101 private: … … 107 106 108 107 void boostCooledDown(void); 109 110 111 108 109 void resetCamera(); 110 void shakeCamera(float dt); 112 111 113 112 std::string enginetemplate_; 114 113 Engine* engine_; 115 114 Timer timer_; 116 Vector3 cameraOriginalPosition;117 Quaternion cameraOriginalOrientation;118 119 115 Vector3 cameraOriginalPosition_; 116 Quaternion cameraOriginalOrientation_; 117 118 float shakeDt_; 120 119 }; 121 120 }
Note: See TracChangeset
for help on using the changeset viewer.