From e2e7cbbf4e73e2ea301a2c2b88a61c6cf3e772e4 Mon Sep 17 00:00:00 2001 From: Daniel Seidel Date: Tue, 18 Jun 2013 13:02:40 +0200 Subject: [PATCH 2/3] Added ObjectCollision which describes a collision of two objects refs #1544 --- proto/sandbox/rst/kinematics/ObjectCollision.proto | 29 ++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 proto/sandbox/rst/kinematics/ObjectCollision.proto diff --git a/proto/sandbox/rst/kinematics/ObjectCollision.proto b/proto/sandbox/rst/kinematics/ObjectCollision.proto new file mode 100644 index 0000000..d276726 --- /dev/null +++ b/proto/sandbox/rst/kinematics/ObjectCollision.proto @@ -0,0 +1,29 @@ +package rst.kinematics; + +import "rst/kinematics/CollisionGeometry.proto"; + +option java_outer_classname = "ObjectCollisionType"; + +/** + * Holds information about a collision between two objects. + * + * @author Daniel Seidel + */ +message ObjectCollision { + + /** + * Geometry of the collision, such as list of contact points. + */ + required CollisionGeometry geometry = 1; + + /** + * Name of the first object involved in the collision. + */ + required string object_1 = 2; + + /** + * Name of the second object involved in the collision. + */ + required string object_2 = 3; + +} -- 1.7.9.5