X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=ba27cae58fd88906cb3d620e75568b234ac799b7;hb=ab64a17394440c3cb18d0b30d75fb4ed6297a6b4;hp=8620fe7af8a6a53e8c0a43fd960d509805fa736f;hpb=7a36d396eded897c421424905b2c938d770df341;p=r2c2.git

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index 8620fe7..ba27cae 100644
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -322,7 +322,7 @@ void Manipulator::button_press(unsigned btn)
 					j->object->break_link(**i);
 		}
 
-		const set<Track *> &ltracks = designer.get_layout().get_tracks();
+		const set<Track *> &ltracks = designer.get_layout().get_all<Track>();
 		for(set<Track *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
 		{
 			bool ok = true;
@@ -366,7 +366,7 @@ void Manipulator::axis_motion(unsigned axis, float value, float)
 			i->object->set_rotation(i->rot);
 		}
 
-		const set<Track *> &ltracks = designer.get_layout().get_tracks();
+		const set<Track *> &ltracks = designer.get_layout().get_all<Track>();
 		float limit = max(designer.get_layout().get_catalogue().get_gauge(),
 			designer.get_camera_controller().get_view_scale()/100.0f);
 		MObject *snapped = 0;
@@ -504,38 +504,12 @@ void Manipulator::selection_changed()
 
 void Manipulator::update_objects()
 {
-	Vector minp, maxp;
+	Geometry::BoundingBox<float, 3> bbox;
 	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
-	{
-		// XXX Use generic bounding box when it is implemented
-		if(Track *track = dynamic_cast<Track *>(i->object))
-		{
-			unsigned n_endpoints = track->get_type().get_endpoints().size();
-			for(unsigned j=0; j<n_endpoints; ++j)
-			{
-				Vector p = track->get_snap_node(j).position;
-				if(i==objects.begin() && j==0)
-					minp = maxp = p;
-				else
-				{
-					minp.x = min(minp.x, p.x);
-					maxp.x = max(maxp.x, p.x);
-					minp.y = min(minp.y, p.y);
-					maxp.y = max(maxp.y, p.y);
-					minp.z = min(minp.z, p.z);
-				}
-			}
-		}
-		else
-		{
-			const Vector &p = i->object->get_position();
-			minp.x = min(minp.x, p.x);
-			maxp.x = max(maxp.x, p.x);
-			minp.y = min(minp.y, p.y);
-			maxp.y = max(maxp.y, p.y);
-			minp.z = min(minp.z, p.z);
-		}
-	}
+		bbox = bbox|i->object->get_bounding_box();
+
+	const Vector &minp = bbox.get_minimum_point();
+	const Vector &maxp = bbox.get_maximum_point();
 
 	center = (minp+maxp)/2.0f;
 	center.z = minp.z;