X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.cpp;h=72e5052e6689c5f2058b83b5d9e03c75098bf895;hb=5116fff210cdc3f0fbdae13046cc60450aad5e8f;hp=e16b6e6d788a135efddad08753dd66348c2655d9;hpb=f79b3fd58999a73a4a28663b46fdd96c58167a18;p=r2c2.git

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index e16b6e6..72e5052 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -1,144 +1,92 @@
-/* $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 "beamgate.h"
 #include "layout.h"
+#include "signal.h"
 #include "track.h"
+#include "utility.h"
 #include "vehicle.h"
 
 using namespace std;
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Layout3D::Layout3D(Layout &l):
 	layout(l),
 	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));
+	// South, 15° from zenith
+	sun.set_position(0, -0.259, 0.966, 0);
+	lighting.attach(0, sun);
 
-	const set<Track *> &ltracks = layout.get_tracks();
-	for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
-		track_added(**i);
+	layout.signal_object_added.connect(sigc::mem_fun(this, &Layout3D::object_added));
+	layout.signal_object_removed.connect(sigc::mem_fun(this, &Layout3D::object_removed));
+
+	const set<Object *> &lobjs = layout.get_all<Object>();
+	for(set<Object *>::iterator i=lobjs.begin(); i!=lobjs.end(); ++i)
+		object_added(**i);
 }
 
 Layout3D::~Layout3D()
 {
-	while(!tracks.empty())
-		delete tracks.front();
-	while(!vehicles.empty())
-		delete vehicles.front();
+	while(!utilities.empty())
+		delete *utilities.begin();
+	while(!objects.empty())
+		delete objects.begin()->second;
 }
 
-void Layout3D::add_track(Track3D &t)
+void Layout3D::get_bounds(Vector &minp, Vector &maxp) const
 {
-	tracks.push_back(&t);
-}
+	Geometry::BoundingBox<float, 3> bbox;
 
-void Layout3D::remove_track(Track3D &t)
-{
-	list<Track3D *>::iterator i = find(tracks.begin(), tracks.end(), &t);
-	if(i!=tracks.end())
-		tracks.erase(i);
-}
+	for(ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+		bbox = bbox|i->second->get_object().get_type().get_shape()->get_axis_aligned_bounding_box();
 
-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");
+	minp = bbox.get_minimum_point();
+	maxp = bbox.get_maximum_point();
 }
 
-Track3D *Layout3D::pick_track(float x, float y, float size) const
+void Layout3D::add(Object3D &o)
 {
-	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;
+	insert_unique(objects, &o.get_object(), &o);
 }
 
-void Layout3D::add_vehicle(Vehicle3D &v)
+Object3D &Layout3D::get(Object &o) const
 {
-	vehicles.push_back(&v);
+	return *get_item(objects, &o);
 }
 
-void Layout3D::remove_vehicle(Vehicle3D &v)
+void Layout3D::remove(Object3D &o)
 {
-	list<Vehicle3D *>::iterator i = find(vehicles.begin(), vehicles.end(), &v);
-	if(i!=vehicles.end())
-		vehicles.erase(i);
+	objects.erase(&o.get_object());
 }
 
-Vehicle3D &Layout3D::get_vehicle(const Vehicle &v) const
+void Layout3D::add(Utility3D &u)
 {
-	for(list<Vehicle3D *>::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
-		if(&(*i)->get_vehicle()==&v)
-			return **i;
-
-	throw KeyError("Unknown vehicle");
+	utilities.insert(&u);
 }
 
-void Layout3D::track_added(Track &t)
+void Layout3D::remove(Utility3D &u)
 {
-	new Track3D(*this, t);
+	utilities.erase(&u);
 }
 
-void Layout3D::track_removed(Track &t)
+void Layout3D::object_added(Object &o)
 {
-	for(list<Track3D *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(&(*i)->get_track()==&t)
-		{
-			delete *i;
-			return;
-		}
+	if(Track *t = dynamic_cast<Track *>(&o))
+		new Track3D(*this, *t);
+	else if(Signal *s = dynamic_cast<Signal *>(&o))
+		new Signal3D(*this, *s);
+	else if(Vehicle *v = dynamic_cast<Vehicle *>(&o))
+		new Vehicle3D(*this, *v);
+	else if(BeamGate *g = dynamic_cast<BeamGate *>(&o))
+		new BeamGate3D(*this, *g);
 }
 
-void Layout3D::vehicle_added(Vehicle &v)
+void Layout3D::object_removed(Object &o)
 {
-	new Vehicle3D(*this, v);
+	ObjectMap::iterator i = objects.find(&o);
+	if(i!=objects.end())
+		delete i->second;
 }
 
-} // namespace Marklin
+} // namespace R2C2