Changeset 8546 in orxonox.OLD

Timestamp:

Jun 16, 2006, 6:03:42 PM (18 years ago)

Author:

patrick

Message:

bsp: the model animation informations get parsed correctly and loaded

File:

• branches/bsp_model/src/lib/graphics/importer/md3/md3_animation_cfg.cc (modified) (6 diffs)

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

@@ -73 +73 @@
 
 
-    //this->dataStream.open(filename.c_str());
     FILE* pFile;
     char* cLine;
@@ -88 +87 @@
 
     // parse file
-//     this->dataStream.getline(buffer, 1024, '\n');
-//     std::string line(buffer);
     while( (read = getline(&cLine, &len, pFile)) != -1) { /*( !this->dataStream.eof()) {*/
       std::string line(cLine);
 
-      PRINTF(0)("size = %i, line = |%s|\n", read, line.c_str());
+//       PRINTF(0)("size = %i, line = |%s|\n", read, line.c_str());
 
       //ignore empty lines and comments
-      if( line != "" && line.find("//") != 0) {
-        // find the sex section
+      if( line.length() > 2 && line.find("//") != 0) {
+
+        // find the gender section
         if( inHeader && line.find("sex") == 0) {
           //parse line: sex [m | f | ...]
@@ -115 +113 @@
           PRINTF(0)("sex of the md3 model: %c\n", this->sex);
         }
-        else if (inHeader && line.find("headoffset") == 0) {
+        else if( inHeader && line.find("headoffset") == 0) {
           // parse line: headoffset X Y Z
           std::vector<std::string> tokens;
@@ -128 +126 @@
           PRINTF(0)("got head offset: %f, %f, %f\n", x, y, z);
         }
-        else if (inHeader && line.find("footsteps") == 0) {
+        else if( inHeader && line.find("footsteps") == 0) {
           //parse line: footsteps [normal | mech | ...]
           std::vector<std::string> tokens;
@@ -153 +151 @@
           this->loadAnimation(animation, line);
 
-          animation->name = MD3Animation::animationList[i].animationName;
-          animation->type = MD3Animation::animationList[i].animationType;
+          if( i < 25)
+          {
+            animation->name = MD3Animation::animationList[i].animationName;
+            animation->type = MD3Animation::animationList[i++].animationType;
+          }
 
           // workaround for strange numbering in animation.cfg: skip TORSO frames
@@ -187 +188 @@
     Tokenizer::tokenize(line, tokens, " \t\n\r\f/");
 
-
-    while( !tokens.empty())
+/*    while( !tokens.empty())
     {
-      PRINTF(0)("tokens: %s\n", tokens.back().c_str());
+      PRINTF(5)("token: %s\n", tokens.back().c_str());
       tokens.pop_back();
-    }
-  }
-// //parse line:
-//                 //first frame, num frames, looping frames, frames per second
-//   try {
-//     StringTokenizer st=new StringTokenizer(line, " \t\n\r\f/");
-//
-//     newAnimation.first=new Integer(st.nextToken()).intValue();
-//     newAnimation.num=new Integer(st.nextToken()).intValue();
-//     newAnimation.looping=new Integer(st.nextToken()).intValue();
-//     newAnimation.fps=new Integer(st.nextToken()).intValue();
-//   } catch (Exception e) {
-//     throw new IOException("corrupt animation line");
-//   }
+    }*/
+    anim->fps = atoi(tokens.back().c_str()); tokens.pop_back();
+    anim->numLoopFrames = atoi(tokens.back().c_str()); tokens.pop_back();
+    anim->numFrames = atoi(tokens.back().c_str()); tokens.pop_back();
+    anim->first = atoi(tokens.back().c_str()); tokens.pop_back();
+
+    PRINTF(0)("Animation: first frame: %i, num frames: %i, num loops: %i, fps: %i\n", anim->first, anim->numFrames, anim->numLoopFrames, anim->fps);
+  }