Don't save an allocated but pending block

[r2c2.git] / source / designer / designer.cpp

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 3d068d0ad42d4252adb1561f45874e46bb6790ee..511c901b5d5b3c70aa9ef086f775ff4ca72cf302 100644 (file)
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -49,7 +49,7 @@ Designer::Designer(int argc, char **argv):
        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),
@@ -63,13 +63,14 @@ Designer::Designer(int argc, char **argv):
        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)
        {
@@ -519,7 +520,7 @@ Object *Designer::pick_object(const Vector &pointer)
        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)
@@ -537,8 +538,9 @@ void Designer::update_object_icon(Object &obj)
                        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");
@@ -590,16 +592,25 @@ string Designer::tooltip(int x, int y)
        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;
        }
 
@@ -623,8 +634,8 @@ void Designer::show_route(const Route &route)
                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);
        }
 }