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:: moved functions outside class

Browse Source
This commit is contained in:
Zeno Rogue
2023-01-27 11:15:42 +01:00
parent a73f85c88a
commit 9e2059e72b
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
embeddings.cpp
View File

@@ -229,7 +229,7 @@ EX }
#if HDR #if HDR
struct embedding_method { struct embedding_method {
virtual ld center_z() { return 0; } virtual ld center_z() { return 0; }
virtual hyperpoint tile_center() { ld z = center_z(); if(z == 0) return C0; else return zpush0(z); } virtual hyperpoint tile_center();
virtual transmatrix intermediate_to_actual_translation(hyperpoint i) = 0; virtual transmatrix intermediate_to_actual_translation(hyperpoint i) = 0;
virtual hyperpoint intermediate_to_actual(hyperpoint i) { return intermediate_to_actual_translation(i) * tile_center(); } virtual hyperpoint intermediate_to_actual(hyperpoint i) { return intermediate_to_actual_translation(i) * tile_center(); }
virtual hyperpoint actual_to_intermediate(hyperpoint a) = 0; virtual hyperpoint actual_to_intermediate(hyperpoint a) = 0;
@@ -242,7 +242,7 @@ EX }
virtual hyperpoint actual_to_base(hyperpoint h) = 0; virtual hyperpoint actual_to_base(hyperpoint h) = 0;
virtual transmatrix actual_to_base(const transmatrix &T) = 0; virtual transmatrix actual_to_base(const transmatrix &T) = 0;
virtual hyperpoint normalize_flat(hyperpoint a) { return flatten(normalize(a)); } virtual hyperpoint normalize_flat(hyperpoint a) { return flatten(normalize(a)); }
virtual hyperpoint flatten(hyperpoint a) { auto i = actual_to_intermediate(a); auto l = intermediate_to_logical * i; l[2] = 0; i = logical_to_intermediate * l; return intermediate_to_actual(i); } virtual hyperpoint flatten(hyperpoint a);
virtual transmatrix get_radar_transform(const transmatrix& V); virtual transmatrix get_radar_transform(const transmatrix& V);
virtual transmatrix get_lsti() { return Id; } virtual transmatrix get_lsti() { return Id; }
virtual transmatrix get_lti() { return logical_scaled_to_intermediate; } virtual transmatrix get_lti() { return logical_scaled_to_intermediate; }
@@ -284,6 +284,12 @@ EX geometry_information *swapper;
struct auaua : embedding_method { int z; }; struct auaua : embedding_method { int z; };
hyperpoint embedding_method::tile_center() {
ld z = center_z();
if(z == 0) return C0;
return lzpush(z) * C0;
}
transmatrix embedding_method::map_relative_push(hyperpoint a) { transmatrix embedding_method::map_relative_push(hyperpoint a) {
auto i = actual_to_intermediate(a); auto i = actual_to_intermediate(a);
return intermediate_to_actual_translation(i); return intermediate_to_actual_translation(i);
@@ -297,6 +303,13 @@ hyperpoint embedding_method::orthogonal_move(const hyperpoint& a, ld z) {
return intermediate_to_actual(i); return intermediate_to_actual(i);
} }
hyperpoint embedding_method::flatten(hyperpoint a) {
auto i = actual_to_intermediate(a);
auto l = intermediate_to_logical * i;
l[2] = 0; i = logical_to_intermediate * l;
return intermediate_to_actual(i);
}
/** dummy 'embedding method' used when no embedding is used (2D engine or 3D map) */ /** dummy 'embedding method' used when no embedding is used (2D engine or 3D map) */
struct emb_none : embedding_method { struct emb_none : embedding_method {