X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmovetool.cpp;h=72bbc19ec3e8de206ccb64e3ce196e31709d7048;hb=5aca52772d0fd5a2cf4d0d2dc99a2ddce9420b40;hp=57d72928612e95792e4c5801c349ac97deb70b17;hpb=6b9b841c497de4b783178ec8c5b98da49b6b8df5;p=r2c2.git

diff --git a/source/designer/movetool.cpp b/source/designer/movetool.cpp
index 57d7292..72bbc19 100644
--- a/source/designer/movetool.cpp
+++ b/source/designer/movetool.cpp
@@ -6,16 +6,20 @@ using namespace std;
 using namespace Msp;
 using namespace R2C2;
 
-MoveTool::MoveTool(Designer &d, Input::Mouse &m, const set<Object *> &o):
-	Manipulator(d, m, o),
+MoveTool::MoveTool(Designer &d, Input::Keyboard &k, Input::Mouse &m, const set<Object *> &o):
+	Manipulator(d, k, m, o),
 	origin(ground_pointer)
 {
 	for(ObjectArray::iterator i=objects.begin(); i!=objects.end(); ++i)
 	{
 		unsigned nls = i->object->get_n_link_slots();
-		for(unsigned j=0; j<nls; ++j)
+		unsigned nsn = i->object->get_n_snap_nodes();
+		unsigned j;
+		for(j=0; j<nls; ++j)
 			if(!o.count(i->object->get_link(j)))
 				boundaries.push_back(Boundary(&*i, j));
+		for(; j<nsn; ++j)
+			boundaries.push_back(Boundary(&*i, j));
 	}
 
 	snap_targets = designer.get_layout().get_all<Object>();
@@ -23,10 +27,8 @@ MoveTool::MoveTool(Designer &d, Input::Mouse &m, const set<Object *> &o):
 		snap_targets.erase(i->object);
 }
 
-void MoveTool::axis_motion(unsigned axis, float value, float rel)
+void MoveTool::pointer_motion()
 {
-	Manipulator::axis_motion(axis, value, rel);
-
 	Vector offset = center+ground_pointer-origin;
 	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
 	{