Count reserved distance correctly in reverse direction

[r2c2.git] / source / libr2c2 / object.cpp

diff --git a/source/libr2c2/object.cpp b/source/libr2c2/object.cpp
index cc56edeb6af28883f6619dd7953c8e21925d9e15..d7c7db25e68beaeac81923f5eb2e6258b10e2e7d 100644 (file)
--- a/source/libr2c2/object.cpp
+++ b/source/libr2c2/object.cpp
@@ -45,9 +45,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-Angle::half_turn());
+                       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 += ssn.position-sn.position;
+                       set_position(position+ssn.position-sn.position);
                        return true;
                }
        }
@@ -77,4 +83,26 @@ void Object::break_links()
                break_link(i);
 }
 
+bool Object::collide_ray(const Ray &ray) const
+{
+       const Shape *shape = get_type().get_shape();
+       if(!shape)
+               return false;
+
+       Transform reverse_trans = Transform::rotation(rotation, Vector(0, 0, -1))*
+               Transform::translation(-position);
+       return shape->check_intersection(reverse_trans.transform(ray));
+}
+
+BoundingBox Object::get_bounding_box() const
+{
+       const Shape *shape = get_type().get_shape();
+       if(!shape)
+               return BoundingBox();
+
+       Transform trans = Transform::translation(position)*
+               Transform::rotation(rotation, Vector(0, 0, 1));
+       return trans.transform(shape->get_axis_aligned_bounding_box());
+}
+
 } // namespace R2C2