Changeset 6872 for code/branches/fps/src/orxonox

Timestamp:

May 10, 2010, 2:20:21 PM (15 years ago)

Author:

edwind

Message:

commit by ed

Location:

code/branches/fps/src/orxonox/worldentities/pawns

Files:

• FpsPlayer.cc (modified) (3 diffs)
• FpsPlayer.h (modified) (1 diff)

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

@@ -79 +79 @@
         this->setConfigValues();
         this->registerVariables();
+        
     }
 
@@ -122 +123 @@
         if (this->hasLocalController())
         {
-           
+            this->setOrientation(savedOrientation_);
+            
             thistickboost=false;
             
@@ -150 +152 @@
 
             this->yaw_ = this->pitch_ = this->roll_ = 0;
+            
+            //Quaternion q=this->getOrientation();
+            //if( q.y<0.99 ) this->setOrientation(q.w, q.x, 1.0, q.z);
+            this->setAngularVelocity(0.0, 0.0, 0.0);
+            savedOrientation_=this->getOrientation();
         }
 

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

@@ -88 +88 @@
             bool isfloor;
             bool thistickboost;
+            Quaternion savedOrientation_;
     };
 }