X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.cpp;h=d243374de5f7df4eed4a66931711b43dd201041c;hb=0db89b665527609582df98854c9e3255d1017811;hp=1b54e4be7509dd487d519d31a14d827557bfb801;hpb=47341c72a70e6cf9d8e963705a50197bbc20a87d;p=r2c2.git

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index 1b54e4b..d243374 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -1,132 +1,136 @@
-/* $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/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()),
-	quality(4)
+	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)
+		track_added(**i);
+	const set<Signal *> &lsignals = layout.get_signals();
+	for(set<Signal *>::iterator i=lsignals.begin(); i!=lsignals.end(); ++i)
+		signal_added(**i);
 }
 
 Layout3D::~Layout3D()
 {
+	while(!signals.empty())
+		delete signals.begin()->second;
 	while(!tracks.empty())
-		delete tracks.front();
+		delete tracks.begin()->second;
+	while(!vehicles.empty())
+		delete vehicles.begin()->second;
 }
 
-void Layout3D::set_quality(unsigned q)
+void Layout3D::get_bounds(Vector &minp, Vector &maxp) const
 {
-	quality = q;
+	Geometry::BoundingBox<float, 3> bbox;
+
+	for(TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		bbox = bbox|i->second->get_track().get_type().get_shape()->get_axis_aligned_bounding_box();
+
+	minp = bbox.get_minimum_point();
+	maxp = bbox.get_maximum_point();
 }
 
 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);
-
-	glPushMatrix();
-	glLoadIdentity();
+	insert_unique(vehicles, &v.get_vehicle(), &v);
+}
 
-	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);
+void Layout3D::remove_vehicle(Vehicle3D &v)
+{
+	vehicles.erase(&v.get_vehicle());
+}
 
-	clip[0] = -1;
-	clip[2] = -(x+size);
-	glClipPlane(GL_CLIP_PLANE1, clip);
-	glEnable(GL_CLIP_PLANE1);
+Vehicle3D &Layout3D::get_vehicle(Vehicle &v) const
+{
+	return *get_item(vehicles, &v);
+}
 
-	clip[0] = 0;
-	clip[1] = 1;
-	clip[2] = y-size;
-	glClipPlane(GL_CLIP_PLANE2, clip);
-	glEnable(GL_CLIP_PLANE2);
+void Layout3D::add_signal(Signal3D &s)
+{
+	insert_unique(signals, &s.get_signal(), &s);
+}
 
-	clip[1] = -1;
-	clip[2] = -(y+size);
-	glClipPlane(GL_CLIP_PLANE3, clip);
-	glEnable(GL_CLIP_PLANE3);
+void Layout3D::remove_signal(Signal3D &s)
+{
+	signals.erase(&s.get_signal());
+}
 
-	glPopMatrix();
+Signal3D &Layout3D::get_signal(Signal &s) const
+{
+	return *get_item(signals, &s);
+}
 
-	scene.render(0);
+void Layout3D::track_added(Track &t)
+{
+	new Track3D(*this, t);
+}
 
-	glDisable(GL_CLIP_PLANE0);
-	glDisable(GL_CLIP_PLANE1);
-	glDisable(GL_CLIP_PLANE2);
-	glDisable(GL_CLIP_PLANE3);
+void Layout3D::track_removed(Track &t)
+{
+	TrackMap::iterator i = tracks.find(&t);
+	if(i!=tracks.end())
+		delete i->second;
+}
 
-	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::vehicle_added(Vehicle &v)
+{
+	new Vehicle3D(*this, v);
+}
 
-	return track;
+void Layout3D::vehicle_removed(Vehicle &v)
+{
+	VehicleMap::iterator i = vehicles.find(&v);
+	if(i!=vehicles.end())
+		delete i->second;
 }
 
-void Layout3D::track_added(Track &t)
+void Layout3D::signal_added(Signal &s)
 {
-	new Track3D(*this, t);
+	new Signal3D(*this, s);
 }
 
-void Layout3D::track_removed(Track &t)
+void Layout3D::signal_removed(Signal &s)
 {
-	for(list<Track3D *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(&(*i)->get_track()==&t)
-		{
-			delete *i;
-			return;
-		}
+	SignalMap::iterator i = signals.find(&s);
+	if(i!=signals.end())
+		delete i->second;
 }
 
-} // namespace Marklin
+} // namespace R2C2