mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed CAP_TEXTURE disabling

This commit is contained in:
Zeno Rogue 2018-01-05 17:30:03 +01:00
parent 5a183618db
commit 3fc196e0c0
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graph.cpp
View File

@ -3279,10 +3279,12 @@ int getSnakelevColor(cell *c, int i, int last, int fd, int wcol) {
void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) { void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
#if CAP_TEXTURE
if(texture::saving) { if(texture::saving) {
texture::apply(c, V, 0xFFFFFFFF); texture::apply(c, V, 0xFFFFFFFF);
return; return;
} }
#endif
qfi.shape = NULL; qfi.special = false; qfi.shape = NULL; qfi.special = false;
ivoryz = isGravityLand(c->land); ivoryz = isGravityLand(c->land);
@ -5368,8 +5370,10 @@ void gamescreen(int _darken) {
darken = 0; darken = 0;
#if CAP_TEXTURE
if(texture::tstate == texture::tsAdjusting) if(texture::tstate == texture::tsAdjusting)
texture::drawRawTexture(); texture::drawRawTexture();
#endif
} }
void normalscreen() { void normalscreen() {

2
init.cpp
View File

@ -121,7 +121,7 @@
#endif #endif
#ifndef CAP_TEXTURE #ifndef CAP_TEXTURE
#define CAP_TEXTURE CAP_GL && CAP_PNG || CAP_SDL_IMG #define CAP_TEXTURE (CAP_GL && (CAP_PNG || CAP_SDL_IMG))
#endif #endif
#ifndef CAP_MODEL #ifndef CAP_MODEL

10
mapeditor.cpp
View File

@ -1028,16 +1028,16 @@ namespace mapeditor {
} }
displaymm('g', vid.xres-8, 8+fs*4, 2, vid.fsize, XLAT("g = grid"), 16); displaymm('g', vid.xres-8, 8+fs*4, 2, vid.fsize, XLAT("g = grid"), 16);
#if CAP_TEXTURE
if(intexture) for(int i=0; i<10; i++) { if(intexture) for(int i=0; i<10; i++) {
if(8 + fs * (6+i) < vid.yres - 8 - fs * 7) if(8 + fs * (6+i) < vid.yres - 8 - fs * 7)
displayColorButton(vid.xres-8, 8+fs*(6+i), "###", 1000 + i, 16, 1, dialog::displaycolor(texture_colors[i+1])); displayColorButton(vid.xres-8, 8+fs*(6+i), "###", 1000 + i, 16, 1, dialog::displaycolor(texture_colors[i+1]));
if(displayfr(vid.xres-8 - fs * 3, 8+fs*(6+i), 0, vid.fsize, its(i+1), texture::penwidth == brush_sizes[i] ? 0xFF8000 : 0xC0C0C0, 16)) if(displayfr(vid.xres-8 - fs * 3, 8+fs*(6+i), 0, vid.fsize, its(i+1), texture::penwidth == brush_sizes[i] ? 0xFF8000 : 0xC0C0C0, 16))
getcstat = 2000+i; getcstat = 2000+i;
} }
#if CAP_TEXTURE
if(texture::tstate != texture::tsActive) if(texture::tstate != texture::tsActive)
displaymm('e', vid.xres-8, 8+fs, 2, vid.fsize, XLAT("e = edit this"), 16); displaymm('e', vid.xres-8, 8+fs, 2, vid.fsize, XLAT("e = edit this"), 16);
#endif #endif
@ -1604,6 +1604,7 @@ namespace mapeditor {
transmatrix textrans; transmatrix textrans;
#if CAP_TEXTURE
void queue_hcircle(transmatrix Ctr, ld radius) { void queue_hcircle(transmatrix Ctr, ld radius) {
vector<hyperpoint> pts; vector<hyperpoint> pts;
int circp = 6; int circp = 6;
@ -1615,7 +1616,8 @@ namespace mapeditor {
for(int j=0; j<circp; j++) for(int j=0; j<circp; j++)
queueline(pts[j], pts[(j+1)%circp], texture::paint_color, 0, PPR_LINE); queueline(pts[j], pts[(j+1)%circp], texture::paint_color, 0, PPR_LINE);
} }
#endif
bool drawUserShape(transmatrix V, int group, int id, int color, cell *c) { bool drawUserShape(transmatrix V, int group, int id, int color, cell *c) {
#if !CAP_EDIT #if !CAP_EDIT
return false; return false;