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

Timestamp:

Nov 24, 2005, 8:24:52 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: font is a Texture now (this is a procedural texture)

File:

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

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

@@ -1 +1 @@
 /*!
-  \file texture.h
-  \brief Contains the texture class, that handles the reading of Images into Texutre-files.
-
-  @todo procedural textures
-*/
+ * @file texture.h
+ * @brief Contains the texture class, that handles the reading of Images into Texutre-files.
+ */
 
 #ifndef _TEXTURE_H
 #define _TEXTURE_H
 
-#include "glincl.h"
 #include "base_object.h"
 
-#include "debug.h"
+#include "glincl.h"
 
+/* Forward Declaration */
 struct SDL_Surface;
 
 //! an enumerator for different procedural texture-types
 typedef enum TEXTURE_TYPE { TEXTURE_RADIAL_ALIAS,
-                            TEXTURE_NOISE };
+  TEXTURE_NOISE };
 
 //! A Class, that reads in Textures from different fileformats.
-class Texture : public BaseObject
-{
- public:
-  Texture(const char* imageName = NULL);
+  class Texture : public BaseObject
+  {
+    public:
+      Texture(const char* imageName = NULL);
   //  Texture(TEXTURE_TYPE type, int resolution);
-  ~Texture();
+      ~Texture();
 
-  bool loadImage(const char* imageName);
-  bool rebuild();
+      bool loadImage(const char* imageName);
+      bool rebuild();
 
-  /** @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 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;}
 
- private:
-  SDL_Surface* prepareSurface(SDL_Surface* input);
-  GLuint loadTexToGL (SDL_Surface* surface) const;
+    protected:
+      bool prepareSurface(SDL_Surface* input);
+      bool setSurface(SDL_Surface* newSurface);
 
- private:
-  GLuint        texture;            //!< The Texture-ID of opengl from this Texture.
-  bool          bAlpha;             //!< if the texture has an alpha channel.
-  SDL_Surface*  image;   
-};
+      GLuint loadTexToGL ();
+
+    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.
+  };
 
 #endif /* _TEXTURE_H */