mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-12-20 23:50:27 +00:00
ray:: works with Ternary and BinaryTiling product
This commit is contained in:
parent
569c968a41
commit
2b8c19a6f7
@ -357,8 +357,12 @@ void raygen::compute_which_and_dist(int flat1, int flat2) {
|
|||||||
fmain +=
|
fmain +=
|
||||||
" if(which == -1) {\n";
|
" if(which == -1) {\n";
|
||||||
|
|
||||||
if(in_h2xe() && bt::in())
|
if(in_h2xe() && hybrid::underlying == gBinary4)
|
||||||
fmain += "for(int i=2; i<=4; i++) if(i == 2 || i == 4) {";
|
fmain += "for(int i=2; i<=4; i+=2) {";
|
||||||
|
else if(in_h2xe() && hybrid::underlying == gTernary)
|
||||||
|
fmain += "for(int i=3; i<=5; i+=2) {";
|
||||||
|
else if(in_h2xe() && hybrid::underlying == gBinaryTiling)
|
||||||
|
fmain += "for(int i=0; i<=4; i++) if(i == 0 || i == 4) {";
|
||||||
else
|
else
|
||||||
fmain += "for(int i="+its(flat1)+"; i<"+(prod ? "sides-2" : ((WDIM == 2 || is_subcube_based(variation) || intra::in) && !bt::in()) ? "sides" : its(flat2))+"; i++) {\n";
|
fmain += "for(int i="+its(flat1)+"; i<"+(prod ? "sides-2" : ((WDIM == 2 || is_subcube_based(variation) || intra::in) && !bt::in()) ? "sides" : its(flat2))+"; i++) {\n";
|
||||||
|
|
||||||
@ -1228,6 +1232,14 @@ void raygen::emit_iterate(int gid1) {
|
|||||||
w21 = " for(int i=0; i<2; i++) {\n";
|
w21 = " for(int i=0; i<2; i++) {\n";
|
||||||
w20 = "int i=3; {\n";
|
w20 = "int i=3; {\n";
|
||||||
}
|
}
|
||||||
|
else if(in_h2xe() && hybrid::underlying == gTernary) {
|
||||||
|
w21 = " for(int i=0; i<3; i++) {\n";
|
||||||
|
w20 = "int i=4; {\n";
|
||||||
|
}
|
||||||
|
else if(in_h2xe() && hybrid::underlying == gBinaryTiling) {
|
||||||
|
w20 = "int i = sides == 8 ? 5 : position.y < 0. ? 5 : 6; {\n";
|
||||||
|
w21 = "for(int i=1; i<4; i++) {\n";
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
w20 = " for(int i="+its(flat2)+"; i<"+its(S7)+"; i++) {\n";
|
w20 = " for(int i="+its(flat2)+"; i<"+its(S7)+"; i++) {\n";
|
||||||
w21 = "for(int i=0; i<"+its(flat1)+"; i++) {\n";
|
w21 = "for(int i=0; i<"+its(flat1)+"; i++) {\n";
|
||||||
|
Loading…
Reference in New Issue
Block a user