Inherit Loaders from the ObjectLoader classes

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

diff --git a/source/texture.cpp b/source/texture.cpp
index d71f38c2f1f2efba27edf95c57925c0a11946f54..e897ba92a138ab8282e013ce5bb74938bc74b734 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -91,6 +91,12 @@ void Texture::unbind()
        TexUnit::current().set_texture(0);
 }
 
+void Texture::unbind_from(unsigned i)
+{
+       TexUnit::activate(i);
+       unbind();
+}
+
 Texture::Texture():
        target(0)
 {
@@ -105,7 +111,7 @@ void Texture::maybe_bind() const
 
 
 Texture::Loader::Loader(Texture &t):
-       tex(t)
+       DataFile::ObjectLoader<Texture>(t)
 {
        add("min_filter", &Loader::min_filter);
        add("mag_filter", &Loader::mag_filter);
@@ -114,17 +120,17 @@ Texture::Loader::Loader(Texture &t):
 
 void Texture::Loader::min_filter(TextureFilter f)
 {
-       tex.set_min_filter(f);
+       obj.set_min_filter(f);
 }
 
 void Texture::Loader::mag_filter(TextureFilter f)
 {
-       tex.set_mag_filter(f);
+       obj.set_mag_filter(f);
 }
 
 void Texture::Loader::generate_mipmap(bool gm)
 {
-       tex.parameter(GL_GENERATE_MIPMAP_SGIS, gm);
+       obj.parameter(GL_GENERATE_MIPMAP_SGIS, gm);
 }
 
 } // namespace GL