X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmovetool.h;h=548315e06444bd86df3edafd1ab7e175eb8960f6;hb=7d6f95321585b41bb5a6f11ff148486612bbc19e;hp=5eb1c8599ef1ec9952a89468eb9ba0922da7077d;hpb=678982e7ddb22bb5fd44ce448d1c5cbf646b2573;p=r2c2.git

diff --git a/source/designer/movetool.h b/source/designer/movetool.h
index 5eb1c85..548315e 100644
--- a/source/designer/movetool.h
+++ b/source/designer/movetool.h
@@ -6,12 +6,24 @@
 class MoveTool: public Manipulator
 {
 private:
+	struct Boundary
+	{
+		MObject *object;
+		unsigned index;
+
+		Boundary(MObject *, unsigned);
+
+		R2C2::Object *operator->() const { return object->object; }
+	};
+
+	std::list<Boundary> boundaries;
+	std::set<R2C2::Object *> snap_targets;
 	R2C2::Vector origin;
 
 public:
-	MoveTool(Designer &, Msp::Input::Mouse &, const std::set<R2C2::Object *> &);
+	MoveTool(Designer &, Msp::Input::Keyboard &, Msp::Input::Mouse &, const std::set<R2C2::Object *> &);
 
-	virtual void axis_motion(unsigned, float, float);
+	virtual void pointer_motion();
 };
 
 #endif