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

hyperweb: fixed the rotmatrix parameter order, also disabled is CAP_ORIENTATION disabled

Browse Source
This commit is contained in:
Zeno Rogue 2018-09-02 15:09:22 +02:00
parent b72259cc8e
commit a239a26843
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hyperweb.cpp
View File

@ -145,16 +145,18 @@ void initweb() {
if(showstartmenu) pushScreen(showDemo); if(showstartmenu) pushScreen(showDemo);
} }
#if CAP_ORIENTATION
transmatrix getOrientation() { transmatrix getOrientation() {
ld alpha, beta, gamma; ld alpha, beta, gamma;
alpha = EM_ASM_DOUBLE({ return rotation_alpha; }); alpha = EM_ASM_DOUBLE({ return rotation_alpha; });
beta = EM_ASM_DOUBLE({ return rotation_beta; }); beta = EM_ASM_DOUBLE({ return rotation_beta; });
gamma = EM_ASM_DOUBLE({ return rotation_gamma; }); gamma = EM_ASM_DOUBLE({ return rotation_gamma; });
return return
rotmatrix(0, 1, alpha * M_PI / 180) * rotmatrix(alpha * M_PI / 180, 0, 1) *
rotmatrix(1, 2, beta * M_PI / 180) * rotmatrix(beta * M_PI / 180, 1, 2) *
rotmatrix(0, 2, gamma * M_PI / 180); rotmatrix(gamma * M_PI / 180, 0, 2);
} }
#endif
void emscripten_get_commandline() { void emscripten_get_commandline() {
#ifdef EMSCRIPTEN_FIXED_ARG #ifdef EMSCRIPTEN_FIXED_ARG