X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.cpp;h=0a9ee2d2b4c5362888c7d9996ef965e91f2da3a5;hb=251270c97a5e5eb8630bc1662a406255dedae90e;hp=70c55096cfa91eed259b6be9ebd99ef701dfd88c;hpb=e5cd9e4fbc577036a0385c985b6b65df8218d0a2;p=r2c2.git

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index 70c5509..0a9ee2d 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -1,18 +1,10 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
+This file is part of R²C²
+Copyright © 2006-2011 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 "track.h"
 #include "vehicle.h"
@@ -20,7 +12,7 @@ Distributed under the GPL
 using namespace std;
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Layout3D::Layout3D(Layout &l):
 	layout(l),
@@ -29,6 +21,7 @@ Layout3D::Layout3D(Layout &l):
 	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));
 
 	const set<Track *> &ltracks = layout.get_tracks();
 	for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
@@ -38,87 +31,53 @@ Layout3D::Layout3D(Layout &l):
 Layout3D::~Layout3D()
 {
 	while(!tracks.empty())
-		delete tracks.front();
+		delete tracks.begin()->second;
 	while(!vehicles.empty())
-		delete vehicles.front();
+		delete vehicles.begin()->second;
 }
 
 void Layout3D::add_track(Track3D &t)
 {
-	tracks.push_back(&t);
+	if(tracks.count(&t.get_track()))
+		throw KeyError("Duplicate track");
+
+	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");
-}
+	TrackMap::const_iterator i = tracks.find(&t);
+	if(i==tracks.end())
+		throw KeyError("Unknown track");
 
-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);
-
-	{
-		GL::PushMatrix push_mat;
-		GL::load_identity();
-
-		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);
-	}
-
-	scene.render(0);
-
-	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();
-	for(vector<GL::SelectRecord>::iterator i=select_buf.begin(); i!=select_buf.end(); ++i)
-		if(i->min_depth<track_depth && !i->names.empty())
-		{
-			track = reinterpret_cast<Track3D *>(i->names.back());
-			track_depth = i->min_depth;
-		}
-
-	return track;
+	return *i->second;
 }
 
 void Layout3D::add_vehicle(Vehicle3D &v)
 {
-	vehicles.push_back(&v);
+	if(vehicles.count(&v.get_vehicle()))
+		throw KeyError("Duplicate vehicle");
+
+	vehicles[&v.get_vehicle()] = &v;
 }
 
 void Layout3D::remove_vehicle(Vehicle3D &v)
 {
-	list<Vehicle3D *>::iterator i = find(vehicles.begin(), vehicles.end(), &v);
-	if(i!=vehicles.end())
-		vehicles.erase(i);
+	vehicles.erase(&v.get_vehicle());
 }
 
-Vehicle3D &Layout3D::get_vehicle(const Vehicle &v) const
+Vehicle3D &Layout3D::get_vehicle(Vehicle &v) const
 {
-	for(list<Vehicle3D *>::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
-		if(&(*i)->get_vehicle()==&v)
-			return **i;
+	VehicleMap::const_iterator i = vehicles.find(&v);
+	if(i==vehicles.end())
+		throw KeyError("Unknown vehicle");
 
-	throw KeyError("Unknown vehicle");
+	return *i->second;
 }
 
 void Layout3D::track_added(Track &t)
@@ -128,12 +87,9 @@ 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)
@@ -141,4 +97,11 @@ void Layout3D::vehicle_added(Vehicle &v)
 	new Vehicle3D(*this, v);
 }
 
-} // namespace Marklin
+void Layout3D::vehicle_removed(Vehicle &v)
+{
+	VehicleMap::iterator i = vehicles.find(&v);
+	if(i!=vehicles.end())
+		delete i->second;
+}
+
+} // namespace R2C2