mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-13 10:50:35 +00:00
Code Issues Releases Wiki Activity

embeddings:: NFC, just using more lines

Browse Source
This commit is contained in:
Zeno Rogue 2023-02-21 18:55:07 +01:00
parent fa528e75d2
commit 999b26e818
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
embeddings.cpp
View File

@ -1170,7 +1170,9 @@ EX void swapmatrix_iview(transmatrix& ori, transmatrix& V) {
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*tile_center());
data.rotation = inverse(cgi.emb->map_relative_push(V*tile_center())) * V; auto tl = cgi.emb->intermediate_to_actual_translation(cgi.emb->logical_to_intermediate * data.logical_coordinates);
auto itl = inverse(tl);
data.rotation = itl * V;
data.logical_coordinates[2] = ilerp(cgi.FLOOR, cgi.WALL, data.logical_coordinates[2]); data.logical_coordinates[2] = ilerp(cgi.FLOOR, cgi.WALL, data.logical_coordinates[2]);
@ -1184,8 +1186,9 @@ EX void swapmatrix_iview(transmatrix& ori, transmatrix& V) {
if(!mdata.count(&V)) { swapmatrix(V); ori = Id; return; } if(!mdata.count(&V)) { swapmatrix(V); ori = Id; return; }
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; }
data.logical_coordinates[2] = lerp(cgi.FLOOR, cgi.WALL, data.logical_coordinates[2]); auto lc = data.logical_coordinates;
V = cgi.emb->intermediate_to_actual_translation( cgi.emb->logical_to_intermediate * data.logical_coordinates ); lc[2] = lerp(cgi.FLOOR, cgi.WALL, lc[2]);
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;
rot = cgi.emb->logical_scaled_to_intermediate * rot; rot = cgi.emb->logical_scaled_to_intermediate * rot;