Changeset 10245 in orxonox.OLD

Timestamp:

Jan 17, 2007, 1:08:54 AM (18 years ago)

Author:

patrick

Message:

now it works:D

Location:

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

Files:

• object_information_file.cc (modified) (6 diffs)
• object_information_file.h (modified) (1 diff)

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

@@ -41 +41 @@
 OIFData::OIFData(const std::string& fileName)
 {
-  PRINTF(0)("OIFDATA NEW\n");
+  PRINTF(0)("OIFDATA NEW %s\n", fileName.c_str());
+  this->_root = NULL;
   this->load(fileName);
+}
+
+
+OIFData::~OIFData()
+{
+  if( this->_root)
+    delete this->_root;
 }
 
@@ -52 +60 @@
 void OIFData::load(const std::string& fileName)
 {
-  this->_root = NULL;
-
   if( fileName.empty())
   {
@@ -60 +66 @@
   }
 
-  TiXmlDocument XMLDoc(fileName);
+  TiXmlDocument* XMLDoc = new TiXmlDocument(fileName);
   // load the campaign document
-  if( !XMLDoc.LoadFile(fileName))
+  if( !XMLDoc->LoadFile(fileName))
   {
     // report an error
-    PRINTF(3)("Could not load XML File %s: %s @ %d:%d\n", fileName.c_str(), XMLDoc.ErrorDesc(), XMLDoc.ErrorRow(), XMLDoc.ErrorCol());
+    PRINTF(3)("Could not load XML File %s: %s @ %d:%d\n", fileName.c_str(), XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
     return;
   }
 
   // check basic validity
-  this->_root = XMLDoc.RootElement();
+  this->_root = XMLDoc->RootElement();
   assert( this->_root != NULL);
 
-  PRINTF(0)("%s\n\n\n", this->_root->Value());
   if( strcmp( this->_root->Value(), "ObjectInformationFile"))
   {
@@ -80 +85 @@
     return;
   }
+
+//   this->initMountPoint( this->_root);
 }
 
@@ -88 +95 @@
  */
 ObjectInformationFile::ObjectInformationFile()
-  : data(new OIFData())
+  : data(new OIFData)
 {
   this->init();
@@ -142 +149 @@
 void ObjectInformationFile::load(const std::string& fileName)
 {
+  PRINTF(0)("loading\n");
   this->data = OIFData::Pointer(new OIFData(fileName));
 }

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

@@ -22 +22 @@
   OIFData();
   OIFData(const std::string& fileName);
-  virtual ~OIFData() {}
+  virtual ~OIFData();
 
   void load(const std::string& fileName);
+  void initMountPoint(const TiXmlElement* root);
 
   inline const TiXmlElement* root() { return this->_root; }