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];
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);
*/
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_);
}
image_resource_loader()
{
- resource::register_type<image>("png");
+ resource::register_type<image>("png", "textures");
}
~image_resource_loader()