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

Timestamp:

Dec 16, 2005, 6:45:32 PM (18 years ago)

Author:

patrick

Message:

trunk: merged branche network with trunk using command: svn merge -r5999:HEAD, conflicts resolved in favor of the trunk bla

File:

• trunk/src/lib/graphics/importer/texture.h (modified) (2 diffs)

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

@@ -39 +39 @@
 
       // Utility functionality:
-      static SDL_Surface* prepareSurface(SDL_Surface* input, bool& hasAlpha);
-      static GLuint loadTexToGL (const SDL_Surface* surface);
+      SDL_Surface* prepareSurface(SDL_Surface* input, bool& hasAlpha) const;
+      GLuint loadTexToGL (const SDL_Surface* surface) const;
 
     protected:
@@ -53 +53 @@
       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.