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),
server(0),
- main_view(layout_3d, window.get_width(), window.get_height())
+ main_view(layout_3d, window.get_width(), window.get_height()),
+ emergency_blink_state(0)
{
// Setup GUI
window.set_title("Railroad Engineer");
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())
- layout.get_driver().signal_locomotive_detected.connect(sigc::mem_fun(this, &Engineer::locomotive_detected));
+ {
+ Driver &driver = layout.get_driver();
+ driver.signal_locomotive_detected.connect(sigc::mem_fun(this, &Engineer::locomotive_detected));
+ driver.signal_halt.connect(sigc::mem_fun(this, &Engineer::halt_event));
+ }
layout.signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added));
- layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::set_status));
+ layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::emergency));
const set<Block *> &blocks = layout.get_all<Block>();
for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
if(TrackCircuit *tc = (*i)->get_sensor())
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)
(*i)->prepare();
- if(status_timeout && Time::now()>status_timeout)
+ Time::TimeStamp t = Time::now();
+ if(status_timeout && t>status_timeout)
{
main_wnd->set_status_text(string());
status_timeout = Time::TimeStamp();
}
+ if(!emergencies.empty() && t>emergency_blink_timeout)
+ {
+ emergency_blink_state = (emergency_blink_state+1)%2;
+ GL::Color color(1.0f/(1+emergency_blink_state), 0.0f, 0.0f);
+ for(list<TrackChain3D *>::iterator i=emergencies.begin(); i!=emergencies.end(); ++i)
+ (*i)->set_color(color);
+ emergency_blink_timeout = t+0.5*Time::sec;
+ }
GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
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);
+ 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)
+{
+ if(!h)
+ {
+ for(list<TrackChain3D *>::iterator i=emergencies.begin(); i!=emergencies.end(); ++i)
+ delete *i;
+ emergencies.clear();
+ }
}
void Engineer::locomotive_detected(const Driver::DetectedLocomotive &loco)