Changeset 3953 in orxonox.OLD for orxonox/branches/physics/src/lib/graphics/importer/texture.h

Timestamp:

Apr 25, 2005, 9:29:41 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/physics: merged with trunk - with command svn merge -r 3866:HEAD

File:

• orxonox/branches/physics/src/lib/graphics/importer/texture.h (modified) (1 diff)

orxonox/branches/physics/src/lib/graphics/importer/texture.h

@@ -20 +20 @@
 {
  private:
-  //! Struct to handle Infos about an Image
-  struct Image
-  {
-    int rowSpan;    //!< The count of the rows this Image has.
-    GLuint width;   //!< The width of the Image.
-    GLuint height;  //!< The height of the Image.
-    GLuint bpp;     //!< BytesPerPixel
-    GLenum format;  //!< The Format of the PixelData
-    GLuint type;    //!< Type of the Image.
-    GLubyte *data;  //!< The Image Data comes here! DANGER: uncompressed data.
-  };
-  Image* pImage;    //!< The data of an Image
   GLuint texture;   //!< The Texture-ID of opengl from this Texture.
-  SDL_Surface* map; //!< The map SDL initializes for this element.
   char* searchTextureInPaths(const char* texName) const;
   void swap(unsigned char &a, unsigned char &b);
  public:
-  Texture(void);
-  Texture(const char* imageName);
+  Texture(const char* imageName = NULL);
   ~Texture(void);
+
   /** \returns The textureID of this texture.  */
   inline GLuint getTexture(void) {return this->texture;} 
-  bool loadTexToGL (Image* pImage);
+  GLuint loadTexToGL (SDL_Surface* surface);
 
   bool loadImage(const char* imageName);