mesh and other random adjustments

[chaz/yoink] / src / moof / image.cc

diff --git a/src/moof/image.cc b/src/moof/image.cc
index b5100d5ccc3b19fddec90d6dad793bc2af3bf14c..7453b4849be2e9153fa3d1c2d428824e0f96ec19 100644 (file)
--- 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;
@@ -133,7 +135,7 @@ image::image(const std::string& path) :
        rows = new png_bytep[height_];
        for (int i = 0; i < height_; ++i)
        {
-               rows[i] = (png_bytep)(pixels_ + i * channels_ * width_);
+               rows[height_-1-i] = (png_bytep)(pixels_ + i * channels_ * width_);
        }
 
        png_read_image(pngObj, rows);
@@ -299,10 +301,10 @@ void image::context_recreated()
  */
 void image::set_properties() const
 {
-       //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter_);
-       //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter_);
-       //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s_);
-       //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_t_);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter_);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter_);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s_);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_t_);
 }
 
 
@@ -342,23 +344,5 @@ void image::set_texture_info(const std::string& info)
 }
 
 
-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