Changeset 8731 in orxonox.OLD for trunk/src/world_entities/creatures

Timestamp:

Jun 22, 2006, 4:28:18 PM (19 years ago)

Author:

bensch

Message:

new player

Location:

trunk/src/world_entities/creatures

Files:

• fps_player.cc (modified) (9 diffs)
• fps_player.h (modified) (1 diff)

trunk/src/world_entities/creatures/fps_player.cc

@@ -18 +18 @@
 
 #include "interactive_model.h"
-#include "md2/md2Model.h"
+#include "state.h"
 
 #include "src/lib/util/loading/factory.h"
@@ -28 +28 @@
 
 
+
 CREATE_FACTORY(FPSPlayer, CL_FPS_PLAYER);
-
-
-using namespace std;
 
 
@@ -72 +70 @@
   this->bBackward = false;
   this->bJump = false;
+
   this->xMouse = 0.0f;
   this->yMouse = 0.0f;
@@ -78 +77 @@
   this->setHealth(80);
 
-  this->mouseDir = this->getAbsDir();
+
+  this->cameraNode.setParent(this);
+
+  this->attitude = this->getAbsDir().getAttitude();
+  this->heading = this->getAbsDir().getHeading();
 
   //add events to the eventlist
@@ -91 +94 @@
   this->getWeaponManager().setSlotCount(0);
 
-  this->getWeaponManager().getFixedTarget()->setParent(this);
-  this->getWeaponManager().getFixedTarget()->setRelCoor(100000,0,0);
 
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
@@ -101 +102 @@
   registerVar( new SynchronizeableBool( &bForward, &bForward, "bForward", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableBool( &bBackward, &bBackward, "bBackward", PERMISSION_OWNER ) );
-  registerVar( new SynchronizeableQuaternion( &mouseDir, &mouseDir, "mouseDir", PERMISSION_OWNER ) );
+//  registerVar( new SynchronizeableQuaternion( &mouseDir, &mouseDir, "mouseDir", PERMISSION_OWNER ) );
 
   // collision reaction registration
@@ -119 +120 @@
 void FPSPlayer::setPlayDirection(const Quaternion& quat, float speed)
 {
-  this->mouseDir = quat;
-  this->angleY = quat.getHeading();
-  this->angleX = quat.getAttitude();
+  this->attitude = this->getAbsDir().getAttitude();
+  this->heading = this->getAbsDir().getHeading();
 }
 
@@ -140 +140 @@
 void FPSPlayer::enter()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false );
-  this->attachCamera();
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( true );
+
+  State::getCameraNode()->setParentSoft(&this->cameraNode);
+  State::getCameraTargetNode()->setParentSoft(&this->cameraNode);
+
+  this->getWeaponManager().getFixedTarget()->setParent(State::getCameraTargetNode());
+  this->getWeaponManager().getFixedTarget()->setRelCoor(0,0,0);
+
+
+  State::getCameraNode()->setRelCoor(0,0,0);
+  State::getCameraTargetNode()->setRelCoor(10,0,0);
 }
 
@@ -165 +174 @@
     yMouse *= time ;
 
-    angleX -= xMouse;
-    angleY -= yMouse;
-
-    if ( angleY > 2.05 )
-      angleY = 2.05;
-
-    if ( angleY < -1.15 )
-      angleY = -1.15;
-
-    this->mouseDir = Quaternion( angleX, Vector( 0, 1, 0 ) ) * Quaternion( angleY, Vector( 0, 0, 1 ) );
+    heading -= xMouse;
+    attitude-= yMouse;
+
+    if ( attitude > 2.05 )
+      attitude = 2.05;
+
+    else if ( attitude < -1.15 )
+      attitude = -1.15;
+
+    this->setAbsDir(Quaternion(heading, Vector(0,1,0)));
+    this->cameraNode.setRelDir(Quaternion( attitude, Vector( 0, 0, 1 ) ));
 
     xMouse = yMouse = 0;
   }
 
-  this->setAbsDir( this->mouseDir );
+ // this->setAbsDir( this->mouseDir );
 
   Vector velocity;

trunk/src/world_entities/creatures/fps_player.h

@@ -45 +45 @@
     float                 xMouse;             //!< mouse moved in x-Direction
     float                 yMouse;             //!< mouse moved in y-Direction
-    Quaternion            mouseDir;           //!< the direction where the player wants to fly
 
-    float                 angleX;
-    float                 angleY;
 
+    float                 heading;
+    float                 attitude;
+
+    PNode                 cameraNode;
 };