Changeset 10202 in orxonox.OLD

Timestamp:

Jan 10, 2007, 11:41:08 AM (17 years ago)

Author:

patrick

Message:

fixed the bug, the resources were overwriting my model infos

Location:

branches/mount_points/src

Files:

• lib/graphics/importer/static_model.cc (modified) (3 diffs)
• world_entities/world_entity.cc (modified) (4 diffs)
• world_entities/world_entity.h (modified) (1 diff)

branches/mount_points/src/lib/graphics/importer/static_model.cc

@@ -84 +84 @@
   data->finalize();
   this->updateBase();
-  this->extractMountPoints();
 }
 
@@ -187 +186 @@
     center /= vertices.size();
 
-    PRINTF(0)("Up Point\n");
-    up.debug();
-
-    PRINTF(0)("Center\n");
-    center.debug();
-
-    PRINTF(0)("Forward\n");
-    forward.debug();
+//     PRINTF(0)("Up Point\n");
+//     up.debug();
+//
+//     PRINTF(0)("Center\n");
+//     center.debug();
+//
+//     PRINTF(0)("Forward\n");
+//     forward.debug();
 
     // now add the mount point
@@ -229 +228 @@
   this->pModelInfo.pTriangles = this->data->getTrianglesExt();
   this->pModelInfo.numTriangles = this->data->getTriangles().size();
+
+  this->extractMountPoints();
 }
 

branches/mount_points/src/world_entities/world_entity.cc

@@ -209 +209 @@
       {
         this->setModel(model, modelNumber);
-        PRINTF(0)("model number: %i\n", modelNumber);
 
         if( modelNumber == 0)
@@ -217 +216 @@
           // now get the object information file for this model, if any
           std::string oifName = fileName.substr(0, fileName.length() - 4) + ".oif";
-          this->loadMountPoints( oifName);
+          this->loadMountPoints( model, oifName);
         }
       }
@@ -275 +274 @@
  * @param fileName the name of the file
  */
-void WorldEntity::loadMountPoints(const std::string& fileName)
+void WorldEntity::loadMountPoints( Model* model, const std::string& fileName)
 {
   PRINTF(0)("loading the oif File: %s\n", fileName.c_str());
@@ -281 +280 @@
 
   // first get all mount points from the model
-  std::list<mountPointSkeleton> mpList = this->getModel()->getMountPoints();
+  const std::list<mountPointSkeleton> mpList = model->getMountPoints();
   // for each skeleton create a mounting point world entity
   std::list<mountPointSkeleton>::const_iterator it = mpList.begin();
 
-  PRINTF(0)("->>>> size: %i\n", mpList.size());
-
   for( ; it != mpList.end(); it++)
   {
     MountPoint* mp = new MountPoint( (*it).up, (*it).forward, (*it).center, (*it).name);
 
-    std::string nrStr = (*it).name.substr(1, 2);
+    std::string nrStr = (*it).name.substr(3, 2);
 
     PRINTF(0)("got mp nr: %s\n", nrStr.c_str());

branches/mount_points/src/world_entities/world_entity.h

@@ -53 +53 @@
   Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
 
-  void loadMountPoints(const std::string& fileName);
+  void loadMountPoints( Model* model, const std::string& fileName);
   inline void loadMD2Texture(const std::string& fileName) { this->md2TextureFileName = fileName; }