mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-06-29 16:32:53 +00:00
Code Issues Releases Wiki Activity

rogueviz::pentagonal:: animations possible, keys now work only in sm::NORMAL

Browse Source
This commit is contained in:
Zeno Rogue 2019-07-12 23:18:38 +02:00
parent 4665e7ca14
commit 1a411f0ebf
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rogueviz-pentagonal.cpp
View File

@ -196,12 +196,17 @@ void run_snub(int v, int w) {
rug::invert_depth = hyperbolic; rug::invert_depth = hyperbolic;
} }
ld x, y;
void create_model() { void create_model() {
if(!inHighQual) {
x = (mousex - current_display->xcenter + .0) / vid.xres;
y = (mousey - current_display->ycenter + .0) / vid.yres;
}
int v = global_v; int v = global_v;
rug::clear_model(); rug::clear_model();
ld x = (mousex - current_display->xcenter + .0) / vid.xres;
ld y = (mousey - current_display->ycenter + .0) / vid.yres;
ld alpha = atan2(y, x); ld alpha = atan2(y, x);
ld h = hypot(x, y); ld h = hypot(x, y);
@ -249,8 +254,10 @@ void create_model() {
} }
// printf("idh = %d\n", idh); // printf("idh = %d\n", idh);
printf("createmodel with ticks = %d\n", ticks);
transmatrix t = hyperbolic ? rotmatrix(M_PI, 0, 2) * xpush(sin(ticks * M_PI / 8000.)) : rotmatrix(ticks * M_PI / 8000., 0, 2); transmatrix t = hyperbolic ? rotmatrix(M_PI, 0, 2) * xpush(sin(ticks * M_PI * 2 / anims::period)) : rotmatrix(ticks * M_PI * 2 / anims::period, 0, 2);
hyperpoint hs = hyperbolic ? hpxyz(0,0,-1) : hpxyz(0,0,0); hyperpoint hs = hyperbolic ? hpxyz(0,0,-1) : hpxyz(0,0,0);
@ -309,25 +316,25 @@ bool frame() {
bool handleKey(int sym, int uni) { bool handleKey(int sym, int uni) {
if(snubon) { if(snubon) {
if(among(uni, '3', '4', '5', '6', '7', '8', '9')) { if(among(uni, '3', '4', '5', '6', '7', '8', '9') && (cmode & sm::NORMAL)) {
run_snub(uni - '0', 3); run_snub(uni - '0', 3);
return true; return true;
} }
if(among(uni, '#', '$', '%', '&', '^')) { if(among(uni, '#', '$', '%', '&', '^') && (cmode & sm::NORMAL)) {
if(uni == '^') uni = '&'; if(uni == '^') uni = '&';
run_snub(uni - 32, 4); run_snub(uni - 32, 4);
return true; return true;
} }
if(uni == 'a') { if(uni == 'a' && (cmode & sm::NORMAL)) {
rug::close(); rug::close();
mapeditor::drawplayer = false; mapeditor::drawplayer = false;
return true; return true;
} }
if(uni == 's' && rug::rugged) { if(uni == 's' && rug::rugged && (cmode & sm::NORMAL)) {
vid.fov += 30; vid.fov += 30;
if(vid.fov >= 180) vid.fov = 60; if(vid.fov >= 180) vid.fov = 60;
} }
if(uni == 'i' && rug::rugged) { if(uni == 'i' && rug::rugged && (cmode & sm::NORMAL)) {
rug::invert_depth = !rug::invert_depth; rug::invert_depth = !rug::invert_depth;
return true; return true;
} }