mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-20 07:30:26 +00:00
Code Issues Releases Wiki Activity

arb:: refactored set_defaults

Browse Source
This commit is contained in:
Zeno Rogue 2022-05-01 11:14:30 +02:00
parent edee92d877
commit 292bb72794
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arbitrile.cpp
View File

@ -590,23 +590,8 @@ EX void add_connection(arbi_tiling& c, int ai, int as, int bi, int bs, int m) {
while(bs != bs0);
}
EX void load(const string& fname, bool load_as_slided IS(false), bool keep_sliders IS(false)) {
fhstream f(fname, "rt");
if(!f.f) throw hr_parse_exception("file " + fname + " does not exist");
string s;
while(true) {
int c = fgetc(f.f);
if(c < 0) break;
s += c;
}
auto& c = load_as_slided ? slided : current;
EX void set_defaults(arb::arbi_tiling& c, bool keep_sliders, string fname) {
c.order++;
c.shapes.clear();
if(!keep_sliders) {
c.sliders.clear();
c.intsliders.clear();
}
int qsliders = 0, qintsliders = 0;
c.name = unnamed;
c.comment = "";
c.filename = fname;
@ -619,6 +604,25 @@ EX void load(const string& fname, bool load_as_slided IS(false), bool keep_slide
c.yendor_backsteps = 0;
c.is_star = false;
c.is_combinatorial = false;
c.shapes.clear();
if(!keep_sliders) {
c.sliders.clear();
c.intsliders.clear();
}
}
EX void load(const string& fname, bool load_as_slided IS(false), bool keep_sliders IS(false)) {
fhstream f(fname, "rt");
if(!f.f) throw hr_parse_exception("file " + fname + " does not exist");
string s;
while(true) {
int c = fgetc(f.f);
if(c < 0) break;
s += c;
}
auto& c = load_as_slided ? slided : current;
set_defaults(c, keep_sliders, fname);
int qsliders = 0, qintsliders = 0;
exp_parser ep;
ep.s = s;
ld angleunit = 1, distunit = 1;