#include <cmath>
#include <limits>
+#include <signal.h>
#include <GL/gl.h>
#include <msp/core/except.h>
#include <msp/core/getopt.h>
#include <msp/gl/matrix.h>
#include <msp/gl/projection.h>
#include <msp/gl/transform.h>
+#include <msp/io/print.h>
#include <msp/strings/formatter.h>
#include <msp/strings/lexicalcast.h>
#include <msp/strings/regex.h>
layout(catalogue),
layout_3d(layout),
server(0),
- train_prop(0),
- train_prop_stale(false),
placing_train(0),
placing_block(0),
placing_entry(0),
DataFile::load(layout, args.front());
trfc_mgr = new TrafficManager(control, layout);
- trfc_mgr->signal_block_reserved.connect(sigc::mem_fun(this, &Engineer::block_reserved));
if(FS::exists("engineer.state"))
DataFile::load(*trfc_mgr, "engineer.state");
+ trfc_mgr->signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added));
+ trfc_mgr->signal_block_reserved.connect(sigc::mem_fun(this, &Engineer::block_reserved));
if(network)
{
i->second->signal_state_changed.connect(sigc::bind(sigc::mem_fun(this, &Engineer::sensor_event), i->second));
view_all();
+
+ catch_signal(SIGINT);
+ catch_signal(SIGTERM);
+ catch_signal(SIGSEGV);
+ catch_signal(SIGILL);
+ catch_signal(SIGFPE);
+ catch_signal(SIGABRT);
}
Engineer::~Engineer()
{
+ const list<Train *> &trains = trfc_mgr->get_trains();
+ for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+ (*i)->set_speed(0);
+
+ while(control.get_queue_length())
+ control.tick();
+
if(!simulate)
trfc_mgr->save("engineer.state");
delete trfc_mgr;
-}
-
-void Engineer::add_train()
-{
- train_prop = new TrainProperties(*this, ui_res, 0);
- root->add(*train_prop);
- train_prop->signal_ok.connect(sigc::mem_fun(this, &Engineer::dismiss_train_prop));
- train_prop->signal_cancel.connect(sigc::mem_fun(this, &Engineer::dismiss_train_prop));
- train_prop_stale = false;
- train_prop->set_visible(true);
-}
-
-Train *Engineer::add_train(const LocoType &type, unsigned addr)
-{
- Locomotive *loco = new Locomotive(type, control, addr);
- Train *train = new Train(*trfc_mgr, *loco);
- train->set_name(format("Train %d", trfc_mgr->get_trains().size()));
-
- TrainPanel *tpanel = new TrainPanel(*this, ui_res, *train);
- root->add(*tpanel);
- int y = main_panel->get_geometry().y;
- for(list<TrainPanel *>::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
- y -= (*i)->get_geometry().h;
- tpanel->set_position(0, y-tpanel->get_geometry().h);
- train_panels.push_back(tpanel);
- tpanel->set_visible(true);
-
- place_train(*train);
-
- return train;
+ delete server;
}
void Engineer::place_train(Train &train)
y -= tpanel->get_geometry().h;
}
+ const list<Block *> &blocks = trfc_mgr->get_blocks();
+ for(list<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ reset_block_color(**i);
+
wnd->show();
Application::main();
+ delete root;
delete glc;
delete wnd;
delete dpy;
if(track.get_turnout_id())
{
Turnout &trnt = control.get_turnout(track.get_turnout_id());
- (*i)->render_route(trnt.get_route());
+ (*i)->render_path(trnt.get_path());
}
else
- (*i)->render_route(-1);
+ (*i)->render_path(-1);
}
if(placing_train && placing_block)
const list<Train *> &trains = trfc_mgr->get_trains();
for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
{
+ if(!(*i)->is_placed())
+ continue;
+
GL::PushMatrix _push;
const Point &tp = (*i)->get_position();
- GL::translate(tp.x, tp.y, 0.02);
+ GL::translate(tp.x, tp.y, tp.z+0.02);
GL::Immediate imm((GL::COLOR4_UBYTE, GL::VERTEX2));
imm.color(0.8f, 0.8f, 1.0f);
imm.begin(GL::TRIANGLE_FAN);
root->render();
- if(train_prop_stale)
- {
- delete train_prop;
- train_prop = 0;
- }
-
glc->swap_buffers();
}
-void Engineer::key_press(unsigned key, unsigned mod, wchar_t ch)
-{
- if(train_prop)
- train_prop->key_press(key, mod, ch);
-}
-
void Engineer::button_press(int x, int y, unsigned btn, unsigned)
{
if(placing_train)
{
set_block_color(*placing_block, GL::Color(1, 1, 1));
- placing_train->place(placing_block, placing_entry);
+ placing_train->place(*placing_block, placing_entry);
placing_train = 0;
main_panel->set_status_text(string());
}
Turnout &turnout = control.get_turnout(tid);
try
{
- turnout.set_route((turnout.get_route()+1)%track->get_track().get_type().get_n_routes());
+ turnout.set_path((turnout.get_path()+1)%track->get_track().get_type().get_n_paths());
main_panel->set_status_text(format("Turnout %d switched", turnout.get_address()));
}
catch(const TurnoutBusy &e)
return layout_3d.pick_track(xx, yy, size);
}
-void Engineer::dismiss_train_prop()
+void Engineer::train_added(Train &train)
{
- train_prop_stale = true;
+ TrainPanel *tpanel = new TrainPanel(*this, ui_res, train);
+ root->add(*tpanel);
+ int y = main_panel->get_geometry().y;
+ for(list<TrainPanel *>::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
+ y -= (*i)->get_geometry().h;
+ tpanel->set_position(0, y-tpanel->get_geometry().h);
+ train_panels.push_back(tpanel);
+ tpanel->set_visible(true);
+
+ place_train(train);
+}
+
+void Engineer::sighandler(int sig)
+{
+ if(sig==SIGSEGV || sig==SIGILL || sig==SIGFPE || sig==SIGABRT)
+ {
+ signal(sig, SIG_DFL);
+ IO::print(IO::cerr, "Fatal signal received, terminating\n");
+ const map<unsigned, Locomotive *> &locos = control.get_locomotives();
+ for(map<unsigned, Locomotive *>::const_iterator i=locos.begin(); i!=locos.end(); ++i)
+ i->second->set_speed(0);
+ control.flush();
+ raise(sig);
+ }
+ else if(sig==SIGTERM || sig==SIGINT)
+ exit(0);
}
Application::RegApp<Engineer> Engineer::reg;
projects / r2c2.git / blobdiff