Changeset 9235 in orxonox.OLD for trunk/src/lib/graphics/importer

Timestamp:

Jul 5, 2006, 4:39:02 PM (18 years ago)

Author:

bensch

Message:

merged the presentation back

Location:

trunk/src/lib/graphics/importer

Files:

• bsp_manager.cc (modified) (6 diffs)
• md2/md2Model.cc (modified) (2 diffs)
• md2/md2Model.h (modified) (3 diffs)

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

@@ -53 +53 @@
 {
 
+  this->lastTex = -1;
   this->parent = parent;
   /*// open a BSP file
@@ -101 +102 @@
   return 0;
 }
+
+
 /*
 BspManager::BspManager(const char* fileName, float scale)
@@ -270 +273 @@
         const float dMaxs = dir.x*(float)curLeaf.maxs[0] +dir.y*(float)curLeaf.maxs[1] +dir.z*(float)curLeaf.maxs[2] - dist;
 
-        if(dMins < -50.0 && dMaxs < -  50.0) {
+        if(dMins < -70.0 && dMaxs < -70.0) {
           continue;
         }
@@ -1371 +1374 @@
   else
   {
-    if( this->outputFraction == 1.0f)
+    if( this->outputFraction == 1.0f) // No collision Detected
     {
-      if( this->outputAllSolid )
+      if( this->outputAllSolid ) 
       {
         this->collPlane = new plane;
@@ -1382 +1385 @@
         SolidFlag = true;
       }
-      else
+      else      // No collision happened
       {
         yCollisionDown = false;
@@ -1388 +1391 @@
       }
     }
-    else
+    else           // A collision has happended
     {
       yCollisionDown = true;
       collPos = position + (down - position) * this->outputFraction;
-      this->out = collPos;        // why this????
     }
   }

trunk/src/lib/graphics/importer/md2/md2Model.cc

@@ -40 +40 @@
 
 //! list of all different animations a std md2model supports
-sAnim MD2Model::animationList[21] =
+sAnim MD2Model::animationList[22] =
   {
  // begin, end, fps, interruptable
@@ -64 +64 @@
     { 190, 197,  10, 0 },   //!< DEATH_FALLBACKSLOW
     { 198, 198,  5, 1 },   //!< BOOM
+    {  199, 204, 10, 1 },  //!< WALK (only for spectial models)
   };
 

trunk/src/lib/graphics/importer/md2/md2Model.h

@@ -30 +30 @@
 #define MD2_VERSION                     8                                        //!< the md2 version in the header
 #define MD2_MAX_TRIANGLES               4096                                     //!< maximal triangles count
-#define MD2_MAX_VERTICES                2048                                     //!< maximal vertices count
-#define MD2_MAX_TEXCOORDS               2048                                     //!< maximal tex coordinates
+#define MD2_MAX_VERTICES                3048                                     //!< maximal vertices count
+#define MD2_MAX_TEXCOORDS               3048                                     //!< maximal tex coordinates
 #define MD2_MAX_FRAMES                  512                                      //!< maximal frames
 #define MD2_MAX_SKINS                   32                                       //!< maximal skins
@@ -92 +92 @@
     DEATH_FALLBACKSLOW,
     BOOM,
+    WALK,
 
     MAX_ANIMATIONS
@@ -180 +181 @@
   static sVec3D       anorms[NUM_VERTEX_NORMALS];       //!< the anormals
   static float        anormsDots[SHADEDOT_QUANT][256];  //!< the anormals dot products
-  static sAnim        animationList[21];                //!< the anomation list
+  static sAnim        animationList[22];                //!< the anomation list
    //! again one of these strange id software parts
   float*              shadeDots;