Changeset 7184 for code/trunk/src/orxonox/worldentities

Timestamp:

Aug 18, 2010, 9:46:16 PM (14 years ago)

Author:

rgrieder

Message:

Replaced mathematical constants with a common definition in Math.h.
Use math::pi, math::pi_d (double), math::e, etc. from now on.

File:

• code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) (1 diff)

code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc

@@ -171 +171 @@
 
                 Radian pitch = this->cameraPositionRootNode_->getOrientation().getPitch();
-                if (pitch < Radian(1.5707f) && pitch > Radian(-1.5707f))
+                if (pitch < Radian(math::pi_2) && pitch > Radian(-math::pi_2))
                 {
                     this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
                 }
-                else if (pitch < Radian(-1.5707f))
+                else if (pitch < Radian(-math::pi_2))
                 {
                     if (this->pitch_ > 0.0f)
                         this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
-                    else if (pitch < Radian(-1.571f))
-                        this->cameraPositionRootNode_->pitch(-pitch + Radian(-1.570796f));
+                    else if (pitch < Radian(-math::pi_2))
+                        this->cameraPositionRootNode_->pitch(-pitch + Radian(-math::pi_2));
                 }
-                else if (pitch > Radian(1.5707f))
+                else if (pitch > Radian(math::pi_2))
                 {
                     if (this->pitch_ < 0.0f)
                         this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
-                    else if (pitch > Radian(1.571f))
-                        this->cameraPositionRootNode_->pitch(-pitch + Radian(1.570796f));
+                    else if (pitch > Radian(math::pi_2))
+                        this->cameraPositionRootNode_->pitch(-pitch + Radian(math::pi_2));
                 }
                 this->weaponNode_->setOrientation(this->cameraPositionRootNode_->getOrientation());