X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.cpp;h=0b457559f92d7bd8c532c1273a619606a613f225;hb=bc2b44d50fb144f0f2ddaecc187607d6967e2ffb;hp=fdb4dfc24d5477672ae6fd361f989880dcc5659a;hpb=2220ba2f11705ea9a4e480603d43ab7ed4cf5a89;p=r2c2.git

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index fdb4dfc..0b45755 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -16,7 +16,7 @@ Layout3D::Layout3D(Layout &l):
 	catalogue(layout.get_catalogue())
 {
 	// South, 15° from zenith
-	sun.set_position(0, -0.259, 0.966, 0);
+	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);
@@ -37,21 +37,6 @@ Layout3D::~Layout3D()
 		delete objects.begin()->second;
 }
 
-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)
-	{
-		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();
-}
-
 void Layout3D::add(Object3D &o)
 {
 	insert_unique(objects, &o.get_object(), &o);