projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
32280f4
..
ee75655
100644
(file)
--- a/
src/video/texture_manager.hpp
+++ b/
src/video/texture_manager.hpp
@@
-36,7
+36,7
@@
public:
~TextureManager();
ImageTexture* get(const std::string& filename);
~TextureManager();
ImageTexture* get(const std::string& filename);
-
+
void register_texture(Texture* texture);
void remove_texture(Texture* texture);
void register_texture(Texture* texture);
void remove_texture(Texture* texture);
@@
-46,7
+46,7
@@
public:
private:
friend class ImageTexture;
void release(ImageTexture* texture);
private:
friend class ImageTexture;
void release(ImageTexture* texture);
-
+
typedef std::map<std::string, ImageTexture*> ImageTextures;
ImageTextures image_textures;
typedef std::map<std::string, ImageTexture*> ImageTextures;
ImageTextures image_textures;
@@
-61,7
+61,7
@@
private:
GLint width;
GLint height;
char* pixels;
GLint width;
GLint height;
char* pixels;
- GLint border;
+ GLint border;
GLint min_filter;
GLint mag_filter;
GLint min_filter;
GLint mag_filter;
@@
-76,4
+76,3
@@
private:
extern TextureManager* texture_manager;
#endif
extern TextureManager* texture_manager;
#endif
-