X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=antikythera;a=blobdiff_plain;f=src%2Fmparser.cc;h=3bfe8ce9e1c6f4194ee4f2691790b6615958a2bc;hp=10ea6ba68b5e816605d2c802a5c5d04cef348477;hb=caee16904b985501cff521557c9ab487d2d96a91;hpb=6879b81017c2662b0c5a0b9027df8cf13b10545a diff --git a/src/mparser.cc b/src/mparser.cc index 10ea6ba..3bfe8ce 100644 --- a/src/mparser.cc +++ b/src/mparser.cc @@ -37,7 +37,7 @@ struct ParserState { std::map func; std::map gears; - std::stack cur_gear; + std::vector cur_gear; Motor *cur_motor; }; @@ -73,6 +73,7 @@ static int get_func_arity(ParserState *ps, const char *name); static Gear *begin_gear(ParserState *ps); static bool end_gear(ParserState *ps); static Gear *this_gear(ParserState *ps); +static Gear *find_gear(ParserState *ps, const char *name); static void update_gear_vars(ParserState *ps, Gear *gear); static bool set_gear_var(Gear *gear, const char *name, const Value &val); @@ -81,6 +82,7 @@ static bool set_motor_var(ParserState *ps, Motor *motor, const char *name, const // built-in functions static bool func_adjacent(ParserState *ps); +static bool func_coaxial(ParserState *ps); bool parse_machine(Machine *mcn, const char *fname) @@ -100,6 +102,7 @@ bool parse_machine(Machine *mcn, const char *fname) // init built-in function table set_func(&pstate, "adjacent", func_adjacent, 2); + set_func(&pstate, "coaxial", func_coaxial, 2); nextchar(&pstate); bool res = machine(&pstate); @@ -323,7 +326,7 @@ static bool vector(ParserState *ps) expected(ps, "numbers as vector elements"); return false; } - vec.v[i] = tmp.v[0]; + vec.v[nelem - i - 1] = tmp.v[0]; ps->val.pop(); } @@ -579,7 +582,7 @@ static void print_value(const Value &val, FILE *fp) static Gear *begin_gear(ParserState *ps) { Gear *res = new Gear; - ps->cur_gear.push(res); + ps->cur_gear.push_back(res); return res; } @@ -589,8 +592,8 @@ static bool end_gear(ParserState *ps) errmsg(ps, "parser error: unbalanced end_gear"); return false; } - Gear *gear = ps->cur_gear.top(); - ps->cur_gear.pop(); + Gear *gear = ps->cur_gear.back(); + ps->cur_gear.pop_back(); printf("DBG: end_gear: %s\n", gear->name.c_str()); @@ -602,12 +605,30 @@ static bool end_gear(ParserState *ps) printf("DBG: adding gear: %s\n", gear->name.c_str()); ps->gears[gear->name] = gear; ps->mcn->add_gear(gear); + + if(!ps->cur_gear.empty()) { + ps->cur_gear.back()->attach(gear); + } return true; } static Gear *this_gear(ParserState *ps) { - return ps->cur_gear.empty() ? 0 : ps->cur_gear.top(); + return ps->cur_gear.empty() ? 0 : ps->cur_gear.back(); +} + +static Gear *find_gear(ParserState *ps, const char *name) +{ + // search progressively wider lexical scopes + std::vector::const_reverse_iterator it = ps->cur_gear.rbegin(); + while(it != ps->cur_gear.rend()) { + Gear *g = *it++; + if(g->name == std::string(name)) { + return g; + } + } + + return ps->gears[name]; } static void update_gear_vars(ParserState *ps, Gear *gear) @@ -646,6 +667,7 @@ static bool set_gear_var(Gear *gear, const char *name, const Value &val) ASSERT_TYPE(val, VAL_VEC); gear->axis = VVEC3(val); gear->pdist = val.v[3]; + printf("setting plane eqn: %f %f %f %f\n", val.v[0], val.v[1], val.v[2], val.v[3]); } else if(strcmp(name, "thickness") == 0) { ASSERT_TYPE(val, VAL_NUM); @@ -717,15 +739,15 @@ static bool set_motor_var(ParserState *ps, Motor *motor, const char *name, const // built-in functions static bool func_adjacent(ParserState *ps) { - Value val_dir = ps->val.top(); ps->val.pop(); + Value val_angle = ps->val.top(); ps->val.pop(); Value val_gear_name = ps->val.top(); ps->val.pop(); if(val_gear_name.type != VAL_STR) { expected(ps, "gear name (string) as 1st arg to adjacent"); return false; } - if(val_dir.type != VAL_VEC) { - expected(ps, "direction vector as 2nd arg to adjacent"); + if(val_angle.type != VAL_NUM) { + expected(ps, "angle as 2nd arg to adjacent"); return false; } @@ -741,11 +763,51 @@ static bool func_adjacent(ParserState *ps) return false; } - Vec3 dir = Vec3(val_dir.v[0], val_dir.v[1], val_dir.v[2]); + Mat4 xform; + xform.rotation(deg_to_rad(val_angle.v[0]), gother->axis); + Vec3 dir = xform * Vec3(0, 1, 0); float sum_radii = gthis->radius + gother->radius; float avg_teeth_len = (gthis->teeth_length + gother->teeth_length) * 0.5; - Vec3 pos = gother->pos + normalize(dir) * (sum_radii - avg_teeth_len * 0.75); + Vec3 pos = gother->pos + dir * (sum_radii - avg_teeth_len * 0.75); + + Value res; + res.type = VAL_VEC; + res.v[0] = pos.x; + res.v[1] = pos.y; + res.v[2] = pos.z; + ps->val.push(res); + return true; +} + +static bool func_coaxial(ParserState *ps) +{ + Value val_dist = ps->val.top(); ps->val.pop(); + Value val_gear_name = ps->val.top(); ps->val.pop(); + + if(val_gear_name.type != VAL_STR) { + expected(ps, "gear name (string) as 1st arg to func_coaxial"); + return false; + } + if(val_dist.type != VAL_NUM) { + expected(ps, "stacking distance as 2nd arg to func_coaxial"); + return false; + } + + Gear *gthis = this_gear(ps); + if(!gthis) { + errmsg(ps, "coaxial: called outside of a gear block"); + return false; + } + + Gear *gother = find_gear(ps, val_gear_name.s.c_str()); + if(!gother) { + errmsg(ps, "coaxial: gear \"%s\" not found", val_gear_name.s.c_str()); + return false; + } + + float avg_thickness = (gthis->thickness + gother->thickness) * 0.5; + Vec3 pos = gother->pos + gother->axis * val_dist.v[0] * avg_thickness; Value res; res.type = VAL_VEC;