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

embeddings:: fixed swapmatrix_iview for center_z changes

Browse Source
This commit is contained in:
Zeno Rogue
2023-05-01 15:51:06 +02:00
parent cca6b1b721
commit a6c3ea03e4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
embeddings.cpp
View File

@@ -1215,7 +1215,7 @@ EX void swapmatrix_iview(transmatrix& ori, transmatrix& V) {
indenter id(2); indenter id(2);
if(geom3::swap_direction == -1) { if(geom3::swap_direction == -1) {
auto& data = mdata[&V]; auto& data = mdata[&V];
data.logical_coordinates = cgi.emb->intermediate_to_logical * cgi.emb->actual_to_intermediate(V*tile_center()); data.logical_coordinates = cgi.emb->intermediate_to_logical * cgi.emb->actual_to_intermediate(V*C0);
auto tl = cgi.emb->intermediate_to_actual_translation(cgi.emb->logical_to_intermediate * data.logical_coordinates); auto tl = cgi.emb->intermediate_to_actual_translation(cgi.emb->logical_to_intermediate * data.logical_coordinates);
auto itl = inverse(tl); auto itl = inverse(tl);
data.rotation = itl * V; data.rotation = itl * V;
@@ -1233,7 +1233,7 @@ EX void swapmatrix_iview(transmatrix& ori, transmatrix& V) {
auto& data = mdata[&V]; auto& data = mdata[&V];
if(!eqmatrix(data.saved, V)) { swapmatrix(V); ori = Id; return; } if(!eqmatrix(data.saved, V)) { swapmatrix(V); ori = Id; return; }
auto lc = data.logical_coordinates; auto lc = data.logical_coordinates;
lc[2] = lerp(cgi.FLOOR, cgi.WALL, lc[2]); lc[2] = lerp(cgi.FLOOR, cgi.WALL, lc[2]) + cgi.emb->center_z();
V = cgi.emb->intermediate_to_actual_translation( cgi.emb->logical_to_intermediate * lc ); V = cgi.emb->intermediate_to_actual_translation( cgi.emb->logical_to_intermediate * lc );
ori = Id; ori = Id;
auto rot = data.rotation; auto rot = data.rotation;