Changeset 8533 in orxonox.OLD for branches/bsp_model/src

Timestamp:

Jun 16, 2006, 3:21:30 PM (18 years ago)

Author:

patrick

Message:

bsp: config parsing tests

Location:

branches/bsp_model/src/lib/graphics/importer

Files:

• bsp_manager.cc (modified) (3 diffs)
• md3/md3_animation_cfg.cc (modified) (4 diffs)
• md3/md3_animation_cfg.h (modified) (1 diff)
• md3/md3_model.cc (modified) (2 diffs)

branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc

@@ -50 +50 @@
 BspManager::BspManager(WorldEntity* parent)
 {
- 
+
   this->parent = parent;
   /*// open a BSP file
@@ -937 +937 @@
 void BspManager::checkCollision(WorldEntity* worldEntity)
 {
-  
+
   this->outputStartsOut = true;
   this->outputAllSolid = false;
   this->outputFraction = 1.0f;
-  
+
 
 
@@ -976 +976 @@
 
   float height = 40;
-  
+
   this->inputStart =  position;
   this->inputEnd =   dest;
   this->checkCollisionRayN(this->root,0.0f,1.0f, &position, &dest );
 
-  PRINTF(0)(" checking collision: %s, solid = %i, fraction = %f\n", worldEntity->getClassName(), this->outputAllSolid, this->outputFraction);
-  PRINTF(0)("checking collision!! Pos.Coords: %f , %f , %f\n", position.x , position.y, position.z);
-  PRINTF(0)("checking collision!! Dest.Coords: %f , %f , %f\n", dest.x , dest.y, dest.z);  
+//   PRINTF(0)(" checking collision: %s, solid = %i, fraction = %f\n", worldEntity->getClassName(), this->outputAllSolid, this->outputFraction);
+//   PRINTF(0)("checking collision!! Pos.Coords: %f , %f , %f\n", position.x , position.y, position.z);
+//   PRINTF(0)("checking collision!! Dest.Coords: %f , %f , %f\n", dest.x , dest.y, dest.z);
 //   position1.debug();
 

branches/bsp_model/src/lib/graphics/importer/md3/md3_animation_cfg.cc

@@ -44 +44 @@
     if( !this->dataStream) {
       PRINTF(1)("Error: file could not be opened: %s\n", filename.c_str());
+      return;
     }
+
+    this->loadConfig(filename);
   }
 
@@ -58 +61 @@
    * loads the configuration file
    */
-  void MD3AnimationCfg::loadConfig()
+  void MD3AnimationCfg::loadConfig(std::string filename)
   {
 //     BufferedReader bin=new BufferedReader(new InputStreamReader(in));
@@ -90 +93 @@
             tokens.pop_back();
           }
-          return;
+
+          this->dataStream.getline(buffer, 1024, '\n');
+          std::string line(buffer);
+        }
+      }
+    }
 /*
           st.nextToken(); //throw away first token
@@ -160 +168 @@
       throw new IOException(e.getMessage());
     }*/
-        }
-      }
-    }
+
   }
 

branches/bsp_model/src/lib/graphics/importer/md3/md3_animation_cfg.h

@@ -35 +35 @@
       virtual ~MD3AnimationCfg();
 
-      void loadConfig();
+      void loadConfig(std::string filename);
 
       std::string toString() { return std::string("Name: " + this->filename); }

branches/bsp_model/src/lib/graphics/importer/md3/md3_model.cc

@@ -19 +19 @@
 #include "md3_data.h"
 
+#include "md3_animation_cfg.h"
 
 namespace md3
@@ -29 +30 @@
   {
     this->md3Data = new MD3Data(filename, filename, scaling);
+
+    MD3AnimationCfg cfg("/home/boenzlip/tmp/q3/Downloads/MOH/q3mdl-alien3/models/players/alien3/animation.cfg");
   }