X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fobject.h;h=a0bd4f362714313bd72c5bc28b7c120bfd4f119f;hb=eb8b919a1a224c0d6f206d1d29a9b4b8c3a0cac8;hp=c346b6de0c9b010199d11dd95bd9b9921e215934;hpb=107a7f787d406f1f664c4986557f9a896e0845ea;p=r2c2.git

diff --git a/source/libr2c2/object.h b/source/libr2c2/object.h
index c346b6d..a0bd4f3 100644
--- a/source/libr2c2/object.h
+++ b/source/libr2c2/object.h
@@ -11,13 +11,17 @@ class Layout;
 
 class Object
 {
+public:
+	sigc::signal<void> signal_moved;
+
 protected:
 	Layout &layout;
 	Vector position;
 	Angle rotation;
 	Angle tilt;
+	Shape *shape;
 
-	Object(Layout &l): layout(l) { }
+	Object(Layout &);
 public:
 	virtual ~Object() { }
 
@@ -48,7 +52,8 @@ public:
 	virtual bool break_link(unsigned) { return false; }
 	virtual void break_links();
 
-	virtual bool collide_ray(const Ray &) const;
+	const Shape *get_shape() const;
+	virtual bool collide_ray(const Ray &, float * = 0) const;
 	virtual BoundingBox get_bounding_box() const;
 };