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());
layout = new Layout(catalogue);
+ layout->get_clock().set_current_time(12*Time::hour);
layout_3d = new Layout3D(*layout);
+ layout_3d->tick();
if(argc>1)
{
const GL::Vector3 &cpos = view.get_camera().get_position();
GL::Vector4 cray = view.get_camera().unproject(GL::Vector4(pointer.x, pointer.y, 0, 0));
- return view.get_layout().get_layout().pick<Object>(Ray(cpos, Vector(cray)));
+ return view.get_layout().get_layout().pick<Object>(Ray(cpos, cray.slice<3>(0)));
}
void Designer::update_object_icon(Object &obj)
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)
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;
}