mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00
Code Issues Releases Wiki Activity

original image size is accessible in texture_data

Browse Source
This commit is contained in:
Zeno Rogue 2019-03-12 02:42:46 +01:00
parent ae9cf6a43a
commit f68b216eb4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hyper.h
View File

@ -3319,6 +3319,7 @@ namespace texture {
GLuint textureid; GLuint textureid;
int twidth; int twidth;
int tx, ty, origdim;
texture_data() { textureid = 0; twidth = 2048; } texture_data() { textureid = 0; twidth = 2048; }

8
textures.cpp
View File

@ -111,7 +111,7 @@ bool texture_data::readtexture(string tn) {
auto txt2 = convertSurface(txt); auto txt2 = convertSurface(txt);
SDL_FreeSurface(txt); SDL_FreeSurface(txt);
int tx = txt2->w, ty = txt2->h; tx = txt2->w, ty = txt2->h;
auto pix = [&] (int x, int y) { return qpixel(txt2, x, y); }; auto pix = [&] (int x, int y) { return qpixel(txt2, x, y); };
@ -130,8 +130,8 @@ bool texture_data::readtexture(string tn) {
// set the expected format // set the expected format
png_infop info = png_create_info_struct(png); png_infop info = png_create_info_struct(png);
png_read_info(png, info); png_read_info(png, info);
int tx = png_get_image_width(png, info); tx = png_get_image_width(png, info);
int ty = png_get_image_height(png, info); ty = png_get_image_height(png, info);
png_byte color_type = png_get_color_type(png, info); png_byte color_type = png_get_color_type(png, info);
png_byte bit_depth = png_get_bit_depth(png, info); png_byte bit_depth = png_get_bit_depth(png, info);
if(bit_depth == 16) png_set_strip_16(png); if(bit_depth == 16) png_set_strip_16(png);
@ -180,7 +180,7 @@ bool texture_data::readtexture(string tn) {
else { else {
int origdim = max(tx, ty); origdim = max(tx, ty);
int base_x = tx/2 - origdim/2; int base_x = tx/2 - origdim/2;
int base_y = ty/2 - origdim/2; int base_y = ty/2 - origdim/2;