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

Timestamp:

Sep 22, 2006, 6:38:28 PM (18 years ago)

Author:

bensch

Message:

ResourceLoading is working perfectly.

File:

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

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

@@ -61 +61 @@
     return (Resource::_mainGlobalPath + File(fileName)).name();
 
-
   return std::string("/home/bensch/svn/orxonox/data/") + fileName;
 
@@ -72 +71 @@
 
   for (unsigned int i = 0; i < _type->storedResources().size(); ++i)
-    if (_type->storedResources()[i]->_pointer->loadString() == loadString)
-      return _type->storedResources()[i]->_pointer;
+  {
+    printf("Compare %s with %s\n", _type->storedResources()[i]->loadString().c_str(), loadString.c_str());
+    if (_type->storedResources()[i]->loadString() == loadString)
+      return _type->storedResources()[i];
+  }
 
   return NULL;
@@ -94 +96 @@
 
 void Resource::addResource(Resource::Pointer* pointer)
-{}
+{
+  this->_type->addResource(pointer);
+}
 
 
@@ -114 +118 @@
 
 
+void Resource::Type::addResource(Resource::Pointer* resource)
+{
+  this->_storedResources.push_back(resource);
 
-
-
-
-
+}
 
 
 Resource::Pointer::Pointer(const std::string& loadString, const Resource::KeepLevel& keeplevel)
-{
-}
+  : _loadString(loadString), _keepLevel(keeplevel)
+{}
+
 
 void Resource::Type::setID(int id)