Changeset 10698 in orxonox.OLD for trunk/src/lib

Timestamp:

Jun 14, 2007, 5:33:43 PM (17 years ago)

Author:

snellen

Message:

merged adm, hud, vs-enhancements : beni's responsible for this commit. blame him!

Location:

trunk/src/lib

Files:

• collision_detection/aabb_tree_node.cc (modified) (1 diff)
• event/key_mapper.cc (modified) (2 diffs)
• event/key_mapper.h (modified) (1 diff)
• graphics/importer/bsp/bsp_manager.cc (modified) (4 diffs)
• graphics/importer/bsp/bsp_manager.h (modified) (1 diff)
• math/quaternion.h (modified) (2 diffs)
• math/vector.h (modified) (2 diffs)

trunk/src/lib/collision_detection/aabb_tree_node.cc

@@ -740 +740 @@
 
   /* DRAW POLYGONS */
-  if( drawMode & DRAW_BV_POLYGON || drawMode & DRAW_ALL || drawMode & DRAW_BV_BLENDED)
+  if( (drawMode & DRAW_BV_POLYGON) || (drawMode & DRAW_ALL) || (drawMode & DRAW_BV_BLENDED))
   {
     if (top)

trunk/src/lib/event/key_mapper.cc

@@ -47 +47 @@
 int KeyMapper::PEV_JUMP              = EV_UNKNOWN;
 int KeyMapper::PEV_ACTION            = EV_UNKNOWN;
+int KeyMapper::PEV_CROUCH            = EV_UNKNOWN;
 
 int KeyMapper::PEV_FIRE1             = EV_UNKNOWN;
@@ -87 +88 @@
       {&KeyMapper::PEV_JUMP,                 CONFIG_NAME_PLAYER_JUMP,            SDLK_SPACE},
       {&KeyMapper::PEV_ACTION,               CONFIG_NAME_PLAYER_ACTION,          SDLK_u},
+      {&KeyMapper::PEV_CROUCH,               CONFIG_NAME_PLAYER_CROUCH,          SDLK_LCTRL},
+
 
       {&KeyMapper::PEV_FIRE1,                CONFIG_NAME_PLAYER_FIRE,            EV_MOUSE_BUTTON_LEFT},

trunk/src/lib/event/key_mapper.h

@@ -58 +58 @@
   static int PEV_JUMP;              //!< jump
   static int PEV_ACTION;            //!< the action (or use) key
+  static int PEV_CROUCH;            //!< crouch
 
   static int PEV_FIRE1;             //!< fire button 1

trunk/src/lib/graphics/importer/bsp/bsp_manager.cc

@@ -173 +173 @@
   // erase alreadyVisible
   for(int i = 0; i < this->bspFile->numFaces; i++) this->alreadyVisible[i] = false;
-  float tmp = 0;
+//   float tmp = 0;
   //this->opal.clear();
   //this->trasparent.clear();
@@ -186 +186 @@
 
   this->viewDir=    State::getCamera()->getAbsDirX();
-  float d = (cam.x*viewDir.x + cam.y*viewDir.y + cam.z * viewDir.z);
+//   float d = (cam.x*viewDir.x + cam.y*viewDir.y + cam.z * viewDir.z);
 
   BspTreeNode*  ActLeaf = this->getLeaf(this->bspFile->root, &ship);
@@ -254 +254 @@
 
     for(int i = 0; i <  this->bspFile->numLeafs   ; ++i ) {
-      leaf& camLeaf =  (this->bspFile->leaves)[ActLeaf->leafIndex] ;
+//       leaf& camLeaf =  (this->bspFile->leaves)[ActLeaf->leafIndex] ;
       leaf& curLeaf =  (this->bspFile->leaves)[i] ;
       int& cluster =  curLeaf.cluster;
@@ -1696 +1696 @@
 
 
+float BspManager::checkCollisionRay(Vector StartPoint, Vector Direction, float length )
+{
+  Direction.normalize(); // Oder besser vor dem Fkt-Aufruf schon normalisieren
+  this->outputStartsOut = true;
+  this->outputAllSolid = false;
+  this->outputFraction = 1.0f;
+  this->inputStart =  StartPoint;
+  Vector End =   StartPoint + (Direction)*length;
+  this->inputEnd =   End;
+
+  this->checkCollisionRayN(this->root, 0.0f, 1.0f, &StartPoint, &(End) );
+
+  return (this->outputFraction * length);
+
+}
+
+
 
 /**

trunk/src/lib/graphics/importer/bsp/bsp_manager.h

@@ -77 +77 @@
   void checkCollision(WorldEntity* worldEntity); /*!< WorldEntities use this function to check wheter they collided with the BspEntity.
                                                       If a collision has been detected, the collides-function of worldEntity will be called.*/
+  float checkCollisionRay(Vector StartPoint, Vector Direction, float length ) ;
 
   int sortTransparency;              //!< sort transparent textures

trunk/src/lib/math/quaternion.h

@@ -50 +50 @@
 
     /** @param q: the Quaternion to compare with this one. @returns true if the Quaternions are the same, false otherwise */
-  inline bool operator== (const Quaternion& q) const { return (unlikely(this->v==q.v&&this->w==q.w))?true:false; };
+    inline bool operator== (const Quaternion& q) const { return (unlikely(this->v==q.v&&this->w==q.w))?true:false; };
     /** @param q: the Quaternion to compare with this one. @returns true if the Quaternions are the same, false otherwise */
-  inline bool operator!= (const Quaternion& q) const { return (unlikely(this->v!=q.v||this->w!=q.w))?true:false; };
+    inline bool operator!= (const Quaternion& q) const { return (unlikely(this->v!=q.v||this->w!=q.w))?true:false; };
     /** @param f: a real value @return a Quaternion containing the quotient */
     inline Quaternion operator/ (const float& f) const { return (unlikely(f==0.0)) ? Quaternion() : Quaternion(this->v/f, this->w/f); };
@@ -118 +118 @@
 
 
-    inline void slerpTo(const Quaternion& toQuat, float t);
+    void slerpTo(const Quaternion& toQuat, float t);
     static Quaternion quatSlerp(const Quaternion& from, const Quaternion& to, float t);
 

trunk/src/lib/math/vector.h

@@ -51 +51 @@
 
   /** @param index The index of the "array" @returns the x/y/z coordinate */
-  inline float operator[] (float index) const {if( index == 0) return this->x; if( index == 1) return this->y; if( index == 2) return this->z; }
+  inline float operator[] (float index) const {if( index == 0) return this->x; if( index == 1) return this->y; if( index == 2) return this->z; else return this->x; }
   /** @param v The vector to add @returns the addition between two vectors (this + v) */
   inline Vector operator+ (const Vector& v) const { return Vector(x + v.x, y + v.y, z + v.z); };
@@ -64 +64 @@
   /** @param v The vector to substract  @returns the substraction between two vectors (this - v) */
   inline Vector operator- (const sVec3D& v) const { return Vector(x - v[0], y - v[1], z - v[2]); }
+  /** @returns the substraction between (0, 0, 0) and this (null-this) */
+  inline Vector operator- () const { return Vector(-x, -y, -z); }
   /** @param v The vector to substract  @returns the substraction between two vectors (this -= v) */
   inline const Vector& operator-= (const Vector& v) { this->x -= v.x; this->y -= v.y; this->z -= v.z; return *this; };