Changeset 10185 in orxonox.OLD

Timestamp:

Jan 6, 2007, 5:41:12 PM (18 years ago)

Author:

patrick

Message:

some more properties of the mount point

Location:

branches/mount_points/src

Files:

• lib/graphics/importer/model.h (modified) (1 diff)
• world_entities/mount_point.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (2 diffs)

branches/mount_points/src/lib/graphics/importer/model.h

@@ -102 +102 @@
     /** adds a mounting point to the model @param up up vector @param forward forward vector @param center center vector */
     inline void addMountPoint(const Vector& up, const Vector& forward, const Vector& center, const std::string& name)
-    { mountPointSkeleton mps; mps.up = up; mps.forward = forward; mps.center = center; mps.name = name; }
+    { mountPointSkeleton mps; mps.up = up; mps.forward = forward; mps.center = center; mps.name = name; this->mountPoints.push_back(mps); }
 
 

branches/mount_points/src/world_entities/mount_point.cc

@@ -36 +36 @@
 {
 
-  this->name = name;
+  this->_name = name;
   this->setAbsCoor( center);
   this->setAbsDir( Quaternion(forward, up));

branches/mount_points/src/world_entities/world_entity.cc

@@ -204 +204 @@
       StaticModel* model = new StaticModel();
       *model = ResourceOBJ(fileName, this->scaling);
+
+      // check if ther is a valid model and load other stuff
       if (model->getVertexCount() > 0)
       {
         this->setModel(model, modelNumber);
         if( modelNumber == 0)
+        {
           this->buildObbTree(obbTreeDepth);
 
-        // now get the object information file for this model, if any
-        std::string oifName = fileName.substr(0, fileName.length() - 4) + ".oif";
-        this->loadMountPoints( oifName);
+          // now get the object information file for this model, if any
+          std::string oifName = fileName.substr(0, fileName.length() - 4) + ".oif";
+          this->loadMountPoints( oifName);
+        }
       }
       else
@@ -271 +275 @@
 void WorldEntity::loadMountPoints(const std::string& fileName)
 {
-  PRINTF(4)("loading the oif File: %s\n", fileName.c_str());
+  PRINTF(0)("loading the oif File: %s\n", fileName.c_str());
+
 
   // first get all mount points from the model
-  std::list<mountPointSkeleton> mpList = this->models[0]->getMountPoints();
-
+  std::list<mountPointSkeleton> mpList = this->getModel(0)->getMountPoints();
   // for each skeleton create a mounting point world entity
   std::list<mountPointSkeleton>::const_iterator it = mpList.begin();
+
   for( ; it != mpList.end(); it++)
   {
     MountPoint* mp = new MountPoint((*it).up, (*it).forward, (*it).center, (*it).name);
 
-    this->mountPoints.push_back(mp);
+    std::string nrStr = (*it).name.substr(1, 2);;
+
+    PRINTF(0)("got mp nr: %s\n", nrStr.c_str());
+
+    this->addMountPoint(mp);
   }
 
   // now load the object information file
   this->oiFile = new ObjectInformationFile(fileName);
+