Changeset 10228 in orxonox.OLD for branches

Timestamp:

Jan 10, 2007, 6:34:01 PM (18 years ago)

Author:

patrick

Message:

some more work on the mounting points. should soon be finished

Location:

branches/mount_points/src

Files:

• lib/graphics/importer/oif/object_information_file.cc (modified) (3 diffs)
• lib/graphics/importer/oif/object_information_file.h (modified) (2 diffs)
• story_entities/game_world.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (3 diffs)
• world_entities/world_entity.h (modified) (1 diff)

branches/mount_points/src/lib/graphics/importer/oif/object_information_file.cc

@@ -57 +57 @@
 
   // check basic validity
-  TiXmlElement* root = XMLDoc.RootElement();
-  assert( root != NULL);
+  this->_root = XMLDoc.RootElement();
+  assert( this->_root != NULL);
 
-  if( strcmp( root->Value(), "ObjectInformationFile"))
+  if( strcmp( this->_root->Value(), "ObjectInformationFile"))
   {
     // report an error
@@ -67 +67 @@
   }
 
-  // construct campaign
-//   return new Campaign( root);
 }
 
@@ -132 +130 @@
 
 
+/**
+ * this initializes the mount point
+ * @param mountPoint to be initialized
+ */
+// void ObjectInformationFile::initMountPoint(MountPoint* mountPoint)
+// {
+//   TiXmlElement* root = this->data->root();
+//
+// }
 

branches/mount_points/src/lib/graphics/importer/oif/object_information_file.h

@@ -25 +25 @@
   void load(const std::string& fileName);
 
+  inline TiXmlElement* root() { return this->_root; }
+
 
 private:
-
+  TiXmlElement* _root;           //!< root of the xml file
 };
 
@@ -42 +44 @@
   ObjectInformationFile& operator=(const ObjectInformationFile& oif);
 
+//   void initMountPoint(MountPoint* mountPoint);
+
   private:
     void init();

branches/mount_points/src/story_entities/game_world.cc

@@ -543 +543 @@
   ObjectManager::EntityList::const_iterator entity;
   for (entity = drawList.begin(); entity != drawList.end(); entity++)
+  {
     if ((*entity)->isVisible())
       (*entity)->draw();
+
+    if( unlikely( this->showMPV))
+      (*entity)->debugDrawMountPoints();
+  }
 }
 
@@ -668 +673 @@
     }
 
+
     if( unlikely(this->showPNodes))
       PNode::getNullParent()->debugDraw(0);

branches/mount_points/src/world_entities/world_entity.cc

@@ -276 +276 @@
 void WorldEntity::loadMountPoints( Model* model, const std::string& fileName)
 {
-  PRINTF(0)("loading the oif File: %s\n", fileName.c_str());
+  PRINTF(4)("loading the oif File: %s\n", fileName.c_str());
+
+  // now load the object information file
+  this->oiFile = new ObjectInformationFile(fileName);
 
   // extract the mount points
@@ -291 +294 @@
     // now get the number and add the mount point to the slot
     std::string nrStr = (*it).name.substr(3, 2);
+    // add the mount point
     this->addMountPoint(atoi(nrStr.c_str()), mp);
-  }
-
-  // now load the object information file
-  this->oiFile = new ObjectInformationFile(fileName);
+
+    // now fill the mount point
+    this->oiFile->initMountPoint(mp);
+  }
 
 }
@@ -817 +821 @@
 
 
+
+/**
+ * draw the mounting points
+ */
+void WorldEntity::debugDrawMountPoints() const
+{
+
+  std::vector<MountPoint*>::const_iterator it = this->mountPoints.begin();
+  for( ; it < this->mountPoints.end(); it++)
+  {
+    if( (*it) != NULL)
+    {
+      (*it)->debugDraw();
+    }
+  }
+}
+
+
 /**
  * Debug the WorldEntity

branches/mount_points/src/world_entities/world_entity.h

@@ -73 +73 @@
   virtual void tick (float time);
   virtual void draw () const;
+  void debugDrawMountPoints() const;
 
   /* --- Collision Detection Block  --- */