*/
#include <signal.h>
+#include <algorithm>
#include <cmath>
#include <GL/gl.h>
#include <msp/gl/blend.h>
mode(SELECT),
manipulator(*this, selection),
measure(*this),
- camera_ctl(window, camera)
+ track_wrap(*this, selection)
{
window.set_title("Railway Designer");
window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
+ selection.signal_changed.connect(sigc::mem_fun(this, &Designer::selection_changed));
manipulator.signal_status.connect(sigc::mem_fun(this, &Designer::manipulation_status));
manipulator.signal_done.connect(sigc::mem_fun(this, &Designer::manipulation_done));
measure.signal_changed.connect(sigc::mem_fun(this, &Designer::measure_changed));
layout = new Layout(catalogue);
layout_3d = new Layout3D(*layout);
+ layout->signal_track_added.connect(sigc::mem_fun(this, &Designer::track_added));
+ layout->signal_track_removed.connect(sigc::mem_fun(this, &Designer::track_removed));
+
if(argc>1)
{
filename = argv[1];
pipeline->set_camera(&camera);
pipeline->add_renderable_for_pass(layout_3d->get_scene(), 0);
if(base_object)
- pipeline->add_renderable_for_pass(*base_object, 0);
+ pipeline->add_renderable(*base_object);
+ pipeline->add_renderable_for_pass(track_wrap, "unlit");
+ pipeline->add_renderable_for_pass(layout_3d->get_path_scene(), "unlit");
pipeline->add_renderable_for_pass(layout_3d->get_endpoint_scene(), "unlit");
light.set_position(0, -0.259, 0.966, 0);
pass->depth_test = &GL::DepthTest::lequal();
pass->blend = &GL::Blend::alpha();
+ pass = &pipeline->add_pass("blended");
+ pass->lighting = &lighting;
+ pass->depth_test = &GL::DepthTest::lequal();
+ pass->blend = &GL::Blend::alpha();
+
camera.set_up_direction(GL::Vector3(0, 0, 1));
- view_all();
+ camera.set_look_direction(GL::Vector3(0, 0.5, -0.866));
// Setup UI
DataFile::load(ui_res, "marklin.res");
overlay = new Overlay3D(window, camera, ui_res.get_default_font());
- const list<Track3D *> &tracks = layout_3d->get_tracks();
- for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- update_track_icon(**i);
+ camera_ctl = new CameraController(*this, *root, camera);
+ camera_ctl->view_all();
+
+ const Layout3D::TrackMap &tracks = layout_3d->get_tracks();
+ for(Layout3D::TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ update_track_icon(*i->second);
}
Designer::~Designer()
{
+ delete camera_ctl;
delete overlay;
delete root;
delete pipeline;
}
}
-void Designer::edit_route(Route &r)
+void Designer::rename_route()
{
if(!cur_route)
- pipeline->add_renderable_for_pass(layout_3d->get_path_scene(), "unlit");
+ return;
+
+ InputDialog *input = new InputDialog(*this, "Route name", cur_route->get_name());
+ input->signal_accept.connect(sigc::mem_fun(this, &Designer::route_name_accept));
+}
- cur_route = &r;
+void Designer::edit_route(Route *r)
+{
+ cur_route = r;
show_route(r);
}
try
{
- const set<Track *> &stracks = selection.get_tracks();
- set<const Track *> tracks(stracks.begin(), stracks.end());
- cur_route->add_tracks(tracks);
+ cur_route->add_tracks(selection.get_tracks());
}
catch(const Exception &e)
{
- IO::print("%s\n", e.what());
+ lbl_status->set_text(e.what());
}
- show_route(*cur_route);
+ show_route(cur_route);
}
Point Designer::map_pointer_coords(int x, int y)
window.get_display().tick();
root->tick();
- camera_ctl.tick(dt);
+ camera_ctl->tick(dt);
+
+ for(list<Track *>::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i)
+ layout_3d->get_track(**i).get_path().set_mask(0);
+ new_tracks.clear();
render();
key = Input::key_from_sys(key);
mod = Input::mod_from_sys(mod);
- if(key==Msp::Input::KEY_N)
+ if(key==Msp::Input::KEY_N && (mod&Input::MOD_SHIFT))
+ {
+ manipulator.start_extend();
+ mode = MANIPULATE;
+ }
+ else if(key==Msp::Input::KEY_N)
new_track();
else if(key==Msp::Input::KEY_G)
{
else if(key==Msp::Input::KEY_PLUS)
selection.select_more();
else if(key==Msp::Input::KEY_L && (mod&Input::MOD_SHIFT))
- {
- const set<Track *> &tracks = layout->get_tracks();
- float len = 0;
- for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- len += (*i)->get_type().get_total_length();
- IO::print("Total length: %.1fm\n", len);
- }
+ selection.select_blocks();
else if(key==Msp::Input::KEY_L)
selection.select_linked();
else if(key==Msp::Input::KEY_M)
set_sensor_id();
else if(key==Msp::Input::KEY_A)
add_selection_to_route();
+ else if(key==Msp::Input::KEY_C)
+ manipulator.connect();
}
void Designer::button_press(int x, int y, unsigned btn, unsigned mod)
{
pipeline->render_all();
GL::enable(GL_CULL_FACE);
- overlay->render(0);
+ {
+ GL::Bind bind_blend(GL::Blend::alpha());
+ overlay->render(0);
+ }
GL::Bind bind_depth(GL::DepthTest::lequal());
- manipulator.render();
if(mode==MEASURE)
measure.render();
}
GL::Texture::unbind();
}
+void Designer::track_added(Track &trk)
+{
+ new_tracks.push_back(&trk);
+}
+
+void Designer::track_removed(Track &trk)
+{
+ list<Track *>::iterator i = find(new_tracks.begin(), new_tracks.end(), &trk);
+ if(i!=new_tracks.end())
+ new_tracks.erase(i);
+}
+
Track3D *Designer::pick_track(int x, int y)
{
Layout3D *l = layout_3d;
}
else if(unsigned tid = track.get_track().get_turnout_id())
{
- overlay->add_graphic(track, "turnout");
- overlay->set_label(track, lexical_cast(tid));
+ if(tid<0x800)
+ {
+ overlay->add_graphic(track, "turnout");
+ overlay->set_label(track, lexical_cast(tid));
+ }
+ }
+}
+
+void Designer::selection_changed()
+{
+ const set<Track *> &tracks = selection.get_tracks();
+ if(tracks.empty())
+ lbl_status->set_text(string());
+ else
+ {
+ float len = 0;
+ for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ len += (*i)->get_type().get_total_length();
+ lbl_status->set_text(format("%.2fm of track selected\n", len));
}
}
void Designer::manipulation_done(bool)
{
- lbl_status->set_text(string());
mode = SELECT;
+ selection_changed();
}
void Designer::measure_changed()
void Designer::measure_done()
{
- lbl_status->set_text(string());
mode = SELECT;
+ selection_changed();
}
void Designer::turnout_id_accept(const string &text)
}
}
-void Designer::view_all()
+void Designer::route_name_accept(const string &text)
{
- Point minp;
- Point maxp;
-
- const list<Track3D *> &tracks = layout_3d->get_tracks();
- for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- {
- Point tmin;
- Point tmax;
- (*i)->get_bounds(0, tmin, tmax);
- minp.x = min(minp.x, tmin.x);
- minp.y = min(minp.y, tmin.y);
- maxp.x = max(maxp.x, tmax.x);
- maxp.y = max(maxp.y, tmax.y);
- }
-
- float t = tan(camera.get_field_of_view()/2)*2;
- float size = max((maxp.y-minp.y+0.1), (maxp.x-minp.x+0.1)/camera.get_aspect());
- float cam_dist = size/t+size*0.25;
- Point center((minp.x+maxp.x)/2, (minp.y+maxp.y)/2);
- camera.set_position(GL::Vector3(center.x, center.y-cam_dist*0.5, cam_dist*0.866));
- camera.set_look_direction(GL::Vector3(0, 0.5, -0.866));
+ if(cur_route)
+ cur_route->set_name(text);
}
string Designer::tooltip(int x, int y)
return string();
}
-void Designer::show_route(const Route &route)
+void Designer::show_route(const Route *route)
{
const set<Track *> <racks = layout->get_tracks();
- const set<const Track *> &rtracks = route.get_tracks();
for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
{
Track3D &t3d = layout_3d->get_track(**i);
- if(rtracks.count(*i))
+ if(route && route->has_track(**i))
{
t3d.get_path().set_color(GL::Color(0.5, 0.8, 1.0));
if((*i)->get_type().is_turnout())
{
unsigned tid = (*i)->get_turnout_id();
- int path = (tid ? route.get_turnout(tid) : -1);
+ int path = (tid ? route->get_turnout(tid) : -1);
if(path>=0)
t3d.get_path().set_path(path);
else
projects / r2c2.git / blobdiff