Changeset 10239 in orxonox.OLD for branches

Timestamp:

Jan 16, 2007, 10:52:55 PM (18 years ago)

Author:

patrick

Message:

found a bug in the object information resources file. fixed

Location:

branches/mount_points/src

Files:

• lib/graphics/importer/oif/object_information_file.cc (modified) (4 diffs)
• lib/graphics/importer/oif/object_information_file.h (modified) (2 diffs)
• world_entities/mount_point.cc (modified) (6 diffs)
• world_entities/world_entity.cc (modified) (4 diffs)

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

@@ -22 +22 @@
 #include "util/loading/factory.h"
 #include "util/loading/load_param_xml.h"
+
+
+
+/**
+ * constructor
+ */
+OIFData::OIFData()
+{}
 
 
@@ -70 +78 @@
 
 
-
 /**
- * standard constructor
+ * constructor
+ * @param fileName name of the file
  */
 ObjectInformationFile::ObjectInformationFile()
+  : data(new OIFData())
 {
   this->init();
@@ -105 +114 @@
 
 /**
+ * the definition of the assignment operator
+ * @param oif
+ * @return
+ */
+ObjectInformationFile& ObjectInformationFile::operator=(const ObjectInformationFile& oif)
+{
+  this->init();
+  this->data = oif.data;
+
+  return *this;
+}
+
+/**
  * initizlizing function
  */
@@ -122 +144 @@
 
 
-
-ObjectInformationFile& ObjectInformationFile::operator=(const ObjectInformationFile& oif)
-{
-  this->data = oif.data;
-  return *this;
-}
-
-
 /**
  * this initializes the mount point

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

@@ -20 +20 @@
 
 public:
+  OIFData();
   OIFData(const std::string& fileName);
   virtual ~OIFData() {}
@@ -44 +45 @@
   ObjectInformationFile& operator=(const ObjectInformationFile& oif);
 
-//   void initMountPoint(MountPoint* mountPoint);
+  /** @returns a reference to the xml oif file */
+  inline const TiXmlElement* getMountPointDescription() { return this->data->root(); }
+
 
   private:

branches/mount_points/src/world_entities/mount_point.cc

@@ -10 +10 @@
 
    ### File Specific
-   main-programmer: Patrick Boenzli patrick@orxonox.net
+   main-programmer: Patrick Boenzli, patrick@orxonox.net
    co-programmer:
 */
@@ -27 +27 @@
 
 ObjectListDefinition(MountPoint);
-CREATE_FACTORY(MountPoint);
 
 
@@ -106 +105 @@
 void MountPoint::loadParam(const TiXmlElement* root)
 {
-   LoadParam(root, "description", this, WorldEntity, setDescription)
-    .describe("Sets this mount point a description");
+  // first check for the description
+  LoadParam(root, "Description", this, MountPoint, setDescription)
+  .describe("Sets this mount point a description");
 
-
-   LoadParam(root, "OrxClass", this, WorldEntity, setOrxClass)
-    .describe("Sets the class this mount points should host");
+  // now check for the orx class to create
+  LoadParam(root, "OrxClass", this, MountPoint, setOrxClass)
+  .describe("Sets the class this mount points should host");
 }
 
@@ -134 +134 @@
 {
   // create the object for this mount point
-  this->_mount = Factory::fabricate(orxClass);
+  BaseObject* obj = Factory::fabricate(orxClass);
   // check if the object is created correctly
-  if( this->_mount == NULL)
+  if( this->_mount != NULL)
+  {
+    if( obj->isA( WorldEntity::staticClassID()))
+    {
+      this->_mount = dynamic_cast<WorldEntity*>(obj);
+    }
+  }
+  else
     PRINTF(1)("Couldn't create %s for this mount point (%s)\n", orxClass.c_str(), this->_name.c_str());
 }
@@ -149 +156 @@
 {
 
-
 }
 
@@ -158 +164 @@
 void MountPoint::draw() const
 {
-
 }
 

branches/mount_points/src/world_entities/world_entity.cc

@@ -12 +12 @@
 
    ### File Specific:
-   main-programmer: Patrick Boenzli, Benjamin Grauer
-   co-programmer: Christian Meier
+   main-programmer: Patrick Boenzli
+   main-programmer: Benjamin Grauer
+   co-programmer:   Christian Meier
 */
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
@@ -73 +74 @@
   this->scaling = 1.0f;
   this->oiFile = NULL;
+  // add 10 members to this array
+  this->mountPoints.reserve(10);
 
   /* OSOLETE */
@@ -298 +301 @@
 
     // now fill the mount point
-    this->oiFile->initMountPoint(mp);
+    mp->initMountPoint( this->oiFile->getMountPointDescription());
   }
 
@@ -364 +367 @@
 void WorldEntity::addMountPoint(int slot, MountPoint* mountPoint)
 {
-  if( this->mountPoints[slot] != NULL)
-  {
-    PRINTF(0)("adding a mount point to a slot, that already is occupied! ignoring - maybe some object do not get connected well (object: %s)\n", this->getClassCName());
+  if( this->mountPoints.capacity() < (unsigned int)slot)
+  {
+    // reserve 5 more slots than needed so this function is called as rare as possible
+    this->mountPoints.reserve(slot + 5);
+  }
+  else if( this->mountPoints[slot] != NULL)
+  {
+    PRINTF(0)("adding a mount point to a slot, that already is occupied! ignoring - maybe some object did not get connected well (object: %s)\n", this->getClassCName());
   }