Changeset 9792 in orxonox.OLD for branches

Timestamp:

Sep 23, 2006, 2:36:57 PM (18 years ago)

Author:

bensch

Message:

removed dependency from ClassID

Location:

branches/new_class_id/src/lib

Files:

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

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

@@ -25 +25 @@
 
 
-Resources::Type ResourceTexture::type(Texture::staticClassID());
+Resources::Type ResourceTexture::type("Texture");
 
 

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

@@ -113 +113 @@
   std::vector<Resources::Type*>::const_iterator it;
   for (it = this->_resourceTypes.begin(); it != this->_resourceTypes.end(); ++it)
-    PRINT(0)("ResourceType '%s'\n", (*it)->storedClassID().name().c_str());
+    PRINT(0)("ResourceType '%s'\n", (*it)->storedClassName().c_str());
 
   PRINT(0)("==================================RM==\n");

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

@@ -125 +125 @@
 //// TYPE ////
 //////////////
-Resources::Type::Type(const ClassID& classID)
-    : _id(-1), _classID(classID)
+Resources::Type::Type(const std::string& typeName)
+    : _id(-1), _typeName(typeName)
 {
   NewResourceManager::getInstance()->registerType(this);

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

@@ -44 +44 @@
   {
   public:
-    Type(const ClassID& classID);
-    bool operator==(const ClassID& classID) const { return this->_classID == classID; };
-    bool operator==(const std::string& resourceName) const { return this->_classID.name() == resourceName; };
+    Type(const std::string& typeName);
+    bool operator==(const std::string& resourceName) const { return this->_typeName == resourceName; };
 
     void addExtension(const std::string& extension);
@@ -54 +53 @@
 
     /// Retrieve Functions
-    const ClassID& storedClassID() const { return _classID; };
+    const std::string& storedClassName() const { return _typeName; };
     int id() const { return _id; };
     const std::vector<Directory>& resourcePaths() const { return _resourcePaths; };
@@ -65 +64 @@
   private:
     int                             _id;
-    const ClassID&                  _classID;
+    const std::string&              _typeName;
     std::vector<Directory>          _resourcePaths;
     std::vector<Directory>          _resourceSubPaths;