Changeset 10201 in orxonox.OLD

Timestamp:

Jan 10, 2007, 11:14:32 AM (18 years ago)

Author:

patrick

Message:

tracing a bug within the mp structure

Location:

branches/mount_points/src

Files:

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

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

@@ -17 +17 @@
 
 #include "model.h"
-
+#include "debug.h"
 #include "glincl.h"
 
@@ -88 +88 @@
   glEnd();
 }
+
+
+/**
+ * adds a mounting point to the model
+ * @param up up vector
+ * @param forward forward vector
+ * @param center center vector
+ */
+void Model::addMountPoint(const Vector& up, const Vector& forward, const Vector& center, const std::string& name)
+{
+  PRINTF(0)("added mount point\n");
+
+  mountPointSkeleton mps;
+  mps.up = up;
+  mps.forward = forward;
+  mps.center = center;
+  mps.name = name;
+
+  this->mountPoints.push_back(mps);
+  PRINTF(0)(" size: %i\n", this->mountPoints.size());
+}

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

@@ -100 +100 @@
     /** @returns a list of mounting points */
     inline const mpList& getMountPoints() const { return this->mountPoints; }
-    /** 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; this->mountPoints.push_back(mps); }
+    void addMountPoint(const Vector& up, const Vector& forward, const Vector& center, const std::string& name);
 
 

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)
         {
@@ -279 +281 @@
 
   // first get all mount points from the model
-  std::list<mountPointSkeleton> mpList = this->getModel(0)->getMountPoints();
+  std::list<mountPointSkeleton> mpList = this->getModel()->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);;
+    MountPoint* mp = new MountPoint( (*it).up, (*it).forward, (*it).center, (*it).name);
+
+    std::string nrStr = (*it).name.substr(1, 2);
 
     PRINTF(0)("got mp nr: %s\n", nrStr.c_str());
@@ -297 +301 @@
   this->oiFile = new ObjectInformationFile(fileName);
 
+  PRINTF(0)("\n");