Changeset 9800 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/resource.cc

Timestamp:

Sep 24, 2006, 12:12:14 PM (18 years ago)

Author:

bensch

Message:

namespaces

File:

• branches/new_class_id/src/lib/util/loading/resource.cc (modified) (2 diffs)

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

@@ -21 +21 @@
 #include "debug.h"
 
-ObjectListDefinition(NewResource);
+
+namespace Resources
+{
+  ObjectListDefinition(NewResource);
 
 
-/**
- * standard constructor
-*/
-NewResource::NewResource (Resources::Type* type)
-    : _pointer(NULL), _type(type)
-{
-  this->registerObject(this, NewResource::_objectList);
-}
+  /**
+   * standard constructor
+  */
+  NewResource::NewResource (Type* type)
+      : _pointer(NULL), _type(type)
+  {
+    this->registerObject(this, NewResource::_objectList);
+  }
 
-/**
- * standard deconstructor
- */
-NewResource::~NewResource ()
-{
-  // delete what has to be deleted here
-}
+  /**
+   * standard deconstructor
+   */
+  NewResource::~NewResource ()
+  {
+    // delete what has to be deleted here
+  }
 
 
-std::string NewResource::locateFile(const std::string& fileName) const
-{
-  if ((NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).exists() )
+  std::string NewResource::locateFile(const std::string& fileName) const
+  {
+    if ((NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).exists() )
+      return (NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).name();
+
+    std::string locatedFile;
+    locatedFile = locateFileInSubDir(NewResourceManager::getInstance()->mainGlobalPath(), fileName);
+    if (!locatedFile.empty())
+    {
+      printf("FILE found %s\n", locatedFile.c_str());
+      return locatedFile;
+    }
+
+    if (File(fileName).exists())
+      return fileName;
+
     return (NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).name();
-
-  std::string locatedFile;
-  locatedFile = locateFileInSubDir(NewResourceManager::getInstance()->mainGlobalPath(), fileName);
-  if (!locatedFile.empty())
-  {
-    printf("FILE found %s\n", locatedFile.c_str());
-    return locatedFile;
   }
 
-  if (File(fileName).exists())
-    return fileName;
-
-  return (NewResourceManager::getInstance()->mainGlobalPath() + File(fileName)).name();
-}
-
-/**
- * @brief tests in all the SubDirectories defined in Resource under Directory if the fileName exists.
- * @param directory the directory to in what to search for all subdirectories for.
- * @param fileName the Name of the File to query for
- * @return true on success.
- */
-std::string NewResource::locateFileInSubDir(const Directory& directory, const std::string& fileName) const
-{
-  std::vector<Directory>::const_iterator it;
-  for (it = this->_type->resourceSubPaths().begin(); it != this->_type->resourceSubPaths().end(); ++it)
+  /**
+   * @brief tests in all the SubDirectories defined in Resource under Directory if the fileName exists.
+   * @param directory the directory to in what to search for all subdirectories for.
+   * @param fileName the Name of the File to query for
+   * @return true on success.
+   */
+  std::string NewResource::locateFileInSubDir(const Directory& directory, const std::string& fileName) const
   {
-    Directory dir = directory + (*it);
-    File file = dir + File(fileName);
-    printf("Testing %s (from %s in directory %s)\n", file.name().c_str(), fileName.c_str(), dir.name().c_str());
-    if ((dir+ File(fileName)).exists())
-      return (dir+File(fileName)).name();
+    std::vector<Directory>::const_iterator it;
+    for (it = this->_type->resourceSubPaths().begin(); it != this->_type->resourceSubPaths().end(); ++it)
+    {
+      Directory dir = directory + (*it);
+      File file = dir + File(fileName);
+      printf("Testing %s (from %s in directory %s)\n", file.name().c_str(), fileName.c_str(), dir.name().c_str());
+      if ((dir+ File(fileName)).exists())
+        return (dir+File(fileName)).name();
+    }
+    return "";
   }
-  return "";
-}
 
 
 
-Resources::StorePointer* NewResource::acquireResource(const std::string& loadString)
-{
-  //const Resources::Type* const type = Resources::_resourceTypes[this->_type->id()];
+  StorePointer* NewResource::acquireResource(const std::string& loadString)
+  {
+    //const Type* const type = _resourceTypes[this->_type->id()];
 
-  for (unsigned int i = 0; i < _type->storedResources().size(); ++i)
-  {
-    if (_type->storedResources()[i]->loadString() == loadString)
-      return _type->storedResources()[i];
+    for (unsigned int i = 0; i < _type->storedResources().size(); ++i)
+    {
+      if (_type->storedResources()[i]->loadString() == loadString)
+        return _type->storedResources()[i];
+    }
+
+    return NULL;
   }
 
-  return NULL;
-}
 
-
-void NewResource::addResource(Resources::StorePointer* pointer)
-{
-  this->_type->addResource(pointer);
-}
+  void NewResource::addResource(StorePointer* pointer)
+  {
+    this->_type->addResource(pointer);
+  }
 
 
@@ -107 +110 @@
 
 
-///////////////////
-//// KEEPLEVEL ////
-///////////////////
-Resources::KeepLevel::KeepLevel(const std::string& keepLevelName)
-{
-  this->_keepLevel = NewResourceManager::getInstance()->getKeepLevelID(keepLevelName);
-}
+  ///////////////////
+  //// KEEPLEVEL ////
+  ///////////////////
+  KeepLevel::KeepLevel(const std::string& keepLevelName)
+  {
+    this->_keepLevel = NewResourceManager::getInstance()->getKeepLevelID(keepLevelName);
+  }
 
-const std::string& Resources::KeepLevel::name() const
-{
-  return NewResourceManager::getInstance()->getKeepLevelName(this->_keepLevel);
-}
+  const std::string& KeepLevel::name() const
+  {
+    return NewResourceManager::getInstance()->getKeepLevelName(this->_keepLevel);
+  }
 
 
 
-///////////////////////
-//// STORE POINTER ////
-///////////////////////
-Resources::StorePointer::StorePointer(const std::string& loadString, const Resources::KeepLevel& keeplevel)
-  : _loadString(loadString), _keepLevel(keeplevel)
-{}
+  ///////////////////////
+  //// STORE POINTER ////
+  ///////////////////////
+  StorePointer::StorePointer(const std::string& loadString, const KeepLevel& keeplevel)
+      : _loadString(loadString), _keepLevel(keeplevel)
+  {}
 
 
 
 
-//////////////
-//// TYPE ////
-//////////////
-Resources::Type::Type(const std::string& typeName)
-    : _id(-1), _typeName(typeName)
-{
-  NewResourceManager::getInstance()->registerType(this);
-  PRINTF(4)("Created ResourceType '%s'\n", typeName.c_str());
-}
+  //////////////
+  //// TYPE ////
+  //////////////
+  Type::Type(const std::string& typeName)
+      : _id(-1), _typeName(typeName)
+  {
+    NewResourceManager::getInstance()->registerType(this);
+    PRINTF(4)("Created ResourceType '%s'\n", typeName.c_str());
+  }
 
-Resources::Type::~Type()
-{
-  NewResourceManager::getInstance()->unregisterType(this);
-}
+  Type::~Type()
+  {
+    NewResourceManager::getInstance()->unregisterType(this);
+  }
 
-void Resources::Type::addResource(Resources::StorePointer* resource)
-{
-  this->_storedResources.push_back(resource);
+  void Type::addResource(StorePointer* resource)
+  {
+    this->_storedResources.push_back(resource);
 
-}
+  }
 
-bool Resources::Type::addResourcePath(const std::string& path)
-{
-  std::vector<Directory>::const_iterator it;
-  for (it = this->_resourcePaths.begin(); it != this->_resourcePaths.end(); ++it)
-    if ((*it) == path)
-      return false;
-  this->_resourcePaths.push_back(path);
-  return true;
+  bool Type::addResourcePath(const std::string& path)
+  {
+    std::vector<Directory>::const_iterator it;
+    for (it = this->_resourcePaths.begin(); it != this->_resourcePaths.end(); ++it)
+      if ((*it) == path)
+        return false;
+    this->_resourcePaths.push_back(path);
+    return true;
 
-}
+  }
 
-bool Resources::Type::addResourceSubPath(const std::string& subPath)
-{
-  std::vector<Directory>::const_iterator it;
-  for (it = this->_resourceSubPaths.begin(); it != this->_resourceSubPaths.end(); ++it)
-    if ((*it) == subPath)
-      return false;
-  this->_resourceSubPaths.push_back(subPath);
-  return true;
-}
+  bool Type::addResourceSubPath(const std::string& subPath)
+  {
+    std::vector<Directory>::const_iterator it;
+    for (it = this->_resourceSubPaths.begin(); it != this->_resourceSubPaths.end(); ++it)
+      if ((*it) == subPath)
+        return false;
+    this->_resourceSubPaths.push_back(subPath);
+    return true;
+  }
 
 
-void Resources::Type::setID(int id)
-{
-  this->_id = id;
-}
+  void Type::setID(int id)
+  {
+    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:");
-  for (unsigned int i = 0; i < this->_resourceSubPaths.size(); ++i)
-    PRINT(0)(" '%s'", this->_resourceSubPaths[i].name().c_str());
-  PRINT(0)("\n");
+  void 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:");
+    for (unsigned int i = 0; i < this->_resourceSubPaths.size(); ++i)
+      PRINT(0)(" '%s'", this->_resourceSubPaths[i].name().c_str());
+    PRINT(0)("\n");
 
+  }
 }