X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Fimage.cc;h=94d468727107a5e45e8b9fcabb8a73e6344fa2ca;hp=64b2f2eb1a6a19b5219669380e154ac9eef34508;hb=af88821a172c4dfd138b91b2a5148ae50b502fa2;hpb=1fb5f7e36af1a4de040bc2989133703b0e0d4a9f

diff --git a/src/moof/image.cc b/src/moof/image.cc
index 64b2f2e..94d4687 100644
--- a/src/moof/image.cc
+++ b/src/moof/image.cc
@@ -27,6 +27,8 @@
 namespace moof {
 
 
+MOOF_REGISTER_RESOURCE(image, png, textures);
+
 //static int power_of_two(int input)
 //{
 	//int value = 1;
@@ -338,27 +340,13 @@ void image::set_texture_info(const std::string& info)
 		globals.get(mag_filter_, "mag_filter");
 		globals.get(wrap_s_, "wrap_s");
 		globals.get(wrap_t_, "wrap_t");
+		//min_filter_ = GL_LINEAR;
+		//mag_filter_ = GL_LINEAR;
+		//wrap_s_ = GL_CLAMP;
+		//wrap_t_ = GL_CLAMP;
 	}
 }
 
 
-class image_resource_loader
-{
-public:
-	
-	image_resource_loader()
-	{
-		resource::register_type<image>("png", "textures");
-	}
-
-	~image_resource_loader()
-	{
-		resource::unregister_type("png");
-	}
-};
-
-static image_resource_loader loader;
-
-
 } // namespace moof