mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-24 02:17:40 +00:00
Code Issues Releases Wiki Activity

binary product now uses curved shapes

Browse Source
This commit is contained in:
Zeno Rogue
2021-10-07 16:48:39 +02:00
parent 62c4ddef45
commit fe1e1d1f16
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
polygons.cpp
View File

@@ -810,6 +810,8 @@ void geometry_information::make_wall(int id, vector<hyperpoint> vertices, vector
auto d = product_decompose(vertices[i]); auto d = product_decompose(vertices[i]);
altitudes[i] = d.first; altitudes[i] = d.first;
vertices[i] = d.second; vertices[i] = d.second;
if(bt::in())
vertices[i] = deparabolic13(vertices[i]);
} }
} }
@@ -817,7 +819,7 @@ void geometry_information::make_wall(int id, vector<hyperpoint> vertices, vector
ld w = 0; ld w = 0;
for(int i=0; i<n; i++) center += vertices[i] * weights[i], w += weights[i]; for(int i=0; i<n; i++) center += vertices[i] * weights[i], w += weights[i];
if(prod) center = normalize_flat(center); if(prod && !bt::in()) center = normalize_flat(center);
else center /= w; else center /= w;
ld center_altitude = 0; ld center_altitude = 0;
@@ -847,7 +849,8 @@ void geometry_information::make_wall(int id, vector<hyperpoint> vertices, vector
hyperpoint h = center + v1 * x + v2 * y; hyperpoint h = center + v1 * x + v2 * y;
if(nil && (x || y)) if(nil && (x || y))
h = nilv::on_geodesic(center, nilv::on_geodesic(v1+center, v2+center, y / (x+y)), x + y); h = nilv::on_geodesic(center, nilv::on_geodesic(v1+center, v2+center, y / (x+y)), x + y);
if(prod) { if(prod) {
if(bt::in()) h = PIU( parabolic13(h) );
h = zshift(normalize_flat(h), center_altitude * (1-x-y) + altitudes[a] * x + altitudes[b] * y); h = zshift(normalize_flat(h), center_altitude * (1-x-y) + altitudes[a] * x + altitudes[b] * y);
hpcpush(h); return; hpcpush(h); return;
} }
@@ -862,6 +865,7 @@ void geometry_information::make_wall(int id, vector<hyperpoint> vertices, vector
if(triangles && (a%3 != 1)) continue; if(triangles && (a%3 != 1)) continue;
hyperpoint h = (vertices[a] * (STEP-y) + vertices[(a+1)%n] * y)/STEP; hyperpoint h = (vertices[a] * (STEP-y) + vertices[(a+1)%n] * y)/STEP;
if(prod) { if(prod) {
if(bt::in()) h = PIU( parabolic13(h) );
h = zshift(normalize_flat(h), (altitudes[a] * (STEP-y) + altitudes[(a+1)%n] * y) / STEP); h = zshift(normalize_flat(h), (altitudes[a] * (STEP-y) + altitudes[(a+1)%n] * y) / STEP);
hpcpush(h); hpcpush(h);
} }