Use maps instead of lists in Layout3D

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

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index 18457f095bf6aac4a0085e8400d94b5c3fdaceff..05c398d302a33b3fb22bcc968d82d90f21409abe 100644 (file)
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -1,10 +1,21 @@
+/* $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 <fstream>
+#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 "track.h"
+#include "vehicle.h"
 
 using namespace std;
 using namespace Msp;
@@ -13,120 +24,120 @@ namespace Marklin {
 
 Layout3D::Layout3D(Layout &l):
        layout(l),
-       quality(4)
+       catalogue(layout.get_catalogue())
 {
        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));
+
+       const set<Track *> &ltracks = layout.get_tracks();
+       for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
+               track_added(**i);
 }
 
 Layout3D::~Layout3D()
 {
-       for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               delete *i;
+       while(!tracks.empty())
+               delete tracks.begin()->second;
+       while(!vehicles.empty())
+               delete vehicles.begin()->second;
 }
 
-void Layout3D::set_quality(unsigned q)
+void Layout3D::add_track(Track3D &t)
 {
-       quality=q;
-       for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               (*i)->set_quality(quality);
+       if(tracks.count(&t.get_track()))
+               throw KeyError("Duplicate track");
+
+       tracks[&t.get_track()] = &t;
 }
 
-void Layout3D::render(bool endpoints)
+void Layout3D::remove_track(Track3D &t)
 {
-       GL::Texture::unbind();
-       glEnable(GL_DEPTH_TEST);
-
-       for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               (*i)->render();
-
-       if(endpoints)
-       {
-               glDepthMask(false);
-               for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-                       (*i)->render_endpoints();
-               glDepthMask(true);
-       }
+       tracks.erase(&t.get_track());
 }
 
-Track3D *Layout3D::get_track(const Track *t)
+Track3D &Layout3D::get_track(Track &t) const
 {
-       for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               if(&(*i)->get_track()==t)
-                       return *i;
+       TrackMap::const_iterator i = tracks.find(&t);
+       if(i==tracks.end())
+               throw KeyError("Unknown track");
 
-       return 0;
+       return *i->second;
 }
 
-Track3D *Layout3D::pick_track(float x, float y, float size)
+Track3D *Layout3D::pick_track(float x, float y, float size) const
 {
        vector<GL::SelectRecord> select_buf;
        GL::select_buffer(select_buf);
        GL::render_mode(GL::SELECT);
 
-       glPushMatrix();
-       glLoadIdentity();
-
-       double clip[4];
-       clip[0]=1;
-       clip[1]=0;
-       clip[2]=x-size;
-       clip[3]=0;
-       glClipPlane(GL_CLIP_PLANE0, clip);
-       glEnable(GL_CLIP_PLANE0);
-
-       clip[0]=-1;
-       clip[2]=-(x+size);
-       glClipPlane(GL_CLIP_PLANE1, clip);
-       glEnable(GL_CLIP_PLANE1);
-
-       clip[0]=0;
-       clip[1]=1;
-       clip[2]=y-size;
-       glClipPlane(GL_CLIP_PLANE2, clip);
-       glEnable(GL_CLIP_PLANE2);
-
-       clip[1]=-1;
-       clip[2]=-(y+size);
-       glClipPlane(GL_CLIP_PLANE3, clip);
-       glEnable(GL_CLIP_PLANE3);
+       {
+               GL::PushMatrix push_mat;
+               GL::load_identity();
 
-       glPopMatrix();
+               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);
+       }
 
-       render();
+       scene.render(0);
 
-       glDisable(GL_CLIP_PLANE0);
-       glDisable(GL_CLIP_PLANE1);
-       glDisable(GL_CLIP_PLANE2);
-       glDisable(GL_CLIP_PLANE3);
+       GL::ClipPlane::disable(0);
+       GL::ClipPlane::disable(1);
+       GL::ClipPlane::disable(2);
+       GL::ClipPlane::disable(3);
 
        GL::render_mode(GL::RENDER);
-       Track3D *track=0;
-       unsigned track_depth=numeric_limits<unsigned>::max();
+       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)
+               if(i->min_depth<track_depth && !i->names.empty())
                {
-                       track=reinterpret_cast<Track3D *>(i->names.back());
-                       track_depth=i->min_depth;
+                       track = reinterpret_cast<Track3D *>(i->names.back());
+                       track_depth = i->min_depth;
                }
 
        return track;
 }
 
+void Layout3D::add_vehicle(Vehicle3D &v)
+{
+       if(vehicles.count(&v.get_vehicle()))
+               throw KeyError("Duplicate vehicle");
+
+       vehicles[&v.get_vehicle()] = &v;
+}
+
+void Layout3D::remove_vehicle(Vehicle3D &v)
+{
+       vehicles.erase(&v.get_vehicle());
+}
+
+Vehicle3D &Layout3D::get_vehicle(Vehicle &v) const
+{
+       VehicleMap::const_iterator i = vehicles.find(&v);
+       if(i==vehicles.end())
+               throw KeyError("Unknown vehicle");
+
+       return *i->second;
+}
+
 void Layout3D::track_added(Track &t)
 {
-       tracks.push_back(new Track3D(t, quality));
+       new Track3D(*this, t);
 }
 
 void Layout3D::track_removed(Track &t)
 {
-       for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               if(&(*i)->get_track()==&t)
-               {
-                       delete *i;
-                       tracks.erase(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);
 }
 
 } // namespace Marklin