Changeset 10147 in orxonox.OLD for trunk/src/lib

Timestamp:

Dec 25, 2006, 1:30:44 PM (18 years ago)

Author:

patrick

Message:

merged the mount_point branche back to trunk to use the new std::* based obj file importer

Location:

trunk/src/lib/graphics/importer

Files:

• Makefile.am (modified) (2 diffs)
• model.h (modified) (1 diff)
• obj/objModel.cc (modified) (2 diffs)
• obj/objModel.h (modified) (1 diff)
• oif (copied) (copied from branches/mount_points/src/lib/graphics/importer/oif)
• oif/object_information_file.cc (copied) (copied from branches/mount_points/src/lib/graphics/importer/oif/object_information_file.cc)
• oif/object_information_file.h (copied) (copied from branches/mount_points/src/lib/graphics/importer/oif/object_information_file.h)
• oif/resource_oif.cc (copied) (copied from branches/mount_points/src/lib/graphics/importer/oif/resource_oif.cc)
• oif/resource_oif.h (copied) (copied from branches/mount_points/src/lib/graphics/importer/oif/resource_oif.h)
• static_model.cc (modified) (1 diff)
• static_model.h (modified) (1 diff)
• static_model_data.cc (modified) (1 diff)
• static_model_data.h (modified) (1 diff)

trunk/src/lib/graphics/importer/Makefile.am

@@ -25 +25 @@
                 \
                 obj/objModel.cc \
+                \
+                oif/object_information_file.cc \
+                oif/resource_oif.cc \
                 \
                 bsp/bsp_manager.cc \
@@ -79 +82 @@
                 obj/objModel.h \
                 \
+                oif/object_information_file.h \
+                oif/resource_oif.h \
+                \
                 md2/md2Model.h \
                 md2/resource_md2.h \

trunk/src/lib/graphics/importer/model.h

@@ -83 +83 @@
     inline unsigned int getTriangleCount() const { return this->pModelInfo.numTriangles; };
 
+    /** function to extract the mount points from the model data */
+    virtual void extractMountPoints() {}
+
+
   protected:
     Model();

trunk/src/lib/graphics/importer/obj/objModel.cc

@@ -44 +44 @@
 
   this->finalize();
+
+  this->extractMountPoints();
 }
 
@@ -138 +140 @@
           this->addVertexTexture(buffer+3);
         }
-      // case group
-      else if (!strncmp(buffer, "g ", 2))
+      // case group or object (depends on the exporter program)
+      else if (!strncmp(buffer, "g ", 2) || !strncmp(buffer, "o ", 2))
         {
           this->addGroup (buffer+2);

trunk/src/lib/graphics/importer/obj/objModel.h

@@ -16 +16 @@
   OBJModel(const std::string& fileName, float scaling = 1.0);
   virtual ~OBJModel();
+
 
 private:

trunk/src/lib/graphics/importer/static_model.cc

@@ -91 +91 @@
   this->updateBase();
 }
+
+
+
+/**
+ * extract the mount points from this file: looking at each group and checking if the group realy is a mountpoint marker
+ * if so get place and orientation
+ */
+void StaticModel::extractMountPoints()
+{
+
+  // go through all groups and check if they are mounts
+  std::vector<StaticModelData::Group>::const_iterator groupIt = this->data->getGroups().begin();
+  for( ; groupIt != this->data->getGroups().end(); groupIt++)
+  {
+    //PRINTF(0)("Found a MountPoint: %s\n", groupName.c_str());
+
+    // get the name of this group and check if it's a mout point identifier
+    std::string groupName = (*groupIt).name;
+    std::vector<Vector> vertices;
+
+    if( groupName.find("MP.", 0) != std::string::npos)
+    {
+      PRINTF(0)("Found a MountPoint: %s\n", groupName.c_str());
+
+      // now check if it is a mount point identifier
+      if( this->data->getGroups().size() != 5) {
+        PRINTF(1)("the face count of %s is wrong, perhaps you missnamed this object or used the wrong mount point object\n", groupName.c_str());
+      }
+
+      // now extract the direction from the length:
+      std::vector<StaticModelData::Face>::const_iterator faceIt = (*groupIt)._faces.begin();
+      for( ; faceIt < (*groupIt)._faces.end(); faceIt++)
+      {
+        // now go through all modelfaceelements
+        std::vector<StaticModelData::FaceElement>::const_iterator faceElementIt = (*faceIt)._elements.begin();
+        for( ; faceElementIt < (*faceIt)._elements.end(); faceElementIt++)
+        {
+          int vert = (*faceElementIt).vertexNumber;
+          vertices.push_back(Vector(this->data->getVertices()[vert*3],
+                             this->data->getVertices()[vert*3 + 1],
+                             this->data->getVertices()[vert*3 + 2]));
+        }
+      }
+
+      // vertex with the max count is the up-point
+      std::vector<Vector>::const_iterator it = vertices.begin();
+      Vector tmpPoint;
+      int tmpCount;
+      Vector upPoint;
+      int maxCount = 0;
+      for( ; it < vertices.end(); it++)
+      {
+        tmpCount = 0;
+        tmpPoint = (*it);
+        //
+        std::vector<Vector>::const_iterator it2 = vertices.begin();
+        for( ; it2 < vertices.end(); it2++)
+          if( tmpPoint == *it2)
+            tmpCount++;
+
+        // if this is the vertex with the most surrounding vertices
+        if( tmpCount > maxCount)
+        {
+          upPoint = tmpPoint;
+          maxCount = tmpCount;
+        }
+      }
+
+      // now get the center of the object
+      Vector center;
+      it = vertices.begin();
+      for( ; it < vertices.end(); it++)
+        center += (*it);
+      // scale
+      center /= vertices.size();
+
+
+    }
+
+  }
+
+
+}
+
+
 
 /**

trunk/src/lib/graphics/importer/static_model.h

@@ -58 +58 @@
 
   void finalize();
+  void extractMountPoints();
 
   void acquireData(const StaticModelData::Pointer& data);

trunk/src/lib/graphics/importer/static_model_data.cc

@@ -276 +276 @@
 bool StaticModelData::addGroup(const std::string& groupString)
 {
-  PRINTF(5)("Read Group: %s.\n", groupString.c_str());
+  PRINTF(4)("Read Group: %s.\n", groupString.c_str());
   if (!_modelGroups.empty() && !_modelGroups.back()._faces.empty())
     _modelGroups.push_back(Group());
 
-  if (groupString == "default")
-    _modelGroups.back().name = groupString;
-  // setting the group name if not default.
+  _modelGroups.back().name = groupString;
   return true;
 }

trunk/src/lib/graphics/importer/static_model_data.h

@@ -129 +129 @@
   ///! HACK SOLUTION sTriangleExt should be const in the modelInfo.
   sTriangleExt* getTrianglesExt() { return &this->triangles[0]; };
+  const std::vector<Group>& getGroups() { return this->_modelGroups; }
 
   float getScaleFactor() const  { return scaleFactor; }