X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fobject.cpp;h=7a23d11a04e4779ee13da5e094a80a059cc4f147;hb=26a8dbeae14c685c6aef1aad3aa75c6f1a75e458;hp=ba1810f913ebbc20a59a53c50aa7d8936cdfdd63;hpb=0b75458245997b9df6da47cc4534341c8426084b;p=r2c2.git

diff --git a/source/libr2c2/object.cpp b/source/libr2c2/object.cpp
index ba1810f..7a23d11 100644
--- a/source/libr2c2/object.cpp
+++ b/source/libr2c2/object.cpp
@@ -5,6 +5,11 @@ using namespace std;
 
 namespace R2C2 {
 
+Object::Object(Layout &l):
+	layout(l),
+	shape(0)
+{ }
+
 Snap Object::get_snap_node(unsigned) const
 {
 	throw out_of_range("Object::get_snap_node");
@@ -18,8 +23,8 @@ bool Object::snap(Snap &sn, float limit, SnapType what) const
 		for(unsigned i=0; i<nsn; ++i)
 		{
 			Snap node = get_snap_node(i);
-			Vector d(sn.position.x-node.position.x, sn.position.y-node.position.y, sn.position.z-node.position.z);
-			if(d.x*d.x+d.y*d.y<limit*limit)
+			Vector span = sn.position-node.position;
+			if(dot(span, span)<limit*limit)
 			{
 				sn = node;
 				return true;
@@ -45,11 +50,15 @@ bool Object::snap_to(const Object &other, float limit, SnapType what)
 		Snap ssn = sn;
 		if(other.snap(ssn, limit, what))
 		{
-			set_rotation(rotation+ssn.rotation-sn.rotation-M_PI);
+			if(what==SNAP_NODE)
+				set_rotation(rotation+ssn.rotation-sn.rotation-Angle::half_turn());
+			else
+			{
+				Angle adiff = wrap_balanced((ssn.rotation-sn.rotation)*2.0f)/2.0f;
+				set_rotation(rotation+adiff);
+			}
 			sn = get_snap_node(i);
-			position.x += ssn.position.x-sn.position.x;
-			position.y += ssn.position.y-sn.position.y;
-			position.z += ssn.position.z-sn.position.z;
+			set_position(position+ssn.position-sn.position);
 			return true;
 		}
 	}
@@ -79,4 +88,33 @@ void Object::break_links()
 		break_link(i);
 }
 
+const Shape *Object::get_shape() const
+{
+	if(shape)
+		return shape;
+	return get_type().get_shape();
+}
+
+bool Object::collide_ray(const Ray &ray) const
+{
+	const Shape *s = get_shape();
+	if(!s)
+		return false;
+
+	Transform reverse_trans = Transform::rotation(rotation, Vector(0, 0, -1))*
+		Transform::translation(-position);
+	return s->check_intersection(reverse_trans.transform(ray));
+}
+
+BoundingBox Object::get_bounding_box() const
+{
+	const Shape *s = get_shape();
+	if(!s)
+		return BoundingBox();
+
+	Transform trans = Transform::translation(position)*
+		Transform::rotation(rotation, Vector(0, 0, 1));
+	return trans.transform(s->get_axis_aligned_bounding_box());
+}
+
 } // namespace R2C2