#include <msp/time/units.h>
#include <msp/time/utils.h>
#include "libr2c2/route.h"
+#include "libr2c2/terrain.h"
#include "libr2c2/tracktype.h"
#include "libr2c2/zone.h"
#include "3d/path.h"
#include "manipulator.h"
#include "measure.h"
#include "movetool.h"
+#include "objectproperties.h"
#include "objectselecttool.h"
#include "rotatetool.h"
#include "routebar.h"
#include "selection.h"
#include "slopetool.h"
#include "svgexporter.h"
+#include "terraintool.h"
#include "trackbar.h"
-#include "trackproperties.h"
#include "zonebar.h"
#include "zoneproperties.h"
window(1280, 960),
keyboard(window),
mouse(window),
- ui_res("r2c2.res"),
+ ui_res("data/r2c2.res"),
root(ui_res, &window, &keyboard, &mouse),
base_object(0),
cur_route(0),
cur_zone(0),
mode(TOOL),
sel_wrap(selection),
- cur_tool(0)
+ cur_tool(0),
+ keep_status(0)
{
window.set_title("Railway Designer");
window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
// Setup catalogue and layout
- DataFile::load(catalogue, "tracks.dat");
+ catalogue.add_source("data/Märklin/H0");
cat_layout_3d = new Layout3D(catalogue.get_layout());
layout = new Layout(catalogue);
+ layout->get_clock().set_current_time(12*Time::hour);
layout_3d = new Layout3D(*layout);
+ layout_3d->tick();
if(argc>1)
{
cat_view->view_all(true);
main_view->view_all();
- const set<Track *> &tracks = layout->get_all<Track>();
- for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- update_track_icon(layout_3d->get<Track3D>(**i));
+ const set<Object *> &objects = layout->get_all<Object>();
+ for(set<Object *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+ update_object_icon(**i);
}
Designer::~Designer()
exit(0);
}
-void Designer::new_track()
+void Designer::new_object()
{
use_select_tool();
mode = CATALOGUE;
- lbl_status->set_text("Select new track or press Esc to cancel");
+ lbl_status->set_text("Select new object or press Esc to cancel");
}
-void Designer::erase_tracks()
+void Designer::erase_objects()
{
use_select_tool();
- set<Track *> tracks = selection.get_objects<Track>();
+ set<Object *> objects = selection.get_objects();
selection.clear();
- for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ for(set<Object *>::iterator i=objects.begin(); i!=objects.end(); ++i)
{
- overlay->clear(layout_3d->get<Track3D>(**i));
+ overlay->clear(layout_3d->get_3d(**i));
delete *i;
}
}
-void Designer::track_properties()
+void Designer::object_properties()
{
use_select_tool();
if(selection.empty())
return;
- TrackProperties *track_prop = new TrackProperties(selection);
- root.add(*track_prop);
- root_layout->set_gravity(*track_prop, 0, 0);
+ ObjectProperties *dlg = new ObjectProperties(selection);
+ root.add(*dlg);
+ root_layout->set_gravity(*dlg, 0, 0);
- track_prop->signal_response.connect(sigc::mem_fun(this, &Designer::track_properties_response));
+ dlg->signal_response.connect(sigc::mem_fun(this, &Designer::object_properties_response));
}
void Designer::extend_track()
cur_tool->update_selection(selection);
use_select_tool();
}
+ keep_status = 0;
window.tick();
root.tick();
if(key==Msp::Input::KEY_N && shift)
use_tool_with_selected_objects<ExtendTool>();
else if(key==Msp::Input::KEY_N)
- new_track();
+ new_object();
else if(key==Msp::Input::KEY_G)
use_tool_with_selected_objects<MoveTool>();
else if(key==Msp::Input::KEY_R)
use_select_tool();
}
else if(key==Msp::Input::KEY_X)
- erase_tracks();
+ erase_objects();
else if(key==Msp::Input::KEY_F && shift)
{
const set<Track *> &tracks = selection.get_objects<Track>();
if(*j!=*i)
(*i)->snap_to(**j, true);
- update_track_icon(layout_3d->get<Track3D>(**i));
+ update_object_icon(**i);
}
}
else if(key==Msp::Input::KEY_F)
else if(key==Msp::Input::KEY_V)
svg_export();
else if(key==Msp::Input::KEY_P)
- track_properties();
+ object_properties();
+ else if(key==Msp::Input::KEY_TAB)
+ {
+ Object *obj = selection.get_object();
+ if(Terrain *terrain = dynamic_cast<Terrain *>(obj))
+ use_tool(new TerrainTool(*this, keyboard, mouse, *terrain));
+ }
}
template<typename T>
cur_tool = tool;
cur_tool->signal_status.connect(sigc::mem_fun(this, &Designer::tool_status));
- tool_status(cur_tool->get_status());
+ if(keep_status<2)
+ tool_status(tool->get_status());
mode = TOOL;
+ keep_status = 1;
}
void Designer::use_select_tool()
if(mode==CATALOGUE)
{
- Object *obj;
+ Object *obj = 0;
if(btn==1)
obj = pick_object(pointer);
const GL::Vector3 &cpos = view.get_camera().get_position();
GL::Vector4 cray = view.get_camera().unproject(GL::Vector4(pointer.x, pointer.y, 0, 0));
- return view.get_layout().get_layout().pick<Object>(Ray(cpos, Vector(cray)));
+ return view.get_layout().get_layout().pick<Object>(Ray(cpos, cray.slice<3>(0)));
}
-void Designer::update_track_icon(Track3D &track)
+void Designer::update_object_icon(Object &obj)
{
- overlay->clear(track);
+ Object3D &obj3d = layout_3d->get_3d(obj);
+ overlay->clear(obj3d);
- if(track.get_track().get_flex())
- overlay->add_graphic(track, "flex");
+ if(Track *track = dynamic_cast<Track *>(&obj))
+ {
+ if(track->get_flex())
+ overlay->add_graphic(obj3d, "flex");
- if(unsigned sid = track.get_track().get_sensor_id())
+ if(unsigned saddr = track->get_sensor_address())
+ {
+ overlay->add_graphic(obj3d, "trackcircuit");
+ overlay->set_label(obj3d, lexical_cast<string>(saddr));
+ }
+ else if(track->get_type().is_turnout())
+ {
+ unsigned taddr = track->get_turnout_address();
+ if(taddr<0x800)
+ {
+ overlay->add_graphic(obj3d, "turnout");
+ overlay->set_label(obj3d, lexical_cast<string>(taddr));
+ }
+ }
+ }
+ else if(Signal *signal = dynamic_cast<Signal *>(&obj))
{
- overlay->add_graphic(track, "sensor");
- overlay->set_label(track, lexical_cast<string>(sid));
+ overlay->add_graphic(obj3d, "signal");
+ overlay->set_label(obj3d, lexical_cast<string>(signal->get_address()));
}
- else if(unsigned tid = track.get_track().get_turnout_id())
+ else if(BeamGate *gate = dynamic_cast<BeamGate *>(&obj))
{
- if(tid<0x800)
- {
- overlay->add_graphic(track, "turnout");
- overlay->set_label(track, lexical_cast<string>(tid));
- }
+ overlay->add_graphic(obj3d, "beamgate");
+ overlay->set_label(obj3d, lexical_cast<string>(gate->get_address()));
}
}
void Designer::tool_status(const string &status)
{
lbl_status->set_text(status);
+ if(keep_status==1)
+ keep_status = 2;
}
-void Designer::track_properties_response(int)
+void Designer::object_properties_response(int)
{
- const set<Track *> &tracks = selection.get_objects<Track>();
- for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- update_track_icon(layout_3d->get<Track3D>(**i));
+ const set<Object *> &objects = selection.get_objects();
+ for(set<Object *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+ update_object_icon(**i);
}
void Designer::route_name_accept(const string &text)
if(Object *obj = pick_object(Vector(x*2.0f/rgeom.w-1.0f, y*2.0f/rgeom.h-1.0f, 0)))
{
const ObjectType &otype = obj->get_type();
- string info = format("%d %s", otype.get_article_number(), otype.get_description());
+ string info = format("%d %s", otype.get_article_number(), otype.get_name());
if(Track *track = dynamic_cast<Track *>(obj))
{
if(mode!=CATALOGUE && abs(track->get_tilt()).radians()>1e-4)
info += format(" (slope %.1f%%)", abs(tan(track->get_tilt())*100));
- if(track->get_turnout_id())
- info += format(" (turnout %d)", track->get_turnout_id());
- else if(track->get_sensor_id())
- info += format(" (sensor %d)", track->get_sensor_id());
+ if(track->get_type().is_turnout())
+ info += format(" (turnout %d)", track->get_turnout_address());
+ else if(track->get_sensor_address())
+ info += format(" (sensor %d)", track->get_sensor_address());
+ }
+ if(mode==CATALOGUE)
+ {
+ const string &descr = otype.get_description();
+ if(!descr.empty())
+ {
+ info += '\n';
+ info += otype.get_description();
+ }
}
return info;
}
const set<Track *> &rtracks = route.get_tracks();
for(set<Track *>::iterator i=rtracks.begin(); i!=rtracks.end(); ++i)
{
- Track3D &t3d = layout_3d->get<Track3D>(**i);
+ Track3D &t3d = layout_3d->get_3d(**i);
Path3D *path = new Path3D(t3d);
path->set_color(GL::Color(0.5, 0.8, 1.0));
- if(unsigned tid = (*i)->get_turnout_id())
- path->set_path(route.get_turnout(tid));
+ if((*i)->get_type().is_turnout())
+ path->set_path(route.get_turnout((*i)->get_turnout_address()));
+ highlight_paths.push_back(path);
}
}
const Zone::TrackSet &ztracks = zone.get_tracks();
for(Zone::TrackSet::const_iterator i=ztracks.begin(); i!=ztracks.end(); ++i)
{
- Track3D &t3d = layout_3d->get<Track3D>(**i);
+ Track3D &t3d = layout_3d->get_3d(**i);
Path3D *path = new Path3D(t3d);
path->set_color(GL::Color(0.8, 1.0, 0.5));
+ highlight_paths.push_back(path);
}
}
projects / r2c2.git / blobdiff