mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-02-05 09:20:15 +00:00
Code Issues Releases Wiki Activity

major cleanup of texture remapping

Browse Source
This commit is contained in:
Zeno Rogue
2018-08-20 02:04:49 +02:00
parent 47c49c6d1d
commit 625144195c
8 changed files with 109 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pattern2.cpp
View File

@@ -1599,30 +1599,39 @@ namespace patterns {
#if CAP_EDIT
mapeditor::modelcell.clear();
#endif
texture::config.remap();
}
else if(uni >= '0' && uni <= '5')
else if(uni >= '0' && uni <= '5') {
subpattern_flags ^= (1 << (uni - '0'));
texture::config.remap();
}
else if(uni == '=')
else if(uni == '=') {
subpattern_flags ^= SPF_EXTRASYM;
texture::config.remap();
}
else if(uni == '\'') {
subpattern_flags ^= SPF_ALTERNATE;
subpattern_flags &= ~SPF_FOOTBALL;
texture::config.remap();
}
else if(uni == '*') {
subpattern_flags ^= SPF_FOOTBALL;
subpattern_flags &= ~SPF_ALTERNATE;
texture::config.remap();
}
else if(uni == '!') {
subpattern_flags ^= SPF_FULLSYM;
texture::config.remap();
}
else if(uni == '@') {
subpattern_flags ^= SPF_DOCKS;
texture::config.remap();
}
else if(uni == '6' || uni == '7' || uni == '8' || uni == '9') {
@@ -1803,23 +1812,18 @@ namespace patterns {
else if(uni >= '0' && uni < '0' + isize(cpatterns))
cgroup = cpatterntype(uni - '0');
else if(cgroup != cpUnknown && uni >= 'a' && uni < 'a' + isize(cpatterns[cgroup].geometries)) {
#if CAP_TEXTURE
auto old_tstate = texture::config.tstate;
auto old_tstate_max = texture::config.tstate_max;
#endif
auto &g = cpatterns[cgroup].geometries[uni - 'a'];
if(g.geo != geometry) { targetgeometry = g.geo; stop_game_and_switch_mode(rg::geometry); }
if(gp::on) stop_game_and_switch_mode(rg::gp);
if(g.nonbitru != nonbitrunc) stop_game_and_switch_mode(rg::bitrunc);;
start_game();
whichPattern = g.whichPattern;
subpattern_flags = g.subpattern_flags;
#if CAP_TEXTURE
texture::config.remap(old_tstate, old_tstate_max);
#endif
bool not_restarted = game_active;
start_game();
if(not_restarted) texture::config.remap();
}
else if(uni == 'G' && (have_goldberg || have_variations))
gp::configure(true);
gp::configure();
else if(doexiton(sym, uni))
popScreen();
};