Changeset 7785 in orxonox.OLD for trunk/src/lib/graphics/importer/texture.h

Timestamp:

May 24, 2006, 3:17:19 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Changes from the water branche back to the trunk.

File:

• trunk/src/lib/graphics/importer/texture.h (modified) (1 diff)

trunk/src/lib/graphics/importer/texture.h

@@ -10 +10 @@
 
 #include "glincl.h"
+#include "count_pointer.h"
 
 /* Forward Declaration */
 struct SDL_Surface;
 
-//! A Class, that reads in Textures from different fileformats.
-  class Texture : public BaseObject
-  {
-    public:
-      Texture(const std::string& imageName = "", GLenum target = GL_TEXTURE_2D);
-  //  Texture(TEXTURE_TYPE type, int resolution);
-      virtual ~Texture();
 
-      bool loadImage(const std::string& imageName, GLenum target = GL_TEXTURE_2D);
-      virtual bool rebuild();
+class TextureData
+{
+  public:
+    TextureData();
+    ~TextureData();
 
-      /** @returns The textureID of this texture.  */
-      inline GLuint getTexture() const { return this->texture; };
-      /** @returns true if texture has alpha, false otherwise */
-      inline bool hasAlpha() const {return bAlpha;}
-      /** @returns the stored image of this Texture */
-      const SDL_Surface* const getStoredImage() const { return this->image; };
+    inline GLuint getTexture() const { return this->texture; };
+    /** @returns true if texture has alpha, false otherwise */
+    inline bool hasAlpha() const  {return this->bAlpha; }
+    /** @returns the stored image of this Texture */
+    const SDL_Surface* const getStoredImage() const { return this->image; };
+
+    bool loadSurface(SDL_Surface* surface, GLenum target = GL_TEXTURE_2D);
 
 
 
-      static void setTextureEnableState(bool texturesEnabled);
-      /** @returns true if Textures are enabled */
-      inline static bool getTextureEnableState() { return Texture::texturesEnabled; };
+    bool rebuild();
 
-      // Utility functionality:
-      SDL_Surface* prepareSurface(SDL_Surface* input, bool& hasAlpha) const;
-      GLuint loadTexToGL (const SDL_Surface* surface, GLenum target = GL_TEXTURE_2D) const;
+    bool setSurface(SDL_Surface* newSurface);
+    bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; };
+    bool setTexture(GLuint texture);
 
-    protected:
-      bool setSurface(SDL_Surface* newSurface);
-      bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; };
-      bool setTexture(GLuint texture) { this->texture = texture; };
+  private:
+    GLuint           texture;            //!< The Texture-ID of opengl from this Texture.
+    bool             bAlpha;             //!< if the texture has an alpha channel.
+    SDL_Surface*     image;              //!< The SDL_Surfce that stores the Texture on it.
+};
 
-    private:
-      GLuint           texture;            //!< The Texture-ID of opengl from this Texture.
-      bool             bAlpha;             //!< if the texture has an alpha channel.
-      SDL_Surface*     image;              //!< The SDL_Surfce that stores the Texture on it.
-      GLclampf         priority;           //!< the priority of the current texture (used for garphics cards with limited mem)
 
-      static bool      texturesEnabled;    //!< If the Textures are enabled.
-  };
+//! A Class, that reads in Textures from different fileformats.
+class Texture : public BaseObject
+{
+public:
+
+public:
+  Texture(GLenum target = GL_TEXTURE_2D);
+  Texture(const std::string& imageName, GLenum target = GL_TEXTURE_2D);
+  Texture(SDL_Surface* surface, GLenum target = GL_TEXTURE_2D);
+
+  virtual ~Texture();
+
+  bool loadImage(const std::string& imageName, GLenum target = GL_TEXTURE_2D);
+  bool loadSurface(SDL_Surface* surface, GLenum target = GL_TEXTURE_2D);
+  virtual bool rebuild();
+
+  /** @returns The textureID of this texture.  */
+  inline GLuint getTexture() const { return this->data->getTexture(); };
+  /** @returns true if texture has alpha, false otherwise */
+  inline bool hasAlpha() const  { return this->data->hasAlpha(); }
+  /** @returns the stored image of this Texture */
+  const SDL_Surface* const getStoredImage() const { return this->data->getStoredImage(); };
+
+
+
+  static void setTextureEnableState(bool texturesEnabled);
+  /** @returns true if Textures are enabled */
+  inline static bool getTextureEnableState() { return Texture::texturesEnabled; };
+  // Utility functionality:
+  static SDL_Surface* prepareSurface(SDL_Surface* input, bool& hasAlpha);
+  static GLuint loadTexToGL (const SDL_Surface* surface, GLenum target = GL_TEXTURE_2D);
+
+protected:
+  bool setSurface(SDL_Surface* newSurface) { return this->data->setSurface(newSurface); };
+  bool setAlpha(bool hasAlpha) { return this->data->setAlpha(hasAlpha); };
+  bool setTexture(GLuint texture) { return this->data->setTexture(texture); };
+
+private:
+  void init();
+  static void generateTexture(GLuint& texture, GLenum target);
+
+private:
+  CountPointer<TextureData>     data;               //!< The TextureData
+  GLclampf                      priority;           //!< the priority of the current texture (used for garphics cards with limited mem)
+
+  static bool                   texturesEnabled;    //!< If the Textures are enabled.
+};
 
 #endif /* _TEXTURE_H */