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

Timestamp:

Sep 1, 2006, 11:56:54 PM (18 years ago)

Author:

bensch

Message:

more thoughts on Resources, and soon going to adapt… i think i've got a clue

Location:

branches/new_class_id/src/lib/graphics/importer

Files:

• material.cc (modified) (1 diff)
• material.h (modified) (1 diff)
• texture.cc (modified) (2 diffs)
• texture.h (modified) (2 diffs)
• texture_data.h (modified) (2 diffs)

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

@@ -324 +324 @@
  * @param textureNumber The Texture-Number from 0 to GL_MAX_TEXTURE_UNITS
  */
-void Material::setDiffuseMap(const TextureDataPointer& textureDataPointer, unsigned int textureNumber)
+void Material::setDiffuseMap(const TextureData::Pointer& textureDataPointer, unsigned int textureNumber)
 {
   assert(textureNumber < Material::getMaxTextureUnits());

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

@@ -54 +54 @@
   // MAPPING //
   void setDiffuseMap(const Texture& texture, unsigned int textureNumber = 0);
-  void setDiffuseMap(const TextureDataPointer& texturePointer, unsigned int textureNumber = 0);
+  void setDiffuseMap(const TextureData::Pointer& texturePointer, unsigned int textureNumber = 0);
   void setDiffuseMap(const std::string& dMap, GLenum target = GL_TEXTURE_2D, unsigned int textureNumber = 0);
   void setSDLDiffuseMap(SDL_Surface *surface, GLenum target = GL_TEXTURE_2D, unsigned int textureNumber = 0);

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

@@ -151 +151 @@
   this->registerObject(this, Texture::_objectList);
 
-  this->data = TextureDataPointer(new TextureData());
+  this->data = TextureData::Pointer(new TextureData());
 
   this->priority = 0.5;
@@ -176 +176 @@
 }
 
-Texture& Texture::operator=(const TextureDataPointer& textureDataPointer)
+Texture& Texture::operator=(const TextureData::Pointer& textureDataPointer)
 {
   this->data = textureDataPointer;

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

@@ -29 +29 @@
 
   Texture& operator=(const Texture& texture);
-  Texture& operator=(const TextureDataPointer& textureDataPointer);
+  Texture& operator=(const TextureData::Pointer& textureDataPointer);
 
   virtual ~Texture();
@@ -63 +63 @@
 
 private:
-  TextureDataPointer            data;               //!< The TextureData
+  TextureData::Pointer          data;               //!< The TextureData
   GLclampf                      priority;           //!< the priority of the current texture (used for garphics cards with limited mem)
 

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

@@ -18 +18 @@
 class TextureData
 {
+  public:
+    typedef CountPointer<TextureData> Pointer;
   public:
     TextureData();
@@ -43 +45 @@
 };
 
-typedef CountPointer<TextureData> TextureDataPointer;
-
 #endif /* _TEXTURE_DATA_H */