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

Arcmedge now accepts a^:b which means that a is repeated b times. Also the computations now work for real a, b

Browse Source
This commit is contained in:
Zeno Rogue
2022-04-21 21:50:40 +02:00
parent fb2431cc31
commit 592605c6e2
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
util.cpp
View File

@@ -240,19 +240,21 @@ cld exp_parser::parse(int prio) {
}
#if CAP_ARCM
else if(eat("arcmedge(")) {
vector<int> vals;
vals.push_back(iparse(0));
if(!hyperbolic && !sphere) throw hr_parse_exception("arcmedge works only in hyperbolic and spherical geometry");
vector<pair<ld, ld>> vals;
vals.emplace_back(rparse(0), 1);
while(true) {
skip_white();
if(eat(",")) vals.push_back(iparse(0));
if(eat(":^")) {
ld rep = rparse(0);
vals.back().second *= rep;
}
if(eat(",")) vals.emplace_back(rparse(0), 1);
else break;
}
force_eat(")");
arcm::archimedean_tiling test;
test.faces = vals;
test.compute_sum();
test.compute_geometry();
res = test.edgelength;
res = arcm::compute_edgelength(vals);
if(real(res) < 1e-10) throw hr_parse_exception("wrong geometry for this arcmedge");
if (auto *distunit = hr::at_or_null(extra_params, "distunit"))
res /= *distunit;
}