+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
#include <cmath>
#include <limits>
#include <GL/gl.h>
#include <msp/core/except.h>
#include <msp/core/getopt.h>
+#include <msp/fs/stat.h>
#include <msp/gbase/display.h>
#include <msp/gbase/window.h>
#include <msp/gl/immediate.h>
#include <msp/strings/formatter.h>
#include <msp/strings/lexicalcast.h>
#include <msp/strings/regex.h>
+#include "libmarklin/tracktype.h"
#include "engineer.h"
#include "mainpanel.h"
#include "trainpanel.h"
using namespace Marklin;
using namespace Msp;
-#include <iostream>
-
Engineer::Engineer(int argc, char **argv):
screen_w(1280),
screen_h(960),
layout_3d.set_quality(quality);
catalogue.load("tracks.dat");
+ catalogue.load("locos.dat");
const vector<string> &args=getopt.get_args();
if(args.empty())
throw UsageError("No layout given");
- layout.load(args.front());
+ 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");
const map<unsigned, Sensor *> &sensors=control.get_sensors();
for(map<unsigned, Sensor *>::const_iterator i=sensors.begin(); i!=sensors.end(); ++i)
Engineer::~Engineer()
{
+ trfc_mgr->save("engineer.state");
delete trfc_mgr;
}
-Train *Engineer::add_train(unsigned addr)
+void Engineer::add_train()
{
- if(addr==0)
- {
- 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_stale=false;
- train_prop->set_visible(true);
-
- return 0;
- }
- else
- {
- Locomotive *loco=new Locomotive(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);
+ 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_stale=false;
+ train_prop->set_visible(true);
+}
- placing_train=train;
- placing_block=0;
- main_panel->set_status_text("Select location");
+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;
+}
- return train;
- }
+void Engineer::place_train(Train &train)
+{
+ placing_train=&train;
+ placing_block=0;
+ main_panel->set_status_text("Select location");
}
int Engineer::main()
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- DataFile::load(ui_res, "engineer.res");
+ DataFile::load(ui_res, "marklin.res");
root=new GLtk::Root(ui_res, *wnd);
root->set_visible(true);
main_panel->set_position(0, screen_h-main_panel->get_geometry().h);
main_panel->set_visible(true);
+ const list<Train *> &trains=trfc_mgr->get_trains();
+ int y=main_panel->get_geometry().y;
+ for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+ {
+ TrainPanel *tpanel=new TrainPanel(*this, ui_res, **i);
+ root->add(*tpanel);
+ tpanel->set_position(0, y-tpanel->get_geometry().h);
+ train_panels.push_back(tpanel);
+ tpanel->set_visible(true);
+ y-=tpanel->get_geometry().h;
+ }
+
wnd->show();
Application::main();
GL::pop_matrix();
}
+ const list<Train *> &trains=trfc_mgr->get_trains();
+ for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+ {
+ GL::PushMatrix _push;
+
+ const Point &tp=(*i)->get_position();
+ GL::translate(tp.x, tp.y, 0.02);
+ GL::Immediate imm((GL::COLOR4_UBYTE, GL::VERTEX2));
+ imm.color(0.8f, 0.8f, 1.0f);
+ imm.begin(GL::TRIANGLE_FAN);
+ imm.vertex(0, 0);
+ for(unsigned j=0; j<=12; ++j)
+ imm.vertex(0.02*cos(j*M_PI/6), 0.02*sin(j*M_PI/6));
+ imm.end();
+
+ GL::rotate(cam_rot*180/M_PI, 0, 0, 1);
+ GL::translate(0.03, -0.02, 0);
+ GL::scale_uniform(0.04);
+ ui_res.get_default_font().draw_string((*i)->get_name());
+ GL::Texture::unbind();
+ }
+
GL::matrix_mode(GL::PROJECTION);
GL::load_identity();
GL::ortho_bottomleft(screen_w, screen_h);
{
if(placing_train)
{
- if(btn==1 && placing_block)
+ if(btn==1 && placing_block && !placing_block->get_train())
{
set_block_color(*placing_block, GL::Color(1, 1, 1));
if(unsigned tid=track->get_track().get_turnout_id())
{
Turnout &turnout=control.get_turnout(tid);
- turnout.set_route(1-turnout.get_route());
+ turnout.set_route((turnout.get_route()+1)%track->get_track().get_type().get_n_routes());
}
else if(simulate)
{
if(&block!=placing_block)
{
if(placing_block)
- set_block_color(*placing_block, GL::Color(1, 1, 1));
+ reset_block_color(*placing_block);
placing_block=█
placing_entry=0;
set_block_color(*placing_block, GL::Color(0.5, 1, 0.7));
layout_3d.get_track(**i).set_color(color);
}
-void Engineer::sensor_event(bool state, Sensor *sensor)
-{
- const list<Track3D *> <racks=layout_3d.get_tracks();
- for(list<Track3D *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
- if((*i)->get_track().get_sensor_id()==sensor->get_address())
- {
- Block &block=trfc_mgr->get_block_by_track((*i)->get_track());
- if(state)
- (*i)->set_color(GL::Color(1, 0.5, 0.3));
- else if(block.get_train())
- set_block_color(block, GL::Color(1, 1, 0.3));
- else
- (*i)->set_color(GL::Color(1, 1, 1));
- }
-}
-
-void Engineer::block_reserved(const Block &block, const Train *train)
+void Engineer::reset_block_color(const Block &block)
{
if(unsigned sid=block.get_sensor_id())
{
Sensor &sensor=control.get_sensor(sid);
if(sensor.get_state())
+ {
+ set_block_color(block, GL::Color(1, 0.5, 0.3));
return;
+ }
}
- if(train)
+ if(block.get_train())
set_block_color(block, GL::Color(1, 1, 0.3));
else
set_block_color(block, GL::Color(1, 1, 1));
}
+void Engineer::sensor_event(bool, Sensor *sensor)
+{
+ const list<Block *> &blocks=trfc_mgr->get_blocks();
+ for(list<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ if((*i)->get_sensor_id()==sensor->get_address())
+ reset_block_color(**i);
+}
+
+void Engineer::block_reserved(const Block &block, const Train *)
+{
+ reset_block_color(block);
+}
+
void Engineer::project_3d()
{
glMatrixMode(GL_PROJECTION);
projects / r2c2.git / blobdiff