+/* $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 <SDL.h>
#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/gl/matrix.h>
+#include <msp/gl/projection.h>
#include <msp/gl/transform.h>
#include <msp/strings/formatter.h>
#include <msp/strings/lexicalcast.h>
#include <msp/strings/regex.h>
+#include "libmarklin/except.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),
fullscreen(false),
layout(catalogue),
layout_3d(layout),
- no_lighting(false),
+ train_prop(0),
+ train_prop_stale(false),
placing_train(0),
placing_block(0),
placing_entry(0),
- simulate(false),
- train_prop(0),
- train_prop_stale(false)
+ no_lighting(false),
+ simulate(false)
{
string res;
- bool debug=false;
- string device="/dev/ttyS0";
- unsigned quality=4;
+ bool debug = false;
+ string device = "/dev/ttyS0";
+ unsigned quality = 4;
GetOpt getopt;
getopt.add_option('r', "resolution", res, GetOpt::REQUIRED_ARG);
{
if(RegMatch m=Regex("([1-9][0-9]*)x([1-9][0-9]*)").match(res))
{
- screen_w=lexical_cast<unsigned>(m[1].str);
- screen_h=lexical_cast<unsigned>(m[2].str);
+ screen_w = lexical_cast<unsigned>(m[1].str);
+ screen_h = lexical_cast<unsigned>(m[2].str);
}
else
throw UsageError("Invalid resolution");
layout_3d.set_quality(quality);
- catalogue.load("tracks.dat");
+ DataFile::load(catalogue, "tracks.dat");
+ DataFile::load(catalogue, "locos.dat");
- const vector<string> &args=getopt.get_args();
+ 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 = 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();
+ const map<unsigned, Sensor *> &sensors = control.get_sensors();
for(map<unsigned, Sensor *>::const_iterator i=sensors.begin(); i!=sensors.end(); ++i)
i->second->signal_state_changed.connect(sigc::bind(sigc::mem_fun(this, &Engineer::sensor_event), i->second));
Engineer::~Engineer()
{
+ if(!simulate)
+ trfc_mgr->save("engineer.state");
delete trfc_mgr;
}
-Train *Engineer::add_train(unsigned addr)
+void Engineer::add_train()
{
- /*if(control.get_locomotive(addr))
- return 0;*/
-
- if(addr==0)
- {
- train_prop=new TrainProperties(*this, ui_res, 0);
- train_prop->signal_ok.connect(sigc::mem_fun(this, &Engineer::dismiss_train_prop));
- train_prop_stale=false;
-
- 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()));
-
- //train_prop=new TrainProperties(ui_res, *train);
-
- TrainPanel *tpanel=new TrainPanel(*this, ui_res, *train);
- int y=main_panel->get_geometry().y;
- for(TrainPanelSeq::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);
+ 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;
- status_text="Select train 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()
{
- SDL_Init(SDL_INIT_VIDEO);
- SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
- SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4);
- SDL_Surface *screen=SDL_SetVideoMode(screen_w, screen_h, 32, SDL_OPENGL|(fullscreen?SDL_FULLSCREEN:0));
- if(!screen)
- {
- SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
- screen=SDL_SetVideoMode(screen_w, screen_h, 32, SDL_OPENGL|(fullscreen?SDL_FULLSCREEN:0));
- }
- if(!screen)
- {
- SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 0);
- screen=SDL_SetVideoMode(screen_w, screen_h, 32, SDL_OPENGL|(fullscreen?SDL_FULLSCREEN:0));
- }
- if(!screen)
- throw Exception("Couldn't create window");
+ dpy = new Graphics::Display;
+
+ Graphics::WindowOptions wopt;
+ wopt.width = screen_w;
+ wopt.height = screen_h;
+ wopt.fullscreen = fullscreen;
+ wnd = new Graphics::Window(*dpy, wopt);
+
+ Graphics::GLOptions glopt;
+ //glopt.multisample = 4;
+ glc = new Graphics::GLContext(*wnd, glopt);
- SDL_EnableUNICODE(1);
+ wnd->signal_close.connect(sigc::bind(sigc::mem_fun(this, &Engineer::exit), 0));
+ wnd->signal_button_press.connect(sigc::mem_fun(this, &Engineer::button_press));
+ wnd->signal_button_release.connect(sigc::mem_fun(this, &Engineer::button_release));
+ wnd->signal_pointer_motion.connect(sigc::mem_fun(this, &Engineer::pointer_motion));
glEnableClientState(GL_VERTEX_ARRAY);
glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- DataFile::load(ui_res, "engineer.res");
- main_panel=new MainPanel(*this, ui_res);
+ DataFile::load(ui_res, "marklin.res");
+ root = new GLtk::Root(ui_res, *wnd);
+ root->set_visible(true);
+
+ list<GL::Texture *> texs = ui_res.get_list<GL::Texture>();
+ for(list<GL::Texture *>::iterator i=texs.begin(); i!=texs.end(); ++i)
+ {
+ (*i)->set_min_filter(GL::NEAREST);
+ (*i)->set_mag_filter(GL::NEAREST);
+ }
+
+ main_panel = new MainPanel(*this, ui_res);
+ root->add(*main_panel);
main_panel->set_position(0, screen_h-main_panel->get_geometry().h);
+ main_panel->set_visible(true);
- Application::main();
+ 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;
+ }
- delete main_panel;
- for(TrainPanelSeq::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
- delete *i;
+ wnd->show();
+
+ Application::main();
- SDL_Quit();
+ delete glc;
+ delete wnd;
+ delete dpy;
return exit_code;
}
void Engineer::tick()
{
- //cout<<"tick\n";
-
- SDL_Event event;
- while(SDL_PollEvent(&event))
- {
- switch(event.type)
- {
- case SDL_MOUSEBUTTONDOWN:
- button_press(event.button.x, screen_h-1-event.button.y, event.button.button);
- break;
- case SDL_MOUSEBUTTONUP:
- button_release(event.button.x, screen_h-1-event.button.y, event.button.button);
- break;
- case SDL_MOUSEMOTION:
- pointer_motion(event.motion.x, screen_h-1-event.motion.y);
- break;
- case SDL_KEYDOWN:
- key_press(event.key.keysym.sym, event.key.keysym.mod, event.key.keysym.unicode);
- break;
- case SDL_QUIT:
- exit(0);
- break;
- }
- }
+ dpy->tick();
control.tick();
+ trfc_mgr->tick();
glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
glEnable(GL_LIGHTING);
glEnable(GL_LIGHT0);
float params[4];
- params[0]=0;
- params[1]=-0.2;
- params[2]=1;
- params[3]=0;
+ params[0] = 0;
+ params[1] = -0.2;
+ params[2] = 1;
+ params[3] = 0;
glLightfv(GL_LIGHT0, GL_POSITION, params);
}
glDisable(GL_LIGHTING);
glColor4f(1, 1, 1, 1);
- const Track3DSeq <racks=layout_3d.get_tracks();
- for(Track3DSeq::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
+ const list<Track3D *> <racks = layout_3d.get_tracks();
+ for(list<Track3D *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
{
- Track &track=(*i)->get_track();
+ Track &track = (*i)->get_track();
if(track.get_turnout_id())
{
- Turnout &trnt=control.get_turnout(track.get_turnout_id());
+ Turnout &trnt = control.get_turnout(track.get_turnout_id());
(*i)->render_route(trnt.get_route());
}
else
if(placing_train && placing_block)
{
- const Marklin::Block::Endpoint &bep=placing_block->get_endpoints()[placing_entry];
- float rot=bep.track->get_endpoint_direction(bep.track_ep);
- Point pos=bep.track->get_endpoint_position(bep.track_ep);
GL::push_matrix();
+
+ const Marklin::Block::Endpoint &bep = placing_block->get_endpoints()[placing_entry];
+ float rot = bep.track->get_endpoint_direction(bep.track_ep);
+ Point pos = bep.track->get_endpoint_position(bep.track_ep);
+
GL::translate(pos.x, pos.y, pos.z+0.03);
GL::rotate(rot*180/M_PI+180, 0, 0, 1);
GL::Texture::unbind();
- glColor4f(1, 1, 1, 1);
- glBegin(GL_TRIANGLE_FAN);
- glVertex2f(0.08, 0);
- glVertex2f(0.05, 0.03);
- glVertex2f(0.05, 0.01);
- glVertex2f(0, 0.01);
- glVertex2f(0, -0.01);
- glVertex2f(0.05, -0.01);
- glVertex2f(0.05, -0.03);
- glEnd();
+
+ GL::Immediate imm((GL::COLOR4_UBYTE, GL::VERTEX2));
+ imm.color(1.0f, 1.0f, 1.0f);
+ imm.begin(GL::TRIANGLE_FAN);
+ imm.vertex(0.08, 0);
+ imm.vertex(0.05, 0.03);
+ imm.vertex(0.05, 0.01);
+ imm.vertex(0, 0.01);
+ imm.vertex(0, -0.01);
+ imm.vertex(0.05, -0.01);
+ imm.vertex(0.05, -0.03);
+ imm.end();
+
GL::pop_matrix();
}
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- glOrtho(0, screen_w, 0, screen_h, 0, 1);
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
+ 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);
+ GL::matrix_mode(GL::MODELVIEW);
+ GL::load_identity();
glDisable(GL_DEPTH_TEST);
glDisable(GL_LIGHTING);
glDisable(GL_MULTISAMPLE);
- main_panel->render();
- for(TrainPanelSeq::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
- (*i)->render();
- if(train_prop)
- train_prop->render();
+ root->render();
if(train_prop_stale)
{
delete train_prop;
- train_prop=0;
+ train_prop = 0;
}
- const GL::Font &font=ui_res.get_default_font();
- GL::load_identity();
- GL::translate(340, 10, 0);
- GL::scale_uniform(font.get_default_size());
- glColor4f(1, 1, 1, 1);
- font.draw_string(status_text);
-
- SDL_GL_SwapBuffers();
+ glc->swap_buffers();
}
void Engineer::key_press(unsigned key, unsigned mod, wchar_t ch)
train_prop->key_press(key, mod, ch);
}
-void Engineer::button_press(int x, int y, unsigned btn)
+void Engineer::button_press(int x, int y, unsigned btn, unsigned)
{
- if(main_panel->get_geometry().is_inside(x, y))
- {
- main_panel->button_press(x, y-main_panel->get_geometry().y, btn);
- return;
- }
- for(TrainPanelSeq::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
- if((*i)->get_geometry().is_inside(x, y))
- {
- (*i)->button_press(x, y, btn);
- return;
- }
- if(train_prop && train_prop->get_geometry().is_inside(x, y))
- {
- train_prop->button_press(x, y, btn);
- return;
- }
-
if(placing_train)
{
- if(btn==1 && placing_block)
+ if(btn==1 && placing_block && !placing_block->get_train())
{
- set_block_color(*placing_block, Color(1, 1, 1));
+ set_block_color(*placing_block, GL::Color(1, 1, 1));
placing_train->place(placing_block, placing_entry);
- placing_train=0;
+ placing_train = 0;
+ main_panel->set_status_text(string());
}
else if(btn==3)
{
- const vector<Block::Endpoint> &endpoints=placing_block->get_endpoints();
- placing_entry=(placing_entry+1)%endpoints.size();
+ const vector<Block::Endpoint> &endpoints = placing_block->get_endpoints();
+ placing_entry = (placing_entry+1)%endpoints.size();
}
}
else
{
- Track3D *track=pick_track(x, y);
+ Track3D *track = pick_track(x, screen_h-y-1);
if(track)
{
if(unsigned tid=track->get_track().get_turnout_id())
{
- Turnout &turnout=control.get_turnout(tid);
- turnout.set_route(1-turnout.get_route());
+ Turnout &turnout = control.get_turnout(tid);
+ try
+ {
+ turnout.set_route((turnout.get_route()+1)%track->get_track().get_type().get_n_routes());
+ main_panel->set_status_text(format("Turnout %d switched", turnout.get_address()));
+ }
+ catch(const TurnoutBusy &e)
+ {
+ main_panel->set_status_text(e.what());
+ }
}
else if(simulate)
{
if(unsigned sid=track->get_track().get_sensor_id())
{
- Sensor &sensor=control.get_sensor(sid);
+ Sensor &sensor = control.get_sensor(sid);
control.signal_sensor_event.emit(sid, !sensor.get_state());
}
}
}
}
-void Engineer::button_release(int x, int y, unsigned btn)
+void Engineer::button_release(int, int, unsigned, unsigned)
{
- if(main_panel->get_geometry().is_inside(x, y))
- {
- main_panel->button_release(x, y-main_panel->get_geometry().y, btn);
- return;
- }
- for(TrainPanelSeq::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
- if((*i)->get_geometry().is_inside(x, y))
- {
- (*i)->button_release(x, y, btn);
- return;
- }
- if(train_prop && train_prop->get_geometry().is_inside(x, y))
- {
- train_prop->button_release(x, y, btn);
- return;
- }
}
void Engineer::pointer_motion(int x, int y)
{
- if(main_panel->get_geometry().is_inside(x, y))
- {
- main_panel->pointer_motion(x, y);
- return;
- }
- for(TrainPanelSeq::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
- if((*i)->get_geometry().is_inside(x, y))
- {
- (*i)->pointer_motion(x, y);
- return;
- }
- if(train_prop && train_prop->get_geometry().is_inside(x, y))
- {
- train_prop->pointer_motion(x, y);
- return;
- }
-
- Track3D *track=pick_track(x, y);
- if(track && placing_train)
+ if(placing_train)
{
- Block *block=trfc_mgr->get_block_by_track(&track->get_track());
- if(block!=placing_block)
+ Track3D *track = pick_track(x, screen_h-y-1);
+ if(track && placing_train)
{
- if(placing_block)
- set_block_color(*placing_block, Color(1, 1, 1));
- placing_block=block;
- placing_entry=0;
- set_block_color(*placing_block, Color(0.5, 1, 0.7));
+ Block &block = trfc_mgr->get_block_by_track(track->get_track());
+ if(&block!=placing_block)
+ {
+ if(placing_block)
+ reset_block_color(*placing_block);
+ placing_block = █
+ placing_entry = 0;
+ set_block_color(*placing_block, GL::Color(0.5, 1, 0.7));
+ }
}
+ else if(track && track->get_track().get_turnout_id())
+ main_panel->set_status_text(format("Turnout %d", track->get_track().get_turnout_id()));
+ else if(!placing_train)
+ main_panel->set_status_text(string());
}
- else if(track && track->get_track().get_turnout_id())
- {
- ostringstream ss;
- ss<<"Turnout "<<track->get_track().get_turnout_id();
- status_text=ss.str();
- }
- else if(!placing_train)
- status_text="";
}
void Engineer::view_all()
{
- const Track3DSeq &tracks=layout_3d.get_tracks();
+ const list<Track3D *> &tracks = layout_3d.get_tracks();
- cam_rot=0;
- float best_height=-1;
- float mid_x=0;
- float mid_y=0;
+ cam_rot = 0;
+ float best_height = -1;
+ float mid_x = 0;
+ float mid_y = 0;
for(float angle=0; angle<M_PI; angle+=0.01)
{
- float min_x=0;
- float max_x=0;
- float min_y=0;
- float max_y=0;
- for(Track3DSeq::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ float min_x = 0;
+ float max_x = 0;
+ float min_y = 0;
+ float max_y = 0;
+ for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
{
- Point minp,maxp;
+ Point minp, maxp;
(*i)->get_bounds(angle, minp, maxp);
- min_x=min(min_x, minp.x);
- max_x=max(max_x, maxp.x);
- min_y=min(min_y, minp.y);
- max_y=max(max_y, maxp.y);
+ min_x = min(min_x, minp.x);
+ max_x = max(max_x, maxp.x);
+ min_y = min(min_y, minp.y);
+ max_y = max(max_y, maxp.y);
}
- float width=max_x-min_x;
- float height=max_y-min_y;
- height=max(height, width);
+ float width = max_x-min_x;
+ float height = max_y-min_y;
+ height = max(height, width);
if(height<best_height || best_height<0)
{
- cam_rot=angle;
- best_height=height;
- mid_x=(min_x+max_x)/2;
- mid_y=(min_y+max_y)/2;
+ cam_rot = angle;
+ best_height = height;
+ mid_x = (min_x+max_x)/2;
+ mid_y = (min_y+max_y)/2;
}
}
- float c=cos(cam_rot);
- float s=sin(cam_rot);
- cam_pos.x=c*mid_x-s*mid_y;
- cam_pos.y=s*mid_x+c*mid_y;
- cam_pos.z=max(best_height*1.05/0.82843, 0.15);
+ float c = cos(cam_rot);
+ float s = sin(cam_rot);
+ cam_pos.x = c*mid_x-s*mid_y;
+ cam_pos.y = s*mid_x+c*mid_y;
+ cam_pos.z = max(best_height*1.05/0.82843, 0.15);
}
-void Engineer::set_block_color(const Block &block, const Color &color)
+void Engineer::set_block_color(const Block &block, const GL::Color &color)
{
- const set<Track *> &tracks=block.get_tracks();
+ const set<Track *> &tracks = block.get_tracks();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- layout_3d.get_track(*i)->set_color(color);
+ 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())
- {
- if(state)
- (*i)->set_color(Color(1, 0.5, 0.3));
- else
- (*i)->set_color(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);
- cout<<block.get_sensor_id()<<' '<<&sensor<<' '<<sensor.get_state()<<'\n';
+ Sensor &sensor = control.get_sensor(sid);
if(sensor.get_state())
+ {
+ set_block_color(block, GL::Color(1, 0.5, 0.3));
return;
+ }
}
- if(train)
- set_block_color(block, Color(1, 1, 0.3));
+ if(block.get_train())
+ set_block_color(block, GL::Color(1, 1, 0.3));
else
- set_block_color(block, Color(1, 1, 1));
+ 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);
glLoadIdentity();
- //glFrustum(-0.055228, 0.055228, -0.041421, 0.041421, 0.1, 10);
- glFrustum(-0.069036, 0.041421, -0.041421, 0.041421, 0.1, 10);
+ float offset = 200.0/screen_w*0.055228;
+ glFrustum(-0.055228-offset, 0.055228-offset, -0.041421, 0.041421, 0.1, 10);
glMatrixMode(GL_MODELVIEW);
}
Track3D *Engineer::pick_track(int x, int y)
{
- float xx=((float)(x-(int)screen_w*5/8)/screen_h)*0.82843;
- //float xx=((float)(x-(int)screen_w/2)/screen_h)*0.82843;
- float yy=((float)y/screen_h-0.5)*0.82843;
- float size=(float)4/screen_h*0.82843;
+ float xx = (static_cast<float>(x-static_cast<int>(screen_w)/2-100)/screen_h)*0.82843;
+ float yy = (static_cast<float>(y)/screen_h-0.5)*0.82843;
+ float size = 4.0/screen_h*0.82843;
project_3d();
glLoadIdentity();
void Engineer::dismiss_train_prop()
{
- train_prop_stale=true;
+ train_prop_stale = true;
}
Application::RegApp<Engineer> Engineer::reg;
projects / r2c2.git / blobdiff