Changeset 10340 in orxonox.OLD for trunk

Timestamp:

Jan 24, 2007, 5:32:31 PM (18 years ago)

Author:

patrick

Message:

got gravity and no banking anymore

Location:

trunk/src

Files:

• story_entities/game_world.cc (modified) (2 diffs)
• world_entities/creatures/fps_player.cc (modified) (4 diffs)
• world_entities/creatures/fps_player_minimal.cc (added)
• world_entities/creatures/fps_player_minimal.h (added)

trunk/src/story_entities/game_world.cc

@@ -312 +312 @@
   PNode::getNullParent()->updateNode(0.01);
 
+  bool bNoDraw = true;
 
   while( this->bRunning) /* @todo implement pause */
@@ -342 +343 @@
     this->update ();
     /* draw everything */
-    this->display ();
-
+    if( bNoDraw)
+      this->display ();
+
+    bNoDraw= !bNoDraw;
   }
 

trunk/src/world_entities/creatures/fps_player.cc

@@ -129 +129 @@
     wpRight->setName("testGun Right");
     this->addWeapon(wpRight,1, 0);
-
-    this->aimingSystem = new AimingSystem(this);
     wpRight->addChild(this->aimingSystem);
 
     this->toList( OM_PLAYERS );
   }
+
+  this->aimingSystem = new AimingSystem(this);
 
 
@@ -242 +242 @@
 
 
-//     if( this->aimingSystem != NULL)
-//     {
-//       this->aimingSystem->toList(OM_GROUP_01);
-//       this->aimingSystem->setParent(&this->cameraNode);
-//   //     this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
-//       this->aimingSystem->setRelDir(Quaternion(M_PI_4*-0.58f, Vector(0,0,1)));
-//       this->aimingSystem->setRelCoor(0, -1, -1);
-//     }
+    if( this->aimingSystem != NULL)
+    {
+      this->aimingSystem->toList(OM_GROUP_01);
+      this->aimingSystem->setParent(&this->cameraNode);
+  //     this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
+      this->aimingSystem->setRelDir(Quaternion(M_PI_4*-0.58f, Vector(0,0,1)));
+      this->aimingSystem->setRelCoor(0, -1, -1);
+    }
 
 
@@ -302 +302 @@
     yMouse *= time ;
 
-    heading -= xMouse;
-    attitude-= yMouse;
+    heading -= xMouse/5.;
+    attitude-= yMouse/5.;
 
 
@@ -373 +373 @@
 
   // physical falling of the player
-  if( /*FIXME for testing*/ false && !this->isOnGround())
+  if( !this->isOnGround())
   {
     this->fallVelocity += 300.0f * time;