Changeset 8147 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jun 5, 2006, 12:09:15 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8070:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
no conflicts

Location:

trunk/src/world_entities

Files:

• playable.cc (modified) (2 diffs)
• player.cc (modified) (1 diff)
• spectator.cc (modified) (2 diffs)
• spectator.h (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (1 diff)

trunk/src/world_entities/playable.cc

@@ -79 +79 @@
   // this->setPlayer(NULL);
   // IN ITS DESTRUCTOR.
+  
   assert(this->currentPlayer == NULL);
 }
@@ -281 +282 @@
  */
 void  Playable::detachCamera()
-{}
+{
+}
 
 

trunk/src/world_entities/player.cc

@@ -81 +81 @@
       return true;
   }
+  
+  if ( playable == NULL )
+    this->playable = NULL;
 
   return true;

trunk/src/world_entities/spectator.cc

@@ -71 +71 @@
 {
   this->mouseDir =  rot;
-  this->rotY = Quaternion( rot.getHeading(), Vector( 0, 1, 0) );
-  this->rotAxis = Quaternion( rot.getAttitude(), Vector( 0, 0, 1 ) );
+  this->angleY = rot.getHeading();
+  this->angleX = rot.getAttitude();
 }
 
@@ -104 +104 @@
     yMouse *= time / 10;
     
-    this->rotY *= Quaternion(-M_PI/4.0*this->xMouse, Vector(0,1,0));
-    this->rotAxis *= Quaternion(-M_PI/4.0*this->yMouse, Vector(0,0,1) );
-
-    this->mouseDir = rotY * rotAxis;
-    //this->mouseDir *= Quaternion(-M_PI/4.0*this->yMouse, Vector(0,0,1));
+    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 ) );
+    
     xMouse = yMouse = 0;
   }
   
   this->setAbsDir( this->mouseDir );
+  
+  Vector velocity;
+  
+  if ( this->bForward )
+  {
+    velocity += this->getAbsDirX();
+  }
+  
+  if ( this->bBackward )
+  {
+    velocity -= this->getAbsDirX();
+  }
+  
+  if ( this->bRight )
+  {
+    velocity += this->getAbsDirZ();
+  }
+  
+  if ( this->bLeft )
+  {
+    velocity -= this->getAbsDirZ();
+  }
+  
+  velocity *= 100;
+  
+  this->shiftCoor( velocity*time );
 }
 

trunk/src/world_entities/spectator.h

@@ -35 +35 @@
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
 
-    Quaternion            rotY;
-    Quaternion            rotAxis;
+    //Quaternion            rotY;
+    //Quaternion            rotAxis;
+    float                 angleX;
+    float                 angleY;
 };
 

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -55 +55 @@
 {
   // crosshair being a PNode it must not be deleted (this is because PNodes delete themselves.)
-  //delete this->crosshair;
+  // rennerc: crosshair seems not to delete itselve
+  delete this->crosshair;
 }