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

Timestamp:

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

Author:

bensch

Message:

renaming for namespace-purposes

Location:

branches/new_class_id/src/lib/graphics/importer

Files:

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

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

@@ -6 +6 @@
 
 ResourceTexture::ResourceTexture(const std::string& imageName, GLenum target)
-    : Resource(&ResourceTexture::type)
+    : NewResource(&ResourceTexture::type)
 {
-  Resource::Pointer* ptr = this->acquireResource(imageName + ',' + "TEST");
+  NewResource::Pointer* ptr = this->acquireResource(imageName + ',' + "TEST");
 
   if (ptr)
@@ -18 +18 @@
   {
     printf("NOT FOUNT TEXTURE: %s\n", imageName.c_str());
-    std::string fileName = this->Resource::locateFile(imageName);
+    std::string fileName = this->NewResource::locateFile(imageName);
     this->Texture::loadImage(fileName, target);
-    this->Resource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + "TEST", KeepLevel(), this->Texture::dataPointer()));
+    this->NewResource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + "TEST", KeepLevel(), this->Texture::dataPointer()));
   }
 }
 
 
-Resource::Type ResourceTexture::type(Texture::staticClassID());
+NewResource::Type ResourceTexture::type(Texture::staticClassID());
 
 
@@ -31 +31 @@
 
 
-ResourceTexture::TextureResourcePointer::TextureResourcePointer(const std::string& loadString, const Resource::KeepLevel& keepLevel, const TextureData::Pointer& data)
-    : Resource::Pointer(loadString, keepLevel) , pointer(data)
+ResourceTexture::TextureResourcePointer::TextureResourcePointer(const std::string& loadString, const NewResource::KeepLevel& keepLevel, const TextureData::Pointer& data)
+    : NewResource::Pointer(loadString, keepLevel) , pointer(data)
 {}
 

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

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