X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=09d32fd8bfdeb782aff9d514c449528a234b012d;hb=4d84248a4990e913a56f013e67a608ad9698233e;hp=f4e75e7f40d2a512c24549af65b65f085e9f7a59;hpb=f42183985c65e1e12f19e9246dee90b8e7e44a34;p=r2c2.git

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index f4e75e7..09d32fd 100644
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -387,6 +387,7 @@ void Manipulator::update_wrap()
 	wrap.clear();
 	float min_x = 0, max_x = 0;
 	float min_y = 0, max_y = 0;
+	float min_z = 0;
 	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
 		Track3D &t3d = designer.get_layout_3d()->get_track(*i->track);
@@ -404,7 +405,7 @@ void Manipulator::update_wrap()
 				float s = sin(a);
 				float x = (minp.x+maxp.x)/2;
 				float y = (minp.y+maxp.y)/2;
-				tw.pos = Point(c*x-s*y, s*x+c*y, (minp.z+maxp.z)/2);
+				tw.pos = Point(c*x-s*y, s*x+c*y, minp.z);
 				tw.rot = a;
 				tw.width = maxp.x-minp.x+0.01;
 				tw.height = maxp.y-minp.y+0.01;
@@ -417,6 +418,7 @@ void Manipulator::update_wrap()
 		{
 			min_x = max_x = tw.pos.x;
 			min_y = max_y = tw.pos.y;
+			min_z = tw.pos.z;
 		}
 		else
 		{
@@ -424,22 +426,24 @@ void Manipulator::update_wrap()
 			max_x = max(max_x, tw.pos.x);
 			min_y = min(min_y, tw.pos.y);
 			max_y = max(max_y, tw.pos.y);
+			min_z = min(min_z, tw.pos.z);
 		}
 		wrap.push_back(tw);
 	}
 
-	center = Point((min_x+max_x)/2, (min_y+max_y)/2, 0);
+	center = Point((min_x+max_x)/2, (min_y+max_y)/2, min_z);
 	wrap_pos = center;
 	wrap_rot = 0;
 	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
 		const Point &tp = i->track->get_position();
-		i->pos = Point(tp.x-center.x, tp.y-center.y, tp.z);
+		i->pos = Point(tp.x-center.x, tp.y-center.y, tp.z-center.z);
 	}
 	for(list<TrackWrap>::iterator i=wrap.begin(); i!=wrap.end(); ++i)
 	{
 		i->pos.x -= center.x;
 		i->pos.y -= center.y;
+		i->pos.z -= center.z;
 	}
 }