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

Timestamp:

Sep 22, 2006, 6:55:52 PM (18 years ago)

Author:

bensch

Message:

renaming for namespace-purposes

File:

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

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

@@ -19 +19 @@
 #include "filesys/file.h"
 
-ObjectListDefinition(Resource);
+ObjectListDefinition(NewResource);
 
 
-std::vector<Resource::Type*>    Resource::_resourceTypes;
+std::vector<NewResource::Type*>    NewResource::_resourceTypes;
 
 //! GLOBALS
-Directory Resource::_mainGlobalPath;
-std::vector<Directory>        Resource::_globalPaths;
+Directory NewResource::_mainGlobalPath;
+std::vector<Directory>        NewResource::_globalPaths;
 
 
@@ -32 +32 @@
  * standard constructor
 */
-Resource::Resource (Resource::Type* type)
+NewResource::NewResource (NewResource::Type* type)
     : _pointer(NULL), _type(type)
 {
-  this->registerObject(this, Resource::_objectList);
+  this->registerObject(this, NewResource::_objectList);
 
   if(this->_type->id() == -1)
   {
-    Resource::_resourceTypes.push_back(this->_type);
-    this->_type->setID(Resource::_resourceTypes.size()-1);
+    NewResource::_resourceTypes.push_back(this->_type);
+    this->_type->setID(NewResource::_resourceTypes.size()-1);
   }
 
@@ -48 +48 @@
  * standard deconstructor
  */
-Resource::~Resource ()
+NewResource::~NewResource ()
 {
   // delete what has to be deleted here
@@ -54 +54 @@
 
 
-std::string Resource::locateFile(const std::string& fileName)
+std::string NewResource::locateFile(const std::string& fileName)
 {
   if (File(fileName).exists())
     return fileName;
-  else if ((Resource::_mainGlobalPath+File(fileName)) . exists() )
-    return (Resource::_mainGlobalPath + File(fileName)).name();
+  else if ((NewResource::_mainGlobalPath+File(fileName)) . exists() )
+    return (NewResource::_mainGlobalPath + File(fileName)).name();
 
   return std::string("/home/bensch/svn/orxonox/data/") + fileName;
@@ -66 +66 @@
 
 
-Resource::Pointer* Resource::acquireResource(const std::string& loadString)
+NewResource::Pointer* NewResource::acquireResource(const std::string& loadString)
 {
-  //const Resource::Type* const type = Resource::_resourceTypes[this->_type->id()];
+  //const NewResource::Type* const type = NewResource::_resourceTypes[this->_type->id()];
 
   for (unsigned int i = 0; i < _type->storedResources().size(); ++i)
@@ -79 +79 @@
 }
 
-void Resource::setMainGlobalPath(const Directory& directory)
+void NewResource::setMainGlobalPath(const Directory& directory)
 {
-  Resource::_mainGlobalPath = directory;
-  Resource::_mainGlobalPath.open();
+  NewResource::_mainGlobalPath = directory;
+  NewResource::_mainGlobalPath.open();
 }
 
-void Resource::addGlobalPath(const Directory& directory)
+void NewResource::addGlobalPath(const Directory& directory)
 {
-  std::vector<Directory>::const_iterator it = std::find(Resource::_globalPaths.begin(), Resource::_globalPaths.end(), directory);
-  if (it == Resource::_globalPaths.end())
-    Resource::_globalPaths.push_back(directory);
+  std::vector<Directory>::const_iterator it = std::find(NewResource::_globalPaths.begin(), NewResource::_globalPaths.end(), directory);
+  if (it == NewResource::_globalPaths.end())
+    NewResource::_globalPaths.push_back(directory);
 }
 
 
 
-void Resource::addResource(Resource::Pointer* pointer)
+void NewResource::addResource(NewResource::Pointer* pointer)
 {
   this->_type->addResource(pointer);
@@ -108 +108 @@
 
 
-void Resource::KeepLevel::setKeepLevelName(unsigned int level, const std::string& name)
+void NewResource::KeepLevel::setKeepLevelName(unsigned int level, const std::string& name)
 {
   if (_keepLevelName.size() <= level)
@@ -117 +117 @@
 
 
-void Resource::Type::addResource(Resource::Pointer* resource)
+void NewResource::Type::addResource(NewResource::Pointer* resource)
 {
   this->_storedResources.push_back(resource);
@@ -124 +124 @@
 
 
-Resource::Pointer::Pointer(const std::string& loadString, const Resource::KeepLevel& keeplevel)
+NewResource::Pointer::Pointer(const std::string& loadString, const NewResource::KeepLevel& keeplevel)
   : _loadString(loadString), _keepLevel(keeplevel)
 {}
 
 
-void Resource::Type::setID(int id)
+void NewResource::Type::setID(int id)
 {
   this->_id = id;