Changeset 10241 in orxonox.OLD

Timestamp:

Jan 16, 2007, 11:43:15 PM (18 years ago)

Author:

patrick

Message:

much more on the resources. it's not that simple at all

Location:

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

Files:

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

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

@@ -52 +52 @@
 void OIFData::load(const std::string& fileName)
 {
-  PRINTF(0)("loading %s as oif data\n", fileName.c_str());
-    if( fileName.empty())
+  PRINTF(0)("loading |%s| as oif data\n", fileName.c_str());
+  if( fileName.empty())
   {
-    PRINTF(3)("No filename specified for object information loading");
+    PRINTF(0)("No filename specified for object information loading");
     return;
   }
@@ -64 +64 @@
   {
     // report an error
-    PRINTF(1)("Could not load XML File %s: %s @ %d:%d\n", fileName.c_str(), XMLDoc.ErrorDesc(), XMLDoc.ErrorRow(), XMLDoc.ErrorCol());
+    PRINTF(0)("Could not load XML File %s: %s @ %d:%d\n", fileName.c_str(), XMLDoc.ErrorDesc(), XMLDoc.ErrorRow(), XMLDoc.ErrorCol());
     return;
   }
@@ -75 +75 @@
   {
     // report an error
-    PRINTF(2)("Specified XML File is not an orxonox object information file (<ObjectInformationFile> element missing)\n");
+    PRINTF(0)("Specified XML File is not an orxonox object information file (<ObjectInformationFile> element missing)\n");
     return;
   }
+  PRINTF(0)("OIF loaded\n");
 
 }
@@ -139 +140 @@
 
 
+void ObjectInformationFile::load(const std::string& fileName)
+{
+}
+
+
 /**
  * standard deconstructor

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

@@ -43 +43 @@
   virtual ~ObjectInformationFile();
 
+  void load(const std::string& fileName);
+
   ObjectInformationFile& operator=(const ObjectInformationFile& oif);
 
   /** @returns a reference to the xml oif file */
   inline const TiXmlElement* getMountPointDescription() { return this->data->root(); }
+
+  inline void acquireData(const OIFData::Pointer& data) { this->data = data; }
+  const OIFData::Pointer& dataPointer() const { return this->data; };
+
 
 

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

@@ -26 +26 @@
   Resources::StorePointer* ptr = this->acquireResource(fileName);
 
+
   if (ptr)
   {
-    PRINTF(0)("FOUND OIF: %s\n", fileName.c_str());
-    //this->acquireData(static_cast<ResourceOIF::OIFResourcePointer*>(ptr)->ptr());
+    PRINTF(5)("FOUND OIF: %s\n", fileName.c_str());
+    this->acquireData(static_cast<ResourceOIF::OIFResourcePointer*>(ptr)->ptr());
   }
   else
   {
-    PRINTF(4)("NOT FOUND OIF: %s\n", fileName.c_str());
-//     std::string modelFileName = this->Resource::locateFile(modelName);
-//     //std::string skinFileName = this->Resource::locateFile(skinName);
-//     this->MD2Model::load(modelFileName, skinName, scale);
-//     this->Resource::addResource(new ResourceOIF::OIFResourcePointer(loadString(modelName, skinName, scale), keepLevel, this->MD2Model::dataPointer()));
+    PRINTF(5)("NOT FOUND OIF: %s\n", fileName.c_str());
+    std::string fullName = this->Resource::locateFile(fileName);
+
+    this->ObjectInformationFile::load(fileName);
+    this->Resource::addResource(new ResourceOIF::OIFResourcePointer(fileName, keepLevel, this->ObjectInformationFile::dataPointer()));
   }
 

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

@@ -15 +15 @@
 {
 public:
-  ResourceOIF(const std::string& fileName, const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
+  ResourceOIF(const std::string& fileName,
+              const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
   static ResourceOIF createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel = Resources::KeepLevel());