Changeset 3345 in orxonox.OLD for orxonox/branches/parenting/src/importer

Timestamp:

Jan 5, 2005, 6:11:11 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/parenting: :loadscreen: now uses texture-class

Location:

orxonox/branches/parenting/src/importer

Files:

• texture.cc (modified) (1 diff)
• texture.h (modified) (1 diff)

orxonox/branches/parenting/src/importer/texture.cc

@@ -137 +137 @@
   if (this->texture)
     glDeleteTextures(1, &this->texture);
-}
-
-/**
-   \returns The Texture-identifier number.
-*/
-GLuint Texture::getTexture(void)
-{
-    return this->texture;
 }
 

orxonox/branches/parenting/src/importer/texture.h

@@ -72 +72 @@
   ~Texture(void);
 
-  GLuint getTexture(void);
+  inline GLuint getTexture(void) {return this->texture;} //!< \returns The textureID of this texture.
   bool loadTexToGL (Image* pImage);