fix all cases of not-optimal UV-coordinates

[supertux.git] / src / video / texture_manager.hpp

diff --git a/src/video/texture_manager.hpp b/src/video/texture_manager.hpp
index 0b0854f..ee75655 100644 (file)
--- a/src/video/texture_manager.hpp
+++ b/src/video/texture_manager.hpp
@@ -1,3 +1,22 @@
+//  $Id$
+//
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef __IMAGE_TEXTURE_MANAGER_HPP__
 #define __IMAGE_TEXTURE_MANAGER_HPP__
 
@@ -17,7 +36,7 @@ public:
   ~TextureManager();
 
   ImageTexture* get(const std::string& filename);
-  
+
   void register_texture(Texture* texture);
   void remove_texture(Texture* texture);
 
@@ -27,7 +46,7 @@ public:
 private:
   friend class ImageTexture;
   void release(ImageTexture* texture);
-  
+
   typedef std::map<std::string, ImageTexture*> ImageTextures;
   ImageTextures image_textures;
 
@@ -39,15 +58,15 @@ private:
   struct SavedTexture
   {
     Texture* texture;
-    int width;
-    int height;
+    GLint width;
+    GLint height;
     char* pixels;
-    int border;                              
+    GLint border;
 
-    int min_filter;
-    int mag_filter;
-    int wrap_s;
-    int wrap_t;
+    GLint min_filter;
+    GLint mag_filter;
+    GLint wrap_s;
+    GLint wrap_t;
   };
   std::vector<SavedTexture> saved_textures;
 
@@ -57,4 +76,3 @@ private:
 extern TextureManager* texture_manager;
 
 #endif
-