window(1280, 960),
keyboard(window),
mouse(window),
- ui_res("r2c2.res"),
+ ui_res("data/r2c2.res"),
root(ui_res, &window, &keyboard, &mouse),
base_object(0),
cur_route(0),
window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
// Setup catalogue and layout
- DataFile::load(catalogue, "tracks.dat");
- DataFile::load(catalogue, "terrain.dat");
+ catalogue.add_source("data/Märklin/H0");
cat_layout_3d = new Layout3D(catalogue.get_layout());
overlay->add_graphic(obj3d, "trackcircuit");
overlay->set_label(obj3d, lexical_cast<string>(saddr));
}
- else if(unsigned taddr = track->get_turnout_address())
+ else if(track->get_type().is_turnout())
{
+ unsigned taddr = track->get_turnout_address();
if(taddr<0x800)
{
overlay->add_graphic(obj3d, "turnout");
if(Object *obj = pick_object(Vector(x*2.0f/rgeom.w-1.0f, y*2.0f/rgeom.h-1.0f, 0)))
{
const ObjectType &otype = obj->get_type();
- string info = format("%d %s", otype.get_article_number(), otype.get_description());
+ string info = format("%d %s", otype.get_article_number(), otype.get_name());
if(Track *track = dynamic_cast<Track *>(obj))
{
if(mode!=CATALOGUE && abs(track->get_tilt()).radians()>1e-4)
info += format(" (slope %.1f%%)", abs(tan(track->get_tilt())*100));
- if(track->get_turnout_address())
+ if(track->get_type().is_turnout())
info += format(" (turnout %d)", track->get_turnout_address());
else if(track->get_sensor_address())
info += format(" (sensor %d)", track->get_sensor_address());
}
+ if(mode==CATALOGUE)
+ {
+ const string &descr = otype.get_description();
+ if(!descr.empty())
+ {
+ info += '\n';
+ info += otype.get_description();
+ }
+ }
return info;
}
Track3D &t3d = layout_3d->get_3d(**i);
Path3D *path = new Path3D(t3d);
path->set_color(GL::Color(0.5, 0.8, 1.0));
- if(unsigned taddr = (*i)->get_turnout_address())
- path->set_path(route.get_turnout(taddr));
+ if((*i)->get_type().is_turnout())
+ path->set_path(route.get_turnout((*i)->get_turnout_address()));
highlight_paths.push_back(path);
}
}