Changeset 10147 in orxonox.OLD for trunk

Timestamp:

Dec 25, 2006, 1:30:44 PM (17 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

Files:

• lib/graphics/importer/Makefile.am (modified) (2 diffs)
• lib/graphics/importer/model.h (modified) (1 diff)
• lib/graphics/importer/obj/objModel.cc (modified) (2 diffs)
• lib/graphics/importer/obj/objModel.h (modified) (1 diff)
• lib/graphics/importer/oif (copied) (copied from branches/mount_points/src/lib/graphics/importer/oif)
• lib/graphics/importer/oif/object_information_file.cc (copied) (copied from branches/mount_points/src/lib/graphics/importer/oif/object_information_file.cc)
• lib/graphics/importer/oif/object_information_file.h (copied) (copied from branches/mount_points/src/lib/graphics/importer/oif/object_information_file.h)
• lib/graphics/importer/oif/resource_oif.cc (copied) (copied from branches/mount_points/src/lib/graphics/importer/oif/resource_oif.cc)
• lib/graphics/importer/oif/resource_oif.h (copied) (copied from branches/mount_points/src/lib/graphics/importer/oif/resource_oif.h)
• lib/graphics/importer/static_model.cc (modified) (1 diff)
• lib/graphics/importer/static_model.h (modified) (1 diff)
• lib/graphics/importer/static_model_data.cc (modified) (1 diff)
• lib/graphics/importer/static_model_data.h (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (2 diffs)
• world_entities/mount_point.cc (copied) (copied from branches/mount_points/src/world_entities/mount_point.cc) (1 diff)
• world_entities/mount_point.h (copied) (copied from branches/mount_points/src/world_entities/mount_point.h)
• world_entities/npcs/npc_test.cc (modified) (2 diffs)
• world_entities/npcs/npc_test.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (8 diffs)
• world_entities/world_entity.h (modified) (4 diffs)

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; }

trunk/src/world_entities/WorldEntities.am

@@ -24 +24 @@
                 world_entities/planet.cc \
                 world_entities/bsp_entity.cc \
+                world_entities/mount_point.cc \
                 \
                 world_entities/weapons/test_gun.cc \
@@ -127 +128 @@
                 planet.h \
                 bsp_entity.h \
+                mount_point.h \
                 \
                 weapons/test_gun.h \

trunk/src/world_entities/mount_point.cc

@@ -24 +24 @@
 #include "debug.h"
 #include "state.h"
-#include "class_id_DEPRECATED.h"
 
 

trunk/src/world_entities/npcs/npc_test.cc

@@ -39 +39 @@
   this->registerObject(this, NPC2::_objectList);
 
-  if ((float)rand()/RAND_MAX > .5f)
-    this->loadModel("models/ships/bolido.obj", 6);
-  else
-    this->loadModel("models/ships/gobblin.obj", 6);
+//   if ((float)rand()/RAND_MAX > .5f)
+//     this->loadModel("models/ships/bolido.obj", 6);
+//   else
+//     this->loadModel("models/ships/gobblin.obj", 6);
 
 
@@ -84 +84 @@
  * Just override this function with whatever you want to be drawn.
  */
-void NPC2::draw() const
-{
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  float matrix[4][4];
-
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  /* rotate */
-  this->getAbsDir ().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-
-//   if (this->shader != NULL && this->shader != Shader::getActiveShader())
-//     shader->activateShader();
-
-  this->getModel()->draw();
-//   shader->deactivateShader();
-
-
-/*  if (this->model)
-    this->model->draw();*/
-  glPopMatrix();
-}
+// void NPC2::draw() const
+// {
+//   glMatrixMode(GL_MODELVIEW);
+//   glPushMatrix();
+//   float matrix[4][4];
+//
+//   /* translate */
+//   glTranslatef (this->getAbsCoor ().x,
+//                 this->getAbsCoor ().y,
+//                 this->getAbsCoor ().z);
+//   /* rotate */
+//   this->getAbsDir ().matrix (matrix);
+//   glMultMatrixf((float*)matrix);
+//
+// //   if (this->shader != NULL && this->shader != Shader::getActiveShader())
+// //     shader->activateShader();
+//
+//   if( this->getModel())
+//     this->getModel()->draw();
+// //   shader->deactivateShader();
+//
+//
+// /*  if (this->model)
+//     this->model->draw();*/
+//   glPopMatrix();
+// }
 
 

trunk/src/world_entities/npcs/npc_test.h

@@ -22 +22 @@
 
   virtual void tick(float dt);
-  virtual void draw() const;
+//   virtual void draw() const;
 
  private:

trunk/src/world_entities/world_entity.cc

@@ -12 +12 @@
 
    ### File Specific:
-   main-programmer: Patrick Boenzli
-   co-programmer: Christian Meyer
+   main-programmer: Patrick Boenzli, Benjamin Grauer
+   co-programmer: Christian Meier
 */
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
@@ -24 +24 @@
 #include "md2/md2Model.h"
 #include "md3/md3_model.h"
+
+#include "oif/object_information_file.h"
+#include "mount_point.h"
 
 #include "aabb_tree_node.h"
@@ -69 +72 @@
   this->damage = 0.0f; // no damage dealt by a default entity
   this->scaling = 1.0f;
+  this->oiFile = NULL;
 
   /* OSOLETE */
@@ -103 +107 @@
   for (unsigned int i = 0; i < this->models.size(); i++)
     this->setModel(NULL, i);
+
+  // remove the object information file
+  if( this->oiFile)
+    delete this->oiFile;
+  // and clear all monut points
+  this->mountPoints.clear();
 
   // Delete the obbTree
@@ -191 +201 @@
     {
       PRINTF(4)("fetching OBJ file: %s\n", fileName.c_str());
+      // creating the model and loading it
       StaticModel* model = new StaticModel();
       *model = ResourceOBJ(fileName, this->scaling);
@@ -201 +212 @@
       else
         delete model;
+
+      // now get the object information file for this model, if any
+      std::string oifName = fileName.substr(0, fileName.length() - 4) + ".oif";
+      this->loadObjectInformationFile( oifName);
     }
     /// LOADING AN MD2-model
@@ -249 +264 @@
 
 
+
+/**
+ * loads the object information file for this model
+ * @param fileName the name of the file
+ */
+void WorldEntity::loadObjectInformationFile(const std::string& fileName)
+{
+  PRINTF(4)("loading the oif File: %s\n", fileName.c_str());
+
+  this->oiFile = new ObjectInformationFile(fileName);
+}
+
+
 /**
  * builds the obb-tree
@@ -290 +318 @@
   }
   return true;
+}
+
+
+/**
+ * adds a mount point to the end of the list
+ * @param mountPoint point to be added
+ */
+void WorldEntity::addMountPoint(MountPoint* mountPoint)
+{
+  // add the mount point at the last position
+  this->mountPoints.push_back(mountPoint);
+}
+
+/**
+ * adds a mount point to a world entity
+ * @param mountPoint point to be added
+ */
+void WorldEntity::addMountPoint(int slot, MountPoint* mountPoint)
+{
+  if( this->mountPoints[slot] != NULL)
+  {
+    PRINTF(0)("adding a mount point to a slot, that already exists! ignoring - maybe some object do not get connected well (object: %s)\n", this->getClassCName());
+  }
+
+  // just connect the mount point
+  this->mountPoints[slot] = mountPoint;
+}
+
+
+/**
+ * mounts a world entity on a specified mount point (~socket)
+ * @param entity entity to be connected
+ */
+void WorldEntity::mount(int slot, WorldEntity* entity)
+{
+  if( this->mountPoints[slot] == NULL)
+  {
+    PRINTF(0)("you tried to add an entity to a mount point that doesn't exist (slot %i)\n", slot);
+    return;
+  }
+
+  // mount the entity
+  this->mountPoints[slot]->mount(entity);
+}
+
+
+/**
+ * removes a mount point from a specified mount point
+ * @param mountPoint entity to be unconnected
+ */
+void WorldEntity::unmount(int slot)
+{
+    if( this->mountPoints[slot] == NULL)
+  {
+    PRINTF(0)("you tried to remove an entity from a mount point that doesn't exist (slot %i)\n", slot);
+    return;
+  }
+
+  // unmount the entity
+  this->mountPoints[slot]->unmount();
 }
 

trunk/src/world_entities/world_entity.h

@@ -15 +15 @@
 #include "object_manager.h"
 #include "glincl.h"
+
+#include "aabb_tree_node.h"
+
+#include "physics_interface.h"
+
 #include <vector>
-
-#include "aabb_tree_node.h"
-
-#include "physics_interface.h"
-
 
 
@@ -33 +33 @@
 class Model;
 
+class ObjectInformationFile;
+class MountPoint;
+
 
 //! Basis-class all interactive stuff in the world is derived from
@@ -50 +53 @@
   Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
 
+  void loadObjectInformationFile(const std::string& fileName);
   inline void loadMD2Texture(const std::string& fileName) { this->md2TextureFileName = fileName; }
+
+  void addMountPoint(MountPoint* mountPoint);
+  void addMountPoint(int slot, MountPoint* mountPoint);
+  void mount(int slot, WorldEntity* entity);
+  void unmount(int slot);
 
   /** @param visibility if the Entity should be visible (been draw) */
@@ -185 +194 @@
 
   std::vector<Model*>     models;             //!< The model that should be loaded for this entity.
+  ObjectInformationFile*  oiFile;             //!< Reference to the object information file discribing the model of this WE
+  std::vector<MountPoint*> mountPoints;       //!< A list with mount points for this model
   std::string             md2TextureFileName; //!< the file name of the md2 model texture, only if this
   std::string             modelLODName;       //!< the name of the model lod file