diff options
author | Stijn Buys <ingar@osirion.org> | 2009-08-12 12:03:18 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2009-08-12 12:03:18 +0000 |
commit | 183f0f0b905715f0d89b38174fdfd44641c1a79c (patch) | |
tree | 6cae553ac6284044002fb668c7991da27291825d /src/render/textures.h | |
parent | 8bf8afe68ca15c61b0dea1f5c1ef5fc7186dca0f (diff) |
src/model filenames cleanup, parse .map texture coordinates, early loading of material textures
Diffstat (limited to 'src/render/textures.h')
-rw-r--r-- | src/render/textures.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/render/textures.h b/src/render/textures.h index 84d5c9a..c1ccabe 100644 --- a/src/render/textures.h +++ b/src/render/textures.h @@ -10,6 +10,7 @@ #include <string> #include <map> +#include "model/material.h" #include "render/gl.h" namespace render @@ -56,11 +57,15 @@ public: /// list loaded textures static void list(); + /// material loader func + static void material_loader(model::Material *material); + private: static void clear(); typedef std::map<std::string, size_t>::iterator iterator; + static math::Vector2f texture_size[MAXTEXTURES]; static std::map<std::string, size_t> registry; static GLuint textures[MAXTEXTURES]; }; |