Changeset 10460 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Jan 28, 2007, 9:26:08 PM (18 years ago)

Author:

patrick

Message:

some texture attributes, camera target fix

Location:

trunk/src/lib/graphics/importer

Files:

• texture.h (modified) (1 diff)
• texture_data.cc (modified) (3 diffs)
• texture_data.h (modified) (2 diffs)

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

@@ -55 +55 @@
   static GLuint loadTexToGL (const SDL_Surface* surface, GLenum target = GL_TEXTURE_2D);
 
+  float getHeight() { return this->data->getHeight(); }
+  float getWidth() { return this->data->getWidth(); }
+
 protected:
   bool setSurface(SDL_Surface* newSurface) { return this->data->setSurface(newSurface); };

trunk/src/lib/graphics/importer/texture_data.cc

@@ -21 +21 @@
 #include "compiler.h"
 
-#include "sdlincl.h"
 
 /**
@@ -31 +30 @@
   this->texture = 0;
   this->image = NULL;
+  this->height = 0.;
+  this->width = 0.;
 }
 
@@ -56 +57 @@
 bool TextureData::loadSurface(SDL_Surface* surface, GLenum target)
 {
+  if( surface != NULL)
+  {
+    this->height = surface->h;
+    this->width = surface->w;
+  }
+
   if (Texture::getTextureEnableState())
   {

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

@@ -11 +11 @@
 #include "glincl.h"
 #include "count_pointer.h"
+#include "sdlincl.h"
+
 
 /* Forward Declaration */
@@ -38 +40 @@
     bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; return this->bAlpha; };
     bool setTexture(GLuint texture);
+    float getHeight() { return this->height;}
+    float getWidth() { return this->width; }
 
   private:
+    float            height;             //!< height of tex
+    float            width;              //!< width of tex
     GLuint           texture;            //!< The Texture-ID of opengl from this Texture.
     bool             bAlpha;             //!< if the texture has an alpha channel.