mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-30 21:42:59 +00:00
Code Issues Releases Wiki Activity

keepshape option removed

Browse Source
This commit is contained in:
Zeno Rogue
2018-01-28 12:25:56 +01:00
parent 8c8ea37ce0
commit 485a77a5f6
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rug.cpp
View File

@@ -36,7 +36,6 @@ namespace rug {
struct rug_exception { }; struct rug_exception { };
bool fast_euclidean = true; bool fast_euclidean = true;
bool keep_shape = true;
bool good_shape; bool good_shape;
ld modelscale = 1; ld modelscale = 1;
@@ -255,12 +254,12 @@ rugpoint *addRugpoint(hyperpoint h, double dist) {
else if(euclid && gwhere == gEuclid) { else if(euclid && gwhere == gEuclid) {
m->flat = h * modelscale; m->flat = h * modelscale;
m->valid = good_shape = true;
} }
else if(gwhere == gNormal && (euclid || (hyperbolic && modelscale >= 1))) { else if(gwhere == gNormal && (euclid || (hyperbolic && modelscale >= 1))) {
m->valid = good_shape = true; m->valid = good_shape = true;
ld d = hdist0(h); ld d = hdist0(h);
ld d0 = hypot2(h); if(!d0) d0 = 1; ld d0 = hypot2(h); if(!d0) d0 = 1;
@@ -840,7 +839,7 @@ void subdivide() {
if(m2 < m) continue; if(m2 < m) continue;
rugpoint *mm = addRugpoint(mid(m->h, m2->h), (m->dist+m2->dist)/2); rugpoint *mm = addRugpoint(mid(m->h, m2->h), (m->dist+m2->dist)/2);
halves[make_pair(m, m2)] = mm; halves[make_pair(m, m2)] = mm;
if(!good_shape || (torus && !keep_shape)) { if(!good_shape) {
using namespace hyperpoint_vec; using namespace hyperpoint_vec;
normalizer n(m->flat, m2->flat); normalizer n(m->flat, m2->flat);
hyperpoint h1 = n(m->flat); hyperpoint h1 = n(m->flat);
@@ -890,7 +889,7 @@ void addNewPoints() {
void physics() { void physics() {
if(keep_shape && good_shape) return; if(good_shape) return;
auto t = SDL_GetTicks(); auto t = SDL_GetTicks();
@@ -1531,9 +1530,7 @@ void show() {
dialog::addSelItem(XLAT("model iterations"), its(queueiter), 0); dialog::addSelItem(XLAT("model iterations"), its(queueiter), 0);
dialog::addSelItem(XLAT("field of view"), fts(fov) + "°", 'f'); dialog::addSelItem(XLAT("field of view"), fts(fov) + "°", 'f');
// dialog::addSelItem(XLAT("protractor"), fts(protractor * 180 / M_PI) + "°", 'f'); // dialog::addSelItem(XLAT("protractor"), fts(protractor * 180 / M_PI) + "°", 'f');
if(rug::rugged && torus) if(!good_shape) {
dialog::addBoolItem(XLAT("keep shape"), keep_shape, 'k');
if(!(keep_shape && good_shape)) {
dialog::addSelItem(XLAT("maximum error"), ftsg(err_zero), 'e'); dialog::addSelItem(XLAT("maximum error"), ftsg(err_zero), 'e');
if(rug::rugged) if(rug::rugged)
dialog::lastItem().value += " (" + ftsg(err_zero_current) + ")"; dialog::lastItem().value += " (" + ftsg(err_zero_current) + ")";
@@ -1589,6 +1586,7 @@ void show() {
enqueue(p); enqueue(p);
} }
last = modelscale; last = modelscale;
good_shape = false;
} }
} }
} }
@@ -1613,8 +1611,6 @@ void show() {
dialog::scaleLog(); dialog::scaleLog();
dialog::reaction = [] () { err_zero_current = err_zero; }; dialog::reaction = [] () { err_zero_current = err_zero; };
} }
else if(uni == 'k')
keep_shape = !keep_shape;
else if(uni == 'f') { else if(uni == 'f') {
dialog::editNumber(fov, 1, 170, 1, 45, "field of view", dialog::editNumber(fov, 1, 170, 1, 45, "field of view",
"Horizontal field of view, in the perspective projection. " "Horizontal field of view, in the perspective projection. "
@@ -1663,18 +1659,10 @@ int rugArgs() {
shift(); err_zero = argf(); shift(); err_zero = argf();
} }
else if(argis("-rugkeep")) {
shift(); keep_shape = true;
}
else if(argis("-rugtsize")) { else if(argis("-rugtsize")) {
shift(); rug::texturesize = argi(); shift(); rug::texturesize = argi();
} }
else if(argis("-rugnokeep")) {
shift(); keep_shape = false;
}
else if(argis("-rugv")) { else if(argis("-rugv")) {
shift(); vertex_limit = argi(); shift(); vertex_limit = argi();
} }