Inherit Loaders from the ObjectLoader classes

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

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index baee22eefc56b31f9fe41c44c53a888598c3cbba..c1f6e0e9e7bd75f664cc682209b551746d3f4e48 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -6,7 +6,6 @@ Distributed under the LGPL
 */
 
 #include "except.h"
-#include "ilwrap.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -57,17 +56,17 @@ void Texture2D::sub_image(int level, int x, int y, sizei wd, sizei ht, PixelForm
 
 void Texture2D::load_image(const string &fn)
 {
-       Image img;
+       Graphics::Image img;
        img.load_file(fn);
 
        image(img);
 }
 
-void Texture2D::image(const Image &img)
+void Texture2D::image(const Graphics::Image &img)
 {
        unsigned w=img.get_width();
        unsigned h=img.get_height();
-       PixelFormat fmt=img.get_format();
+       PixelFormat fmt=pixelformat_from_graphics(img.get_format());
        if(width==0)
                storage(fmt, w, h, 0);
        else if(w!=width || h!=height)
@@ -87,21 +86,21 @@ Texture2D::Loader::Loader(Texture2D &t):
 
 void Texture2D::Loader::image_data(const string &data)
 {
-       Image img;
-       img.load_lump(data.data(), data.size());
+       Graphics::Image img;
+       img.load_memory(data.data(), data.size());
 
-       static_cast<Texture2D &>(tex).image(img);
+       static_cast<Texture2D &>(obj).image(img);
 }
 
 void Texture2D::Loader::raw_data(const string &data)
 {
-       Texture2D &t2d=static_cast<Texture2D &>(tex);;
+       Texture2D &t2d=static_cast<Texture2D &>(obj);
        t2d.image(0, t2d.ifmt, UNSIGNED_BYTE, data.data());
 }
 
 void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigned b)
 {
-       static_cast<Texture2D &>(tex).storage(fmt, w, h, b);
+       static_cast<Texture2D &>(obj).storage(fmt, w, h, b);
 }
 
 } // namespace GL