Add basic support for signals

[r2c2.git] / source / 3d / layout.cpp

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index a8fbc1ea0706ea61e08ecb1f2550d3d168e0e3f3..6042515962436807ebaae6ba2be60ca3b50dee05 100644 (file)
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -1,31 +1,27 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#include <algorithm>
-#include <limits>
-#include <msp/gl/clip.h>
-#include <msp/gl/matrix.h>
-#include <msp/gl/rendermode.h>
-#include <msp/gl/select.h>
-#include <msp/gl/texture.h>
-#include <msp/datafile/parser.h>
 #include "layout.h"
+#include "signal.h"
+#include "track.h"
+#include "vehicle.h"
 
 using namespace std;
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Layout3D::Layout3D(Layout &l):
        layout(l),
        catalogue(layout.get_catalogue())
 {
+       // South, 15° from zenith
+       sun.set_position(0, -0.259, 0.966, 0);
+       lighting.attach(0, sun);
+
        layout.signal_track_added.connect(sigc::mem_fun(this, &Layout3D::track_added));
        layout.signal_track_removed.connect(sigc::mem_fun(this, &Layout3D::track_removed));
+       layout.signal_vehicle_added.connect(sigc::mem_fun(this, &Layout3D::vehicle_added));
+       layout.signal_vehicle_removed.connect(sigc::mem_fun(this, &Layout3D::vehicle_removed));
+       layout.signal_signal_added.connect(sigc::mem_fun(this, &Layout3D::signal_added));
+       layout.signal_signal_removed.connect(sigc::mem_fun(this, &Layout3D::signal_removed));
 
        const set<Track *> &ltracks = layout.get_tracks();
        for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
@@ -35,64 +31,70 @@ Layout3D::Layout3D(Layout &l):
 Layout3D::~Layout3D()
 {
        while(!tracks.empty())
-               delete tracks.front();
+               delete tracks.begin()->second;
+       while(!vehicles.empty())
+               delete vehicles.begin()->second;
+}
+
+void Layout3D::get_bounds(Vector &minp, Vector &maxp) const
+{
+       minp = maxp = Vector();
+
+       for(TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+       {
+               Vector tmin;
+               Vector tmax;
+               i->second->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);
+       }
 }
 
 void Layout3D::add_track(Track3D &t)
 {
-       tracks.push_back(&t);
+       insert_unique(tracks, &t.get_track(), &t);
 }
 
 void Layout3D::remove_track(Track3D &t)
 {
-       list<Track3D *>::iterator i = find(tracks.begin(), tracks.end(), &t);
-       if(i!=tracks.end())
-               tracks.erase(i);
+       tracks.erase(&t.get_track());
 }
 
-Track3D &Layout3D::get_track(const Track &t) const
+Track3D &Layout3D::get_track(Track &t) const
 {
-       for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               if(&(*i)->get_track()==&t)
-                       return **i;
-
-       throw KeyError("Unknown track");
+       return *get_item(tracks, &t);
 }
 
-Track3D *Layout3D::pick_track(float x, float y, float size) const
+void Layout3D::add_vehicle(Vehicle3D &v)
 {
-       vector<GL::SelectRecord> select_buf;
-       GL::select_buffer(select_buf);
-       GL::render_mode(GL::SELECT);
-
-       {
-               GL::PushMatrix push_mat;
-               GL::load_identity();
+       insert_unique(vehicles, &v.get_vehicle(), &v);
+}
 
-               GL::ClipPlane(1, 0, x-size, 0).apply_to(0);
-               GL::ClipPlane(-1, 0, -x-size, 0).apply_to(1);
-               GL::ClipPlane(0, 1, y-size, 0).apply_to(2);
-               GL::ClipPlane(0, -1, -y-size, 0).apply_to(3);
-       }
+void Layout3D::remove_vehicle(Vehicle3D &v)
+{
+       vehicles.erase(&v.get_vehicle());
+}
 
-       scene.render(0);
+Vehicle3D &Layout3D::get_vehicle(Vehicle &v) const
+{
+       return *get_item(vehicles, &v);
+}
 
-       GL::ClipPlane::disable(0);
-       GL::ClipPlane::disable(1);
-       GL::ClipPlane::disable(2);
-       GL::ClipPlane::disable(3);
+void Layout3D::add_signal(Signal3D &s)
+{
+       insert_unique(signals, &s.get_signal(), &s);
+}
 
-       GL::render_mode(GL::RENDER);
-       Track3D *track = 0;
-       unsigned track_depth = numeric_limits<unsigned>::max();
-       for(vector<GL::SelectRecord>::iterator i=select_buf.begin(); i!=select_buf.end(); ++i)
-               if(i->min_depth<track_depth)
-               {
-                       track = reinterpret_cast<Track3D *>(i->names.back());
-                       track_depth = i->min_depth;
-               }
+void Layout3D::remove_signal(Signal3D &s)
+{
+       signals.erase(&s.get_signal());
+}
 
-       return track;
+Signal3D &Layout3D::get_signal(Signal &s) const
+{
+       return *get_item(signals, &s);
 }
 
 void Layout3D::track_added(Track &t)
@@ -102,12 +104,33 @@ void Layout3D::track_added(Track &t)
 
 void Layout3D::track_removed(Track &t)
 {
-       for(list<Track3D *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               if(&(*i)->get_track()==&t)
-               {
-                       delete *i;
-                       return;
-               }
+       TrackMap::iterator i = tracks.find(&t);
+       if(i!=tracks.end())
+               delete i->second;
+}
+
+void Layout3D::vehicle_added(Vehicle &v)
+{
+       new Vehicle3D(*this, v);
+}
+
+void Layout3D::vehicle_removed(Vehicle &v)
+{
+       VehicleMap::iterator i = vehicles.find(&v);
+       if(i!=vehicles.end())
+               delete i->second;
+}
+
+void Layout3D::signal_added(Signal &s)
+{
+       new Signal3D(*this, s);
+}
+
+void Layout3D::signal_removed(Signal &s)
+{
+       SignalMap::iterator i = signals.find(&s);
+       if(i!=signals.end())
+               delete i->second;
 }
 
-} // namespace Marklin
+} // namespace R2C2