From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 26 Aug 2012 21:30:54 +0000 (+0300)
Subject: Use DerivedObjectLoader in Texture2D
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=edd2a01b3c696df8630ac6a97e9b55a95fe7e112;p=libs%2Fgl.git

Use DerivedObjectLoader in Texture2D
---

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index be4e1a11..8c8ad378 100644
--- 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 f81231d1..35346e00 100644
--- 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 &);