Changeset 9793 in orxonox.OLD for branches/new_class_id

Timestamp:

Sep 23, 2006, 3:48:03 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: storing works better now

Location:

branches/new_class_id/src

Files:

• lib/graphics/importer/resource_texture.cc (modified) (1 diff)
• lib/util/loading/new_resource_manager.cc (modified) (2 diffs)
• lib/util/loading/resource.cc (modified) (3 diffs)
• lib/util/loading/resource.h (modified) (1 diff)
• orxonox.cc (modified) (2 diffs)

branches/new_class_id/src/lib/graphics/importer/resource_texture.cc

@@ -1 @@
-
 
 #include "resource_texture.h"

branches/new_class_id/src/lib/util/loading/new_resource_manager.cc

@@ -64 +64 @@
     type->setID(this->_resourceTypes.size());
     this->_resourceTypes.push_back(type);
+    PRINTF(5)("ResourceType '%s' with ID %d added\n", type->storedClassName().c_str(), type->id());
   }
 }
@@ -113 +114 @@
   std::vector<Resources::Type*>::const_iterator it;
   for (it = this->_resourceTypes.begin(); it != this->_resourceTypes.end(); ++it)
-    PRINT(0)("ResourceType '%s'\n", (*it)->storedClassName().c_str());
+    (*it)->debug();
 
   PRINT(0)("==================================RM==\n");

branches/new_class_id/src/lib/util/loading/resource.cc

@@ -49 +49 @@
     return (NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).name();
 
-  printf("LOCATED %s\n", locateFileInSubDir(Directory("/home/bensch/svn/orxonox/data/"), fileName).c_str());
-
+  std::string locatedFile;
+  locatedFile = locateFileInSubDir(Directory("/home/bensch/svn/orxonox/data/"), fileName);
+  if (!locatedFile.empty())
+  {
+    printf("FILE found %s\n", locatedFile.c_str());
+    return locatedFile;
+  }
   return std::string("/home/bensch/svn/orxonox/data/") + fileName;
 }
@@ -129 +134 @@
 {
   NewResourceManager::getInstance()->registerType(this);
+  printf("%s\n", typeName.c_str());
 }
 
@@ -163 +169 @@
   this->_id = id;
 }
+
+
+void Resources::Type::debug() const
+{
+  PRINT(0)(" ResourceType '%s' with ID %d stores %d Resources\n", this->_typeName.c_str(), this->_id, this->_storedResources.size());
+  PRINT(0)("  Paths:\n");
+  for (unsigned int i = 0; i < this->_resourcePaths.size(); ++i)
+    PRINT(0)("    %s\n", this->_resourcePaths[i].name().c_str());
+  PRINT(0)("  Sub-Paths:\n");
+  for (unsigned int i = 0; i < this->_resourceSubPaths.size(); ++i)
+    PRINT(0)("    %s\n", this->_resourceSubPaths[i].name().c_str());
+
+}

branches/new_class_id/src/lib/util/loading/resource.h

@@ -62 +62 @@
     void addResource(Resources::StorePointer* resource);
 
+    void debug() const;
+
   private:
     int                             _id;
-    const std::string&              _typeName;
+    const std::string               _typeName;
     std::vector<Directory>          _resourcePaths;
     std::vector<Directory>          _resourceSubPaths;

branches/new_class_id/src/orxonox.cc

@@ -364 +364 @@
     delete gui;
     ResourceManager::getInstance()->setDataDir(Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""));
-
   }
 
@@ -371 +370 @@
   NewResourceManager::getInstance()->addResourceSubPath("Texture", "pictures");
 
+  NewResourceManager::getInstance()->debug();
   //  DynamicLoader::loadDyLib("libtest.so");
   return 0;