mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-11 18:00:34 +00:00
Code Issues Releases Wiki Activity

slr:: fixed centering in shmup

Browse Source
This commit is contained in:
Zeno Rogue 2019-08-24 20:29:58 +02:00
parent c7a5de1477
commit 91199595d6
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hypgraph.cpp
View File

@ -1301,14 +1301,21 @@ EX void centerpc(ld aspd) {
#if MAXMDIM >= 4 #if MAXMDIM >= 4
if(shmup::on && vid.sspeed > -5 && GDIM == 3) { if(shmup::on && vid.sspeed > -5 && GDIM == 3) {
int id = subscreens::in ? subscreens::current_player : 0; int id = subscreens::in ? subscreens::current_player : 0;
if(masterless) centerover = shmup::pc[id]->base; auto& pc = shmup::pc[id];
else viewctr = shmup::pc[id]->base->master; if(masterless) centerover = pc->base;
transmatrix T = shmup::pc[id]->at; else viewctr = pc->base->master;
if(WDIM == 2 && !masterless) T = master_relative(shmup::pc[id]->base) * T; transmatrix T = pc->at;
if(hybri) {
hybrid::current_view_level = hybrid::get_where(pc->base).second;
println(hlog, "base = ", pc->base, " at level ", hybrid::current_view_level);
cell *cc = hybrid::get_at(viewctr.at->c7, hybrid::current_view_level);
T = currentmap->relative_matrix(pc->base, cc, C0) * T;
}
if(WDIM == 2 && !masterless) T = master_relative(pc->base) * T;
int sl = snakelevel(cwt.at); int sl = snakelevel(cwt.at);
if(sl) T = T * zpush(cgi.SLEV[sl] - cgi.FLOOR); if(sl && WDIM == 2) T = T * zpush(cgi.SLEV[sl] - cgi.FLOOR);
View = inverse(T); View = inverse(T);
if(WDIM == 2) View = cspin(0, 1, M_PI) * cspin(2, 1, M_PI/2 + shmup::playerturny[id]) * spin(-M_PI/2) * View; if(WDIM == 2) rotate_view( cspin(0, 1, M_PI) * cspin(2, 1, M_PI/2 + shmup::playerturny[id]) * spin(-M_PI/2) );
return; return;
} }
#endif #endif