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

Timestamp:

Jun 11, 2006, 12:49:25 PM (18 years ago)

Author:

bensch

Message:

trunk: merged the water-branche back here
removed the HACK in GameWorld in the Process (hope it is not needed anymore…

merged with command:
svn merge ​https://svn.orxonox.net/orxonoanches/water/src/lib/gui/gl_gui src/lib/gui/gl/ -r8063:HEAD

File:

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

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

@@ -50 +50 @@
   Texture();
   Texture(const Texture& texture);
-  Texture(GLenum target);
+  Texture(GLenum target, unsigned int width, unsigned int height, unsigned int channels, GLenum type);
   Texture(const std::string& imageName, GLenum target = GL_TEXTURE_2D);
   Texture(SDL_Surface* surface, GLenum target = GL_TEXTURE_2D);