Skip to content

Commit

Permalink
Merge branch 'templatize' into issue122
Browse files Browse the repository at this point in the history
  • Loading branch information
jslee02 committed Aug 13, 2016
2 parents e11a842 + 8147545 commit aa916ea
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions include/fcl/traversal/collision/mesh_collision_traversal_node.h
Expand Up @@ -107,8 +107,8 @@ class MeshCollisionTraversalNodeOBB : public MeshCollisionTraversalNode<OBB<S>>

void leafTesting(int b1, int b2, const Transform3<S>& tf) const;

Matrix3d R;
Vector3d T;
Matrix3<S> R;
Vector3<S> T;

EIGEN_MAKE_ALIGNED_OPERATOR_NEW
};
Expand Down Expand Up @@ -148,8 +148,8 @@ class MeshCollisionTraversalNodeRSS : public MeshCollisionTraversalNode<RSS<S>>

void leafTesting(int b1, int b2, const Transform3<S>& tf) const;

Matrix3d R;
Vector3d T;
Matrix3<S> R;
Vector3<S> T;

EIGEN_MAKE_ALIGNED_OPERATOR_NEW
};
Expand Down Expand Up @@ -179,8 +179,8 @@ class MeshCollisionTraversalNodekIOS : public MeshCollisionTraversalNode<kIOS<S>

void leafTesting(int b1, int b2) const;

Matrix3d R;
Vector3d T;
Matrix3<S> R;
Vector3<S> T;

EIGEN_MAKE_ALIGNED_OPERATOR_NEW
};
Expand Down Expand Up @@ -211,8 +211,8 @@ class MeshCollisionTraversalNodeOBBRSS : public MeshCollisionTraversalNode<OBBRS

void leafTesting(int b1, int b2) const;

Matrix3d R;
Vector3d T;
Matrix3<S> R;
Vector3<S> T;

EIGEN_MAKE_ALIGNED_OPERATOR_NEW
};
Expand Down

0 comments on commit aa916ea

Please sign in to comment.