Changeset 9791 in orxonox.OLD for branches/new_class_id/src/lib/graphics/importer

Timestamp:

Sep 23, 2006, 11:10:04 AM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: resourceManager splitted away

Location:

branches/new_class_id/src/lib/graphics/importer

Files:

• resource_texture.cc (modified) (3 diffs)
• resource_texture.h (modified) (2 diffs)

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

@@ -8 +8 @@
     : NewResource(&ResourceTexture::type)
 {
-  NewResource::StorePointer* ptr = this->acquireResource(imageName + ',' + "TEST");
+  Resources::StorePointer* ptr = this->acquireResource(imageName + ',' + "TEST");
 
   if (ptr)
@@ -20 +20 @@
     std::string fileName = this->NewResource::locateFile(imageName);
     this->Texture::loadImage(fileName, target);
-    this->NewResource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + "TEST", KeepLevel(0), this->Texture::dataPointer()));
+    this->NewResource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + "TEST", Resources::KeepLevel(0), this->Texture::dataPointer()));
   }
 }
 
 
-NewResource::Type ResourceTexture::type(Texture::staticClassID());
+Resources::Type ResourceTexture::type(Texture::staticClassID());
 
 
@@ -31 +31 @@
 
 
-ResourceTexture::TextureResourcePointer::TextureResourcePointer(const std::string& loadString, const NewResource::KeepLevel& keepLevel, const TextureData::Pointer& data)
-    : NewResource::StorePointer(loadString, keepLevel) , pointer(data)
+ResourceTexture::TextureResourcePointer::TextureResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const TextureData::Pointer& data)
+    : Resources::StorePointer(loadString, keepLevel) , pointer(data)
 {}
 

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

@@ -19 +19 @@
 
 private:
-class TextureResourcePointer : public NewResource::StorePointer
+class TextureResourcePointer : public Resources::StorePointer
   {
   public:
-    TextureResourcePointer(const std::string& loadString, const NewResource::KeepLevel& keepLevel, const TextureData::Pointer& data);
+    TextureResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const TextureData::Pointer& data);
     inline const TextureData::Pointer& ptr() const { return pointer; }
   private:
@@ -29 +29 @@
 
 private:
-  static NewResource::Type type;
+  static Resources::Type type;
 };