Changeset 10054 in orxonox.OLD

Timestamp:

Dec 13, 2006, 12:41:36 AM (17 years ago)

Author:

patrick

Message:

further implementation of the oif modules, resource schlacht

Location:

branches/mount_points/src/lib/graphics/importer/oif

Files:

• object_information_file.cc (modified) (2 diffs)
• object_information_file.h (modified) (2 diffs)

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

@@ -31 +31 @@
 
 /**
- *  constructor
- * @todo this constructor is not jet implemented - do it
-*/
+ * constructor
+ * @param fileName name of the file
+ */
 ObjectInformationFile::ObjectInformationFile(const std::string& fileName)
+  : data(new OIFData())
 {
   // load the oif file
   this->data = ResourceOIF(fileName).data;
 
+  this->init();
+}
+
+
+/**
+ * copy constructor
+ * @param oif instance to copy from
+*/
+ObjectInformationFile::ObjectInformationFile(const ObjectInformationFile& oif)
+  :data(oif.data)
+{
+  this->init();
 }
 
@@ -58 +71 @@
   // delete what has to be deleted here
 }
+
+
+
+ObjectInformationFile& ObjectInformationFile::operator=(const ObjectInformationFile& oif)
+{
+  this->data = oif.data;
+  return *this;
+}
+
+
+

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

@@ -19 +19 @@
 
 public:
-  OIFData();
-  virtual ~OIFData();
+  OIFData() {}
+  virtual ~OIFData() {}
 
 
@@ -34 +34 @@
 public:
   ObjectInformationFile();
+  ObjectInformationFile(const ObjectInformationFile& oif);
   ObjectInformationFile(const std::string& fileName);
   virtual ~ObjectInformationFile();
+
+  ObjectInformationFile& operator=(const ObjectInformationFile& oif);
 
   private: