Changeset 6872

Timestamp:

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

Author:

edwind

Message:

commit by ed

Location:

code/branches/fps

Files:

• data/levels/fps_test.oxw (modified) (1 diff)
• data/levels/old/physicstest2.oxw (modified) (1 diff)
• data/levels/templates/fps.oxt (modified) (2 diffs)
• src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) (3 diffs)
• src/orxonox/worldentities/pawns/FpsPlayer.h (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,0" collisionType=static mass=100000 >
+  <StaticEntity position="0,-10000,0" direction="0,-1,2" collisionType=static mass=100000 friction=0.01 >
       <attached>
         <Model position="0,0,0" mesh="cube.mesh" scale3D="10000,10000,1000" />

code/branches/fps/data/levels/old/physicstest2.oxw

@@ -13 +13 @@
    ambientlight = "0.5, 0.5, 0.5"
    skybox       = "Orxonox/Starbox"
+   gravity      = "0,-50,0"
    negativeWorldRange = "(-100000, -100000, -100000)"
    positiveWorldRange = "( 100000,  100000,  100000)"

code/branches/fps/data/levels/templates/fps.oxt

@@ -12 +12 @@
    initialhealth     = 100
 
-   primaryThrust     = 100;
-   auxilaryThrust    = 30;
-   rotationThrust    = 25;
+   primaryThrust     = 0;
+   auxilaryThrust    = 0;
+   rotationThrust    = 0;
 
    collisionType     = "dynamic"
@@ -20 +20 @@
    linearDamping     = 0.7
    angularDamping    = 0.9999999
+   friction          = 0.01
   >
  <!--   <attached>

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_;
     };
 }