X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.cpp;h=fdb4dfc24d5477672ae6fd361f989880dcc5659a;hb=d6816c177ee8d5f5191e833dce8e3c4e7e0222bf;hp=1bbbed825bb68f493547046fa8051a60fbdb8b1b;hpb=c4daf1cc6b53cae34e46d4125a993ceed500de1a;p=r2c2.git

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index 1bbbed8..fdb4dfc 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -1,7 +1,9 @@
 #include "beamgate.h"
 #include "layout.h"
 #include "signal.h"
+#include "terrain.h"
 #include "track.h"
+#include "utility.h"
 #include "vehicle.h"
 
 using namespace std;
@@ -15,6 +17,8 @@ Layout3D::Layout3D(Layout &l):
 {
 	// South, 15° from zenith
 	sun.set_position(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));
@@ -27,6 +31,8 @@ Layout3D::Layout3D(Layout &l):
 
 Layout3D::~Layout3D()
 {
+	while(!utilities.empty())
+		delete *utilities.begin();
 	while(!objects.empty())
 		delete objects.begin()->second;
 }
@@ -36,7 +42,11 @@ void Layout3D::get_bounds(Vector &minp, Vector &maxp) const
 	Geometry::BoundingBox<float, 3> bbox;
 
 	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();
+	{
+		const Shape *shape = i->second->get_object().get_shape();
+		if(shape)
+			bbox = bbox|shape->get_axis_aligned_bounding_box();
+	}
 
 	minp = bbox.get_minimum_point();
 	maxp = bbox.get_maximum_point();
@@ -47,7 +57,7 @@ void Layout3D::add(Object3D &o)
 	insert_unique(objects, &o.get_object(), &o);
 }
 
-Object3D &Layout3D::get(Object &o) const
+Object3D &Layout3D::get_3d(Object &o) const
 {
 	return *get_item(objects, &o);
 }
@@ -57,6 +67,16 @@ void Layout3D::remove(Object3D &o)
 	objects.erase(&o.get_object());
 }
 
+void Layout3D::add(Utility3D &u)
+{
+	utilities.insert(&u);
+}
+
+void Layout3D::remove(Utility3D &u)
+{
+	utilities.erase(&u);
+}
+
 void Layout3D::object_added(Object &o)
 {
 	if(Track *t = dynamic_cast<Track *>(&o))
@@ -67,6 +87,8 @@ void Layout3D::object_added(Object &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::object_removed(Object &o)