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

twist:: nil twist in raycaster

Browse Source
This commit is contained in:
Zeno Rogue 2024-06-16 23:46:46 +02:00
parent 8b7d7d56e9
commit 75f631cd40
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
polygons.cpp
View File

@ -891,6 +891,8 @@ hyperpoint ray_kleinize_twisted(hyperpoint h, int ks, int id) {
if(id < ks) h = spin(-TAU * id / ks) * h; if(id < ks) h = spin(-TAU * id / ks) * h;
if(nil) return hyperpoint(x, y, z - x * y / 2, 1);
ld dx, dy; ld dx, dy;
if(sl2) { if(sl2) {

18
raycaster.cpp
View File

@ -1405,23 +1405,24 @@ void raygen::emit_iterate(int gid1) {
if(!(levellines && disable_texture)) { if(!(levellines && disable_texture)) {
fmain += " mediump vec4 pos = position;\n"; fmain += " mediump vec4 pos = position;\n";
if(nil && nilv::nil_structure_index == 0) fmain += "if(which == 2 || which == 5) pos.z = 0.;\n"; if(!mtwisted && nil && nilv::nil_structure_index == 0) fmain += "if(which == 2 || which == 5) pos.z = 0.;\n";
if(nil && nilv::nil_structure_index == 2) fmain += "if(which == 6 || which == 7) pos.z = 0.;\n"; if(!mtwisted && nil && nilv::nil_structure_index == 2) fmain += "if(which == 6 || which == 7) pos.z = 0.;\n";
else if(mtwisted) { else if(mtwisted) {
fmain += "pos = twist_coordinates(pos, sides-2, which);\n"; fmain += "pos = twist_coordinates(pos, sides-2, which);\n";
string spinner = "h = cspin(0, 1, PI) * h;\n"; string spinner = "h = cspin(0, 1, PI) * h;\n";
string calc_dxy = sl2 ? string calc_dxy = nil ? "dx = h.x; dy = h.y;\n" : sl2 ?
"dx = -2. * (h.y*h.z - h.x*h.w);\n" "dx = -2. * (h.y*h.z - h.x*h.w);\n"
"dy = -2. * (h.x*h.z + h.y*h.w);\n" : "dy = -2. * (h.x*h.z + h.y*h.w);\n" :
"dx = +2. * (h.x*h.z + h.y*h.w);\n" "dx = +2. * (h.x*h.z + h.y*h.w);\n"
"dy = -2. * (h.y*h.z - h.x*h.w);\n"; "dy = -2. * (h.y*h.z - h.x*h.w);\n";
string dcalc_dxy = "mediump float dx, dy;\n" + calc_dxy; string dcalc_dxy = "mediump float dx, dy;\n" + calc_dxy;
string calc_vxy = sl2 ? string calc_vxy = nil ? "mediump float vx = h.x; mediump float vy = h.y;\n" : sl2 ?
"mediump float vy = -asinh(dy)/2.;\n" "mediump float vy = -asinh(dy)/2.;\n"
"mediump float vx = asinh(dx / cosh(2.*vy)) / 2.;\n" : "mediump float vx = asinh(dx / cosh(2.*vy)) / 2.;\n" :
"mediump float vy = -asin(dy)/2.;\n" "mediump float vy = -asin(dy)/2.;\n"
"mediump float vx = asin(dx / cos(2.*vy)) / 2.;\n"; "mediump float vx = asin(dx / cos(2.*vy)) / 2.;\n";
string calc_h1 = sl2 ? string calc_vz = nil ? "mediump float vz = h.z - h.x * h.y / 2;\n" : "float vz = atan2(h1[2], h1[3]);\n";
string calc_h1 = nil ? "" : sl2 ?
"vec4 h1 = lorentz(1, 3, -vy) * lorentz(0, 2, -vy) * lorentz(0, 3, -vx) * lorentz(2, 1, vx) * h;\n" : "vec4 h1 = lorentz(1, 3, -vy) * lorentz(0, 2, -vy) * lorentz(0, 3, -vx) * lorentz(2, 1, vx) * h;\n" :
"vec4 h1 = cspin(0, 3, vy) * cspin(1, 2, -vy) * cspin(1, 3, -vx) * cspin(0, 2, -vx) * h;\n"; "vec4 h1 = cspin(0, 3, vy) * cspin(1, 2, -vy) * cspin(1, 3, -vx) * cspin(0, 2, -vx) * h;\n";
fsh += fsh +=
@ -1430,8 +1431,7 @@ void raygen::emit_iterate(int gid1) {
"if(id < ks) h = cspin(0, 1, -TAU * float(id) / float(ks)) * h;\n" "if(id < ks) h = cspin(0, 1, -TAU * float(id) / float(ks)) * h;\n"
+dcalc_dxy + +dcalc_dxy +
"if(id >= ks) return vec4(dx, dy, 0, 1);\n" "if(id >= ks) return vec4(dx, dy, 0, 1);\n"
+ calc_vxy + calc_h1 + + calc_vxy + calc_h1 + calc_vz +
"float vz = atan2(h1[2], h1[3]);\n"
"return vec4(vx, vy, vz, 1);\n" "return vec4(vx, vy, vz, 1);\n"
"}\n\n"; "}\n\n";
fsh += fsh +=
@ -1441,8 +1441,8 @@ void raygen::emit_iterate(int gid1) {
fsh += fsh +=
"mediump float twist_zlevel(vec4 h, int ks) {\n" + spinner + dcalc_dxy + "mediump float twist_zlevel(vec4 h, int ks) {\n" + spinner + dcalc_dxy +
"float alpha = (floor(atan2(dy, dx) * float(ks) / TAU + 0.5)) * TAU / float(ks);\n" "float alpha = (floor(atan2(dy, dx) * float(ks) / TAU + 0.5)) * TAU / float(ks);\n"
"h = cspin(1, 0, alpha) * h;\n" + calc_dxy + calc_vxy + calc_h1 + "h = cspin(1, 0, alpha) * h;\n" + calc_dxy + calc_vxy + calc_h1 + calc_vz +
"return atan2(h1[2], h1[3]);\n" "return vz;\n"
"}\n\n"; "}\n\n";
fsh += fsh +=
"mediump bool twist_dark(vec4 h, int ks) {\n" + spinner + dcalc_dxy + "mediump bool twist_dark(vec4 h, int ks) {\n" + spinner + dcalc_dxy +