mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 14:02:59 +00:00
Code Issues Releases Wiki Activity

raycaster:: should now work in plane embedded as Solv

Browse Source
This commit is contained in:
Zeno Rogue
2023-05-15 02:28:56 +02:00
parent a9d76c861c
commit a70e799081
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hyperpoint.cpp
View File

@@ -464,6 +464,11 @@ EX transmatrix to_other_side(hyperpoint h1, hyperpoint h2) {
return T; return T;
} }
if(sol && meuclid) {
/* works in 4x4... */
return gpushxto0(h1) * gpushxto0(h2);
}
ld d = hdist(h1, h2); ld d = hdist(h1, h2);
hyperpoint v; hyperpoint v;

37
raycaster.cpp
View File

@@ -491,6 +491,7 @@ void raygen::compute_which_and_dist(int flat1, int flat2) {
void raygen::move_forward() { void raygen::move_forward() {
using glhr::to_glsl; using glhr::to_glsl;
string find_which;
if(in_h2xe() && !is_stepbased()) fmain += if(in_h2xe() && !is_stepbased()) fmain +=
" mediump float ch = cosh(dist*xspeed); mediump float sh = sinh(dist*xspeed);\n" " mediump float ch = cosh(dist*xspeed); mediump float sh = sinh(dist*xspeed);\n"
" mediump vec4 v = position * ch + tangent * sh;\n" " mediump vec4 v = position * ch + tangent * sh;\n"
@@ -587,7 +588,7 @@ void raygen::move_forward() {
" return christoffel(pos, vel, vel);\n" " return christoffel(pos, vel, vel);\n"
" }\n"; " }\n";
if(sn::in() && !asonov) fsh += "uniform mediump float uBinaryWidth;\n"; if(sn::in() && !asonov && !embedded_plane) fsh += "uniform mediump float uBinaryWidth;\n";
fmain += fmain +=
" dist = next < minstep ? 2.*next : next;\n"; " dist = next < minstep ? 2.*next : next;\n";
@@ -862,6 +863,28 @@ void raygen::move_forward() {
string hnilw2 = to_glsl(nilv::nilwidth * nilv::nilwidth / 2); string hnilw2 = to_glsl(nilv::nilwidth * nilv::nilwidth / 2);
if(reg) fmain += "if(which != -1) {\n"; if(reg) fmain += "if(which != -1) {\n";
else if(embedded_plane) {
string s = sol ? "-2" : "";
find_which +=
" mediump float best = length(nposition);\n"
" for(int i=0; i<sides"+s+"; i++) {\n"
" mediump float cand = length(" + getM("walloffset+i") + " * nposition);\n"
" if(cand < best) { best = cand; which = i; }\n"
" }\n";
if(cgi.FLOOR > cgi.WALL) {
if(sol) find_which +=
" if(nposition[2] < " + to_glsl(cgi.WALL)+") which = sides-1;\n"
" if(nposition[2] > " + to_glsl(cgi.FLOOR)+") which = sides-2;\n";
}
else {
if(sol) find_which +=
" if(nposition[2] < " + to_glsl(cgi.FLOOR)+") which = sides-2;\n"
" if(nposition[2] > " + to_glsl(cgi.WALL)+") which = sides-1;\n";
}
fmain += find_which + " if(which != -1) {\n";
}
else if(asonov) fmain += else if(asonov) fmain +=
"if(abs(sp.x) > 1. || abs(sp.y) > 1. || abs(sp.z) > 1.) {\n"; "if(abs(sp.x) > 1. || abs(sp.y) > 1. || abs(sp.z) > 1.) {\n";
else if(nih) fmain += else if(nih) fmain +=
@@ -878,7 +901,8 @@ void raygen::move_forward() {
"}\n" "}\n"
"else {\n"; "else {\n";
if(sn::in()) { if(embedded_plane) fmain += find_which;
else if(sn::in()) {
if(asonov) fmain += if(asonov) fmain +=
"if(sp.x > 1.) which = 4;\n" "if(sp.x > 1.) which = 4;\n"
"if(sp.y > 1.) which = 5;\n" "if(sp.y > 1.) which = 5;\n"
@@ -2122,12 +2146,11 @@ EX transmatrix get_ms(cell *c, int a, bool mirror) {
hyperpoint corner = hybrid::get_corner(c, a, 0, z); hyperpoint corner = hybrid::get_corner(c, a, 0, z);
h += corner; h += corner;
} }
h /= c->type;
h = normalize(h); h = normalize(h);
ld d = hdist0(h); ld d = cgi.emb->get_logical_z(h);
d -= cgi.emb->center_z(); if(mirror) return MirrorZ * lzpush(-2*d);
if(h[2] > 0) d = -d; else return lzpush(-2*d);
if(mirror) return MirrorZ * lzpush(2*d);
return lzpush(2*d);
} }
} }