Changeset 4111 in orxonox.OLD for orxonox/branches/heightMap/src/lib/graphics/importer/texture.h

Timestamp:

May 7, 2005, 5:22:44 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Trunk/importer back here.
merged with command:
svn merge -r 3918:HEAD ../../trunk/src/lib/graphics/importer/ src/lib/graphics/importer/

this fixed the issue with the segfault. It really was an error in the Model-class
@nico:

1. sorry
2. thanks for pointing this out to me

File:

• orxonox/branches/heightMap/src/lib/graphics/importer/texture.h (modified) (2 diffs)

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

@@ -23 +23 @@
   char* searchTextureInPaths(const char* texName) const;
   void swap(unsigned char &a, unsigned char &b);
+
+  bool bAlpha;           //!< if the texture has an alpha channel.
  public:
   Texture(const char* imageName = NULL);
@@ -30 +32 @@
   inline GLuint getTexture(void) {return this->texture;} 
   GLuint loadTexToGL (SDL_Surface* surface);
+  inline bool hasAlpha(void) {return bAlpha;}
 
   bool loadImage(const char* imageName);