Changeset 10239 in orxonox.OLD for branches/mount_points/src/lib/graphics/importer/oif

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/lib/graphics/importer/oif

Files:

• object_information_file.cc (modified) (4 diffs)
• object_information_file.h (modified) (2 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: