Changeset 6882 for code/branches

Timestamp:

May 10, 2010, 4:14:28 PM (15 years ago)

Author:

edwind

Message:

commit by ed

Location:

code/branches/fps

Files:

• data/levels/fps_test.oxw (modified) (1 diff)
• src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) (1 diff)

code/branches/fps/data/levels/fps_test.oxw

@@ -21 +21 @@
     <Light type=directional position="0,-100000,0" direction="0.02, -1, 0.05" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
 
-  <StaticEntity position="0,-10000,0" direction="0,-1,2" collisionType=static mass=100000 friction=0.01 >
+  <StaticEntity position="0,-10000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 >
       <attached>
         <Model position="0,0,0" mesh="cube.mesh" scale3D="10000,10000,1000" />

code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.cc

@@ -147 +147 @@
                 this->yaw(Radian(this->yaw_ * this->getMouseLookSpeed()),WorldEntity::Parent);
                 //this->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
-                this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
+                Radian pitch=this->cameraPositionRootNode_->getOrientation().getPitch();
+                if( pitch<Radian(1.5707) && pitch>Radian(-1.5707) ) this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
+                else if(pitch<Radian(-1.5707)){
+                        if(this->pitch_>0.0) this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
+                        else if(pitch<Radian(-1.571)) this->cameraPositionRootNode_->pitch(-pitch+Radian(-1.570796));
+                }
+                else if(pitch>Radian(1.5707)){
+                        if(this->pitch_<0.0) this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
+                        else if(pitch>Radian(1.571)) this->cameraPositionRootNode_->pitch(-pitch+Radian(1.570796));
+                }
+                 
+                
  //               this->roll(Radian(this->roll_ * this->getMouseLookSpeed()));
             }