Support loading texture wrap parameters

[libs/gl.git] / source / texture.cpp

diff --git a/source/texture.cpp b/source/texture.cpp
index 52ad074281d30b945f0b2f328883f25ef06704da..f4e7d705d142332652396160bb144009aa6c0364 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -38,6 +38,19 @@ istream &operator>>(istream &in, TextureFilter &tf)
 }
 
 
+void operator>>(const LexicalConverter &c, TextureWrap &tw)
+{
+       if(c.get()=="REPEAT")
+               tw = REPEAT;
+       else if(c.get()=="CLAMP_TO_EDGE")
+               tw = CLAMP_TO_EDGE;
+       else if(c.get()=="MIRRORED_REPEAT")
+               tw = MIRRORED_REPEAT;
+       else
+               throw LexicalError("Invalid input in TextureWrap conversion");
+}
+
+
 Texture::Texture(GLenum t):
        target(t),
        min_filter(NEAREST_MIPMAP_LINEAR),
@@ -194,14 +207,18 @@ void Texture::unbind_from(unsigned i)
 Texture::Loader::Loader(Texture &t):
        DataFile::ObjectLoader<Texture>(t)
 {
-       add("min_filter", &Loader::min_filter);
-       add("mag_filter", &Loader::mag_filter);
        add("generate_mipmap", &Loader::generate_mipmap);
+       add("mag_filter", &Loader::mag_filter);
+       add("min_filter", &Loader::min_filter);
+       add("wrap",       &Loader::wrap);
+       add("wrap_r",     &Loader::wrap_r);
+       add("wrap_s",     &Loader::wrap_s);
+       add("wrap_t",     &Loader::wrap_t);
 }
 
-void Texture::Loader::min_filter(TextureFilter f)
+void Texture::Loader::generate_mipmap(bool gm)
 {
-       obj.set_min_filter(f);
+       obj.set_generate_mipmap(gm);
 }
 
 void Texture::Loader::mag_filter(TextureFilter f)
@@ -209,9 +226,29 @@ void Texture::Loader::mag_filter(TextureFilter f)
        obj.set_mag_filter(f);
 }
 
-void Texture::Loader::generate_mipmap(bool gm)
+void Texture::Loader::min_filter(TextureFilter f)
 {
-       obj.set_generate_mipmap(gm);
+       obj.set_min_filter(f);
+}
+
+void Texture::Loader::wrap(TextureWrap w)
+{
+       obj.set_wrap(w);
+}
+
+void Texture::Loader::wrap_r(TextureWrap w)
+{
+       obj.set_wrap_r(w);
+}
+
+void Texture::Loader::wrap_s(TextureWrap w)
+{
+       obj.set_wrap_s(w);
+}
+
+void Texture::Loader::wrap_t(TextureWrap w)
+{
+       obj.set_wrap_t(w);
 }
 
 } // namespace GL