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

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index 1bbbed8..fe3514f 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -2,6 +2,7 @@
 #include "layout.h"
 #include "signal.h"
 #include "track.h"
+#include "utility.h"
 #include "vehicle.h"
 
 using namespace std;
@@ -15,6 +16,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 +30,8 @@ Layout3D::Layout3D(Layout &l):
 
 Layout3D::~Layout3D()
 {
+	while(!utilities.empty())
+		delete *utilities.begin();
 	while(!objects.empty())
 		delete objects.begin()->second;
 }
@@ -57,6 +62,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))