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

binary:: relative_matrix now uses updir

Browse Source
This commit is contained in:
Zeno Rogue
2019-08-02 22:08:30 +02:00
parent 5491848ee9
commit 3cb39a0f8c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
binary-tiling.cpp
View File

@@ -396,10 +396,10 @@ namespace binary {
return inverse(gmatrix0[h1->c7]) * gmatrix0[h2->c7]; return inverse(gmatrix0[h1->c7]) * gmatrix0[h2->c7];
transmatrix gm = Id, where = Id; transmatrix gm = Id, where = Id;
while(h1 != h2) { while(h1 != h2) {
int up_step = geometry == gBinary4 ? 3 : S7-1; int up_step = updir();
if(h1->distance <= h2->distance) { if(h1->distance <= h2->distance) {
if(geometry != gBinaryTiling) if(geometry != gBinaryTiling)
where = itmatrix(h2, S7-1) * where, h2 = may_create_step(h2, up_step); where = itmatrix(h2, up_step) * where, h2 = may_create_step(h2, up_step);
else { else {
if(type_of(h2) == 6) if(type_of(h2) == 6)
h2 = may_create_step(h2, bd_down), where = xpush(-log(2)) * where; h2 = may_create_step(h2, bd_down), where = xpush(-log(2)) * where;
@@ -411,7 +411,7 @@ namespace binary {
} }
else { else {
if(geometry != gBinaryTiling) if(geometry != gBinaryTiling)
gm = gm * tmatrix(h1, S7-1), h1 = may_create_step(h1, up_step); gm = gm * tmatrix(h1, up_step), h1 = may_create_step(h1, up_step);
else { else {
if(type_of(h1) == 6) if(type_of(h1) == 6)
h1 = may_create_step(h1, bd_down), gm = gm * xpush(log(2)); h1 = may_create_step(h1, bd_down), gm = gm * xpush(log(2));