Changeset 10243 in orxonox.OLD for branches/mount_points/src/lib/graphics

Timestamp:

Jan 17, 2007, 12:26:26 AM (18 years ago)

Author:

patrick

Message:

still on this resource thingy

Location:

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

Files:

• object_information_file.cc (modified) (5 diffs)
• object_information_file.h (modified) (1 diff)
• resource_oif.cc (modified) (1 diff)

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

@@ -30 +30 @@
 OIFData::OIFData()
 {
+  PRINTF(0)("OIFDATA NEW (default)\n");
   this->_root = NULL;
 }
@@ -40 +41 @@
 OIFData::OIFData(const std::string& fileName)
 {
-  this->_root = NULL;
-
+  PRINTF(0)("OIFDATA NEW\n");
   this->load(fileName);
 }
@@ -52 +52 @@
 void OIFData::load(const std::string& fileName)
 {
-  PRINTF(0)("loading |%s| as oif data\n", fileName.c_str());
+  this->_root = NULL;
+
   if( fileName.empty())
   {
-    PRINTF(0)("No filename specified for object information loading");
+    PRINTF(3)("No filename specified for object information loading");
     return;
   }
@@ -64 +65 @@
   {
     // report an error
-    PRINTF(0)("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;
   }
@@ -72 +73 @@
   assert( this->_root != NULL);
 
+  PRINTF(0)("%s\n\n\n", this->_root->Value());
   if( strcmp( this->_root->Value(), "ObjectInformationFile"))
   {
     // report an error
-    PRINTF(0)("Specified XML File is not an orxonox object information file (<ObjectInformationFile> element missing)\n");
+    PRINTF(3)("Specified XML File is not an orxonox object information file (<ObjectInformationFile> element missing)\n");
     return;
   }
-  PRINTF(0)("OIF loaded\n");
-
 }
 

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

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

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

@@ -29 +29 @@
   if (ptr)
   {
-    PRINTF(0)("FOUND OIF: %s\n", fileName.c_str());
+    PRINTF(5)("FOUND OIF: %s\n", fileName.c_str());
     this->acquireData(static_cast<ResourceOIF::OIFResourcePointer*>(ptr)->ptr());
   }
   else
   {
-    PRINTF(0)("NOT FOUND OIF: %s\n", fileName.c_str());
+    PRINTF(5)("NOT FOUND OIF: %s\n", fileName.c_str());
     std::string fullName = this->Resource::locateFile(fileName);
-    PRINTF(0)("trying loading of: %s\n", fullName.c_str());
+    PRINTF(5)("trying loading of: %s\n", fullName.c_str());
     this->load(fullName);
     this->Resource::addResource(new ResourceOIF::OIFResourcePointer(fileName, keepLevel, this->ObjectInformationFile::dataPointer()));