Changeset 6203 in orxonox.OLD

Timestamp:

Dec 21, 2005, 12:25:23 AM (18 years ago)

Author:

patrick

Message:

christmas: free movement, but not yet good

Location:

branches/christmas_branche/src

Files:

• lib/graphics/importer/md2Model.cc (modified) (2 diffs)
• world_entities/creatures/md2_creature.cc (modified) (3 diffs)

branches/christmas_branche/src/lib/graphics/importer/md2Model.cc

@@ -21 +21 @@
 #include "resource_manager.h"
 
-//#include <fstream>
-
 
 using namespace std;
@@ -50 +48 @@
 sAnim MD2Model::animationList[21] =
   {
- // begin, end, fps, stoppable
+ // begin, end, fps, interruptable
     {   0,  39,  9, 1 },   //!< STAND
     {  40,  45, 10, 1 },   //!< RUN

branches/christmas_branche/src/world_entities/creatures/md2_creature.cc

@@ -260 +260 @@
   if( this->bJump)
   {
-    /*if( ((MD2Model*)this->getModel(0))->getAnim() != JUMP)*/ ((MD2Model*)this->getModel(0))->setAnim(JUMP);
+    ((MD2Model*)this->getModel(0))->setAnim(JUMP);
   }
   else if( fabs(move.len()) > 0.0f)
@@ -296 +296 @@
   if( this->bUp )
    {
-      accel += (this->getAbsDirX())*2;
+     accel += (this->getAbsDirX())*2;
    }
 
@@ -372 +372 @@
   {
     this->xMouse = event.xRel;
-    mouseDir *= (Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0)));
+    this->yMouse = event.yRel;
+    mouseDir *= (Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
 //     if( xMouse*xMouse < 0.9)
 //      this->setAbsDir(mouseDir);