Changeset 8536 in orxonox.OLD

Timestamp:

Jun 16, 2006, 4:01:25 PM (18 years ago)

Author:

patrick

Message:

bsp: md3 sex gets read correctly

File:

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

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

@@ -89 +89 @@
     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());
 
       //ignore empty lines and comments
@@ -98 +100 @@
           Tokenizer::tokenize(line, tokens, " \t\n\r\f/");
 
-          PRINTF(0)("size = %i, line = |%s|\n", read, line.c_str());
-
-          while( !tokens.empty())
-          {
-            PRINTF(0)("tokens: %s\n", tokens.back().c_str());
-            tokens.pop_back();
+          std::string sexStr = tokens.back();
+          // probably error in the file format
+          if( sexStr.length() != 1) {
+            this->sex = '?';
+            PRINTF(2)("no section \"sex\" in the config file %s found\n", filename.c_str());
           }
-
+          else {
+            this->sex = sexStr[0];
+          }
+
+          PRINTF(0)("sex of the md3 model: %c\n", this->sex);
         }
+        else if (inHeader && line.find("headoffset") == 0) {
+          // parse line: headoffset X Y Z
+          std::vector<std::string> tokens;
+          Tokenizer::tokenize(line, tokens, " \t\n\r\f/");
+
+          //           while( !tokens.empty())
+//           {
+//             PRINTF(0)("tokens: %s\n", tokens.back().c_str());
+//             tokens.pop_back();
+//           }
+
+//           newAnimCfg.headOffset=
+//               new md3.util.Vec3(new Float(st.nextToken()).floatValue(),
+//                                 new Float(st.nextToken()).floatValue(),
+//                                 new Float(st.nextToken()).floatValue());
+         }
       }
     }
-/*
-          st.nextToken(); //throw away first token
-          String sexStr=st.nextToken();
-          if (sexStr.length()!=1)
-            //non-fatal error, don't thow exception
-            newAnimCfg.sex='?';
-          else
-            newAnimCfg.sex=sexStr.charAt(0);
-        }
-        else if (IN_HEADER && line.startsWith("headoffset")) {
-                                        //parse line: headoffset X Y Z
-          StringTokenizer st=new StringTokenizer(line, " \t\n\r\f/");
-
-          st.nextToken(); //throw away first token
-
-          newAnimCfg.headOffset=
-              new md3.util.Vec3(new Float(st.nextToken()).floatValue(),
-                                new Float(st.nextToken()).floatValue(),
-                                new Float(st.nextToken()).floatValue());
-        }
+    /*
         else if (IN_HEADER && line.startsWith("footsteps")) {
                                         //parse line: footsteps [normal | mech | ...]