Changeset 10184 in orxonox.OLD

Timestamp:

Jan 6, 2007, 5:03:27 PM (17 years ago)

Author:

patrick

Message:

extended model again, added mounting point generation procedures now working on a nicer interface

Location:

branches/mount_points/src

Files:

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

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

@@ -55 +55 @@
 typedef struct
 {
+  std::string      name;                 //!< the name of the mount point
   Vector           up;                   //!< the up vector
   Vector           forward;              //!< the forward vector
@@ -100 +101 @@
     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(Vector up, Vector forward, Vector center)
-    { mountPointSkeleton mps; mps.up = up; mps.forward = forward; mps.center = center; }
+    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; }
 
 

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

@@ -197 +197 @@
 
     // now add the mount point
-    this->addMountPoint( up, forward, center);
+    this->addMountPoint( up, forward, center, groupName);
   }
 }

branches/mount_points/src/world_entities/mount_point.cc

@@ -33 +33 @@
  * construct
  */
-MountPoint::MountPoint ()
+MountPoint::MountPoint (const Vector& up, const Vector& forward, const Vector& center, const std::string& name)
 {
+
+  this->name = name;
+  this->setAbsCoor( center);
+  this->setAbsDir( Quaternion(forward, up));
+
   this->init();
 }

branches/mount_points/src/world_entities/mount_point.h

@@ -12 +12 @@
 
   public:
-    MountPoint ();
+    MountPoint (const Vector& up, const Vector& forward, const Vector& center, const std::string& name);
     MountPoint(const TiXmlElement* root);
     virtual ~MountPoint ();
@@ -32 +32 @@
   private:
     WorldEntity*         _mount;       //!< the entity mounted at this mount point
+    std::string          _name;        //!< the name of the mount point
 
 };

branches/mount_points/src/world_entities/world_entity.cc

@@ -207 +207 @@
       {
         this->setModel(model, modelNumber);
-        if( modelNumber == 0 /* FIXME && !this->isA(CL_WEAPON) */)
+        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);
       }
       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
@@ -269 +269 @@
  * @param fileName the name of the file
  */
-void WorldEntity::loadObjectInformationFile(const std::string& fileName)
+void WorldEntity::loadMountPoints(const std::string& fileName)
 {
   PRINTF(4)("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();
+
+  // 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);
+  }
+
+  // now load the object information file
   this->oiFile = new ObjectInformationFile(fileName);
+
+
+
 }
 

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 loadObjectInformationFile(const std::string& fileName);
+  void loadMountPoints(const std::string& fileName);
   inline void loadMD2Texture(const std::string& fileName) { this->md2TextureFileName = fileName; }