Use DerivedObjectLoader in Texture2D

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index be4e1a112d08e8c02f189fbcd951dce4dfcdcf2c..8c8ad3784e4a0a32faad55b49a25dca54fd9c2fb 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -99,7 +99,7 @@ void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
 
 
 Texture2D::Loader::Loader(Texture2D &t):
-       Texture::Loader(t)
+       DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t)
 {
        add("image_data", &Loader::image_data);
        add("raw_data", &Loader::raw_data);
@@ -112,18 +112,17 @@ void Texture2D::Loader::image_data(const string &data)
        Graphics::Image img;
        img.load_memory(data.data(), data.size());
 
-       static_cast<Texture2D &>(obj).image(img);
+       obj.image(img);
 }
 
 void Texture2D::Loader::raw_data(const string &data)
 {
-       Texture2D &t2d = static_cast<Texture2D &>(obj);
-       t2d.image(0, t2d.ifmt, UNSIGNED_BYTE, data.data());
+       obj.image(0, obj.ifmt, UNSIGNED_BYTE, data.data());
 }
 
 void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
 {
-       static_cast<Texture2D &>(obj).storage(fmt, w, h);
+       obj.storage(fmt, w, h);
 }
 
 void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)

diff --git a/source/texture2d.h b/source/texture2d.h
index f81231d18466eebf8746cb2cb9a19d552513a3fc..35346e0091e2bbc8a24bf827bec4a96d921cbbd8 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -18,7 +18,7 @@ most common type of texture.
 class Texture2D: public Texture
 {
 public:
-       class Loader: public Texture::Loader
+       class Loader: public Msp::DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>
        {
        public:
                Loader(Texture2D &);