Provide some telemetry values from ArduControl

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

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index aa82dcb66b0b50475dfa16b87dbf3c23ee34969f..68533bc11520114862acfed734c50cd07c91010b 100644 (file)
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -40,7 +40,7 @@ Engineer::Engineer(int argc, char **argv):
        window(options.screen_w, options.screen_h, options.fullscreen),
        keyboard(window),
        mouse(window),
-       ui_res("r2c2.res"),
+       ui_res("data/r2c2.res"),
        import_active(false),
        layout(catalogue, (options.driver.empty() ? 0 : Driver::create(options.driver))),
        layout_3d(layout),
@@ -69,10 +69,7 @@ Engineer::Engineer(int argc, char **argv):
        overlay = new Overlay3D(ui_res.get_default_font());
 
        // Setup railroad control
-       DataFile::load(catalogue, "tracks.dat");
-       DataFile::load(catalogue, "locos.dat");
-       DataFile::load(catalogue, "wagons.dat");
-       DataFile::load(catalogue, "terrain.dat");
+       catalogue.add_source("data/Märklin/H0");
        DataFile::load(layout, options.layout_fn);
 
        if(layout.has_driver())
@@ -174,6 +171,7 @@ void Engineer::tick()
        new_trains.clear();
 
        layout.tick();
+       layout_3d.tick();
        event_disp.tick(Time::zero);
 
        for(list<TrainView *>::iterator i=train_views.begin(); i!=train_views.end(); ++i)
@@ -308,17 +306,21 @@ Object *Engineer::pick_object(const Vector &p)
        GL::Vector4 ray = main_view.get_camera().unproject(GL::Vector4(p.x, p.y, 0, 0));
 
        // XXX Do this better; make this function a template?
-       if(Vehicle *veh = layout.pick<Vehicle>(Ray(start, Vector(ray))))
+       if(Vehicle *veh = layout.pick<Vehicle>(Ray(start, ray.slice<3>(0))))
                return veh;
-       return layout.pick<Track>(Ray(start, Vector(ray)));
+       return layout.pick<Track>(Ray(start, ray.slice<3>(0)));
 }
 
 void Engineer::emergency(Block *block, const string &msg)
 {
        set_status(msg);
-       TrackChain3D *tch3d = new TrackChain3D(layout_3d, *block);
-       tch3d->set_color(GL::Color(1.0f, 0.0f, 0.0f));
-       emergencies.push_back(tch3d);
+       if(block)
+       {
+               TrackChain3D *tch3d = new TrackChain3D(layout_3d, *block);
+               tch3d->set_color(GL::Color(1.0f, 0.0f, 0.0f));
+               tch3d->set_layer(2);
+               emergencies.push_back(tch3d);
+       }
 }
 
 void Engineer::halt_event(bool h)