Support loading texture wrap parameters

Mark font textures as CLAMP_TO_EDGE

diff --git a/makefont.py b/makefont.py
index 1651ace694eab7f2923b539db489f30e467434c5..030adff88bf4aadfb73ad4e89ed5bad740782ed6 100755 (executable)
--- a/makefont.py
+++ b/makefont.py
@@ -31,6 +31,7 @@ def make_font(fn, size):
                raise Exception("Could not execute ttf2png")
 
        result="texture\n{\n"
+       result+="wrap CLAMP_TO_EDGE;\n"
        result+=maketex.make_tex("makefont-tmp.png")
        result+="};\n"
        result+=convert_def("makefont-tmp.def")

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

diff --git a/source/texture.h b/source/texture.h
index 35f70ad693e51f7e567639dd89ae28ce5b4bd160..6d26f23684200405018cfd1f56c3286c32d75227 100644 (file)
--- a/source/texture.h
+++ b/source/texture.h
@@ -33,7 +33,6 @@ enum TextureWrap
 {
        REPEAT          = GL_REPEAT,
        CLAMP_TO_EDGE   = GL_CLAMP_TO_EDGE,
-       CLAMP_TO_BORDER = GL_CLAMP_TO_BORDER,
        MIRRORED_REPEAT = GL_MIRRORED_REPEAT
 };
 
@@ -50,9 +49,13 @@ protected:
        {
        public:
                Loader(Texture &);
-               void min_filter(TextureFilter);
-               void mag_filter(TextureFilter);
                void generate_mipmap(bool);
+               void mag_filter(TextureFilter);
+               void min_filter(TextureFilter);
+               void wrap(TextureWrap);
+               void wrap_r(TextureWrap);
+               void wrap_s(TextureWrap);
+               void wrap_t(TextureWrap);
        };
 
        enum ParameterMask