From c465c498accdb37dee6a13a08da80852e00c9e9a Mon Sep 17 00:00:00 2001
From: jpan <jpan@253336fb-580f-4252-a368-f3cef5a2a82b>
Date: Fri, 3 Feb 2012 04:41:03 +0000
Subject: [PATCH] git-svn-id: https://kforge.ros.org/fcl/fcl_ros@71
253336fb-580f-4252-a368-f3cef5a2a82b
---
trunk/fcl/include/fcl/traversal_node_bvhs.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/trunk/fcl/include/fcl/traversal_node_bvhs.h b/trunk/fcl/include/fcl/traversal_node_bvhs.h
index 84f99936..c2a5bc0e 100644
--- a/trunk/fcl/include/fcl/traversal_node_bvhs.h
+++ b/trunk/fcl/include/fcl/traversal_node_bvhs.h
@@ -147,8 +147,8 @@ struct BVHCollisionPair
BVHCollisionPair(int id1_, int id2_) : id1(id1_), id2(id2_) {}
- BVHCollisionPair(int id1_, int id2_, const Vec3f& n, const Vec3f& contactp, BVH_REAL depth) : id1(id1_),
- id2(id2_), normal(n), contact_point(contactp), penetration_depth(depth) {}
+ BVHCollisionPair(int id1_, int id2_, const Vec3f& contactp, const Vec3f& n, BVH_REAL depth) : id1(id1_),
+ id2(id2_), contact_point(contactp), normal(n), penetration_depth(depth) {}
/** \brief The index of one in-collision primitive */
int id1;
@@ -156,12 +156,12 @@ struct BVHCollisionPair
/** \brief The index of the other in-collision primitive */
int id2;
- /** \brief Contact normal */
- Vec3f normal;
-
/** \brief Contact points */
Vec3f contact_point;
+ /** \brief Contact normal */
+ Vec3f normal;
+
/** \brief Penetration depth for two triangles */
BVH_REAL penetration_depth;
};
--
GitLab