mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-12-25 17:40:36 +00:00
parsecolortable
This commit is contained in:
parent
54443e365d
commit
3ca75bec8e
@ -770,9 +770,7 @@ EX shared_ptr<custom_parameter> param_colortable(colortable& val, const paramete
|
|||||||
u->custom_value = [] () { return -1; };
|
u->custom_value = [] () { return -1; };
|
||||||
u->custom_affect = [&val] (void *v) { return &val == v; };
|
u->custom_affect = [&val] (void *v) { return &val == v; };
|
||||||
u->custom_load = [&val] (const string& s) {
|
u->custom_load = [&val] (const string& s) {
|
||||||
auto seq = split_string(s, ',');
|
val = parsecolortable(s);
|
||||||
val.resize(isize(seq));
|
|
||||||
for(int i=0; i<isize(seq); i++) sscanf(seq[i].c_str(), "%x", &(val[i]));
|
|
||||||
};
|
};
|
||||||
u->custom_save = [&val] {
|
u->custom_save = [&val] {
|
||||||
bool first = true;
|
bool first = true;
|
||||||
|
11
util.cpp
11
util.cpp
@ -615,6 +615,17 @@ EX color_t parsecolor(const string& s, bool has_alpha) {
|
|||||||
return col;
|
return col;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EX colortable parsecolortable(const string& s) {
|
||||||
|
colortable tab;
|
||||||
|
tab.clear();
|
||||||
|
exp_parser ep;
|
||||||
|
ep.s = s;
|
||||||
|
tab.push_back(ep.parsecolor() >> 8);
|
||||||
|
while(ep.eat(","))
|
||||||
|
tab.push_back(ep.parsecolor() >> 8);
|
||||||
|
return tab;
|
||||||
|
}
|
||||||
|
|
||||||
EX trans23 parsematrix23(const string& s) {
|
EX trans23 parsematrix23(const string& s) {
|
||||||
trans23 t;
|
trans23 t;
|
||||||
#if MAXMDIM == 3
|
#if MAXMDIM == 3
|
||||||
|
Loading…
Reference in New Issue
Block a user