X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Fimage.cc;h=64b2f2eb1a6a19b5219669380e154ac9eef34508;hp=abe1677095c9bb12df0fb55826a1c35a143441bf;hb=c143f7e806766a73cd69dc6e084e977641019ce6;hpb=382626aad0a683ed8642a6a807eea743db45f7f8

diff --git a/src/moof/image.cc b/src/moof/image.cc
index abe1677..64b2f2e 100644
--- a/src/moof/image.cc
+++ b/src/moof/image.cc
@@ -51,7 +51,7 @@ image::image(const std::string& path) :
 	tile_width_(1),
 	tile_height_(1)
 {
-	FILE* fp = resource::open_file(path);
+	FILE* fp = fopen(path.c_str(), "rb");
 	if (!fp) throw std::runtime_error("image not found at " + path);
 
 	png_byte	signature[8];
@@ -133,7 +133,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 +299,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_);
 }
 
 
@@ -348,7 +348,7 @@ public:
 	
 	image_resource_loader()
 	{
-		resource::register_type<image>("png");
+		resource::register_type<image>("png", "textures");
 	}
 
 	~image_resource_loader()