X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.cpp;h=0b457559f92d7bd8c532c1273a619606a613f225;hb=894276fb6284f817be627a92ac68584e8cb3c288;hp=5f015766f6367ad53ae108d379cad9ab0c94861c;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index 5f01576..0b45755 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -1,20 +1,9 @@
-/* $Id$
-
-This file is part of R²C²
-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 "terrain.h"
 #include "track.h"
+#include "utility.h"
 #include "vehicle.h"
 
 using namespace std;
@@ -26,125 +15,71 @@ 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));
-	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)
-		track_added(**i);
+	// South, 15° from zenith
+	sun.set_position(GL::Vector4(0, -0.259, 0.966, 0));
+	sun.set_diffuse(GL::Color(0.9));
+	lighting.set_ambient(GL::Color(0.4));
+	lighting.attach(0, sun);
+
+	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.begin()->second;
-	while(!vehicles.empty())
-		delete vehicles.begin()->second;
-}
-
-void Layout3D::add_track(Track3D &t)
-{
-	if(tracks.count(&t.get_track()))
-		throw KeyError("Duplicate track");
-
-	tracks[&t.get_track()] = &t;
-}
-
-void Layout3D::remove_track(Track3D &t)
-{
-	tracks.erase(&t.get_track());
-}
-
-Track3D &Layout3D::get_track(Track &t) const
-{
-	TrackMap::const_iterator i = tracks.find(&t);
-	if(i==tracks.end())
-		throw KeyError("Unknown track");
-
-	return *i->second;
+	while(!utilities.empty())
+		delete *utilities.begin();
+	while(!objects.empty())
+		delete objects.begin()->second;
 }
 
-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_3d(Object &o) const
 {
-	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());
+	return *get_item(objects, &o);
 }
 
-Vehicle3D &Layout3D::get_vehicle(Vehicle &v) const
+void Layout3D::remove(Object3D &o)
 {
-	VehicleMap::const_iterator i = vehicles.find(&v);
-	if(i==vehicles.end())
-		throw KeyError("Unknown vehicle");
-
-	return *i->second;
+	objects.erase(&o.get_object());
 }
 
-void Layout3D::track_added(Track &t)
+void Layout3D::add(Utility3D &u)
 {
-	new Track3D(*this, t);
+	utilities.insert(&u);
 }
 
-void Layout3D::track_removed(Track &t)
+void Layout3D::remove(Utility3D &u)
 {
-	TrackMap::iterator i = tracks.find(&t);
-	if(i!=tracks.end())
-		delete i->second;
+	utilities.erase(&u);
 }
 
-void Layout3D::vehicle_added(Vehicle &v)
+void Layout3D::object_added(Object &o)
 {
-	new Vehicle3D(*this, v);
+	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);
+	else if(Terrain *r = dynamic_cast<Terrain *>(&o))
+		new Terrain3D(*this, *r);
 }
 
-void Layout3D::vehicle_removed(Vehicle &v)
+void Layout3D::object_removed(Object &o)
 {
-	VehicleMap::iterator i = vehicles.find(&v);
-	if(i!=vehicles.end())
+	ObjectMap::iterator i = objects.find(&o);
+	if(i!=objects.end())
 		delete i->second;
 }