Skip to content

Commit

Permalink
Apply inline pattern to (bvh) traversal
Browse files Browse the repository at this point in the history
  • Loading branch information
jslee02 committed Aug 16, 2016
1 parent a8a3e87 commit 8f16c25
Show file tree
Hide file tree
Showing 88 changed files with 9,795 additions and 7,474 deletions.
6 changes: 4 additions & 2 deletions include/fcl/narrowphase/continuous_collision-inl.h
Expand Up @@ -156,7 +156,8 @@ typename BV::S continuousCollideBVHPolynomial(

motion1->integrate(0);
motion2->integrate(0);
Transform3<S> tf1, tf2;
Transform3<S> tf1;
Transform3<S> tf2;
motion1->getCurrentTransform(tf1);
motion2->getCurrentTransform(tf2);
if(!initialize<BV>(node, *o1, tf1, *o2, tf2, c_request))
Expand Down Expand Up @@ -279,7 +280,8 @@ typename NarrowPhaseSolver::S continuousCollideConservativeAdvancement(
motion1->integrate(result.time_of_contact);
motion2->integrate(result.time_of_contact);

Transform3<S> tf1, tf2;
Transform3<S> tf1;
Transform3<S> tf2;
motion1->getCurrentTransform(tf1);
motion2->getCurrentTransform(tf2);
result.contact_tf1 = tf1;
Expand Down
Expand Up @@ -75,7 +75,8 @@ bool conservativeAdvancement(const BVHModel<BV>& o1,
{
using S = typename BV::S;

Transform3<S> tf1, tf2;
Transform3<S> tf1;
Transform3<S> tf2;
motion1->getCurrentTransform(tf1);
motion2->getCurrentTransform(tf2);

Expand Down Expand Up @@ -149,7 +150,8 @@ bool conservativeAdvancementMeshOriented(const BVHModel<BV>& o1,
{
using S = typename BV::S;

Transform3<S> tf1, tf2;
Transform3<S> tf1;
Transform3<S> tf2;
motion1->getCurrentTransform(tf1);
motion2->getCurrentTransform(tf2);

Expand Down Expand Up @@ -221,7 +223,8 @@ bool conservativeAdvancement(const Shape1& o1,
{
using S = typename Shape1::S;

Transform3<S> tf1, tf2;
Transform3<S> tf1;
Transform3<S> tf2;
motion1->getCurrentTransform(tf1);
motion2->getCurrentTransform(tf2);

Expand Down Expand Up @@ -289,7 +292,8 @@ bool conservativeAdvancement(const BVHModel<BV>& o1,
{
using S = typename BV::S;

Transform3<S> tf1, tf2;
Transform3<S> tf1;
Transform3<S> tf2;
motion1->getCurrentTransform(tf1);
motion2->getCurrentTransform(tf2);

Expand Down Expand Up @@ -358,7 +362,8 @@ bool conservativeAdvancementMeshShapeOriented(const BVHModel<BV>& o1,
{
using S = typename BV::S;

Transform3<S> tf1, tf2;
Transform3<S> tf1;
Transform3<S> tf2;
motion1->getCurrentTransform(tf1);
motion2->getCurrentTransform(tf2);

Expand Down Expand Up @@ -455,7 +460,8 @@ bool conservativeAdvancement(const Shape& o1,
{
using S = typename BV::S;

Transform3<S> tf1, tf2;
Transform3<S> tf1;
Transform3<S> tf2;
motion1->getCurrentTransform(tf1);
motion2->getCurrentTransform(tf2);

Expand Down Expand Up @@ -523,7 +529,8 @@ bool conservativeAdvancementShapeMeshOriented(const Shape& o1,
typename BV::S& toc)
{
using S = typename BV::S;
Transform3<S> tf1, tf2;
Transform3<S> tf1;
Transform3<S> tf2;
motion1->getCurrentTransform(tf1);
motion2->getCurrentTransform(tf2);

Expand Down
@@ -0,0 +1,125 @@
/*
* Software License Agreement (BSD License)
*
* Copyright (c) 2011-2014, Willow Garage, Inc.
* Copyright (c) 2014-2016, Open Source Robotics Foundation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
* * Neither the name of Open Source Robotics Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/

/** @author Jia Pan */

#include "fcl/narrowphase/detail/traversal/collision/bvh_collision_traversal_node.h"

namespace fcl
{

namespace detail
{

//==============================================================================
template <typename BV>
BVHCollisionTraversalNode<BV>::BVHCollisionTraversalNode()
: CollisionTraversalNodeBase<typename BV::S>()
{
model1 = nullptr;
model2 = nullptr;

num_bv_tests = 0;
num_leaf_tests = 0;
query_time_seconds = 0.0;
}

//==============================================================================
template <typename BV>
bool BVHCollisionTraversalNode<BV>::isFirstNodeLeaf(int b) const
{
return model1->getBV(b).isLeaf();
}

//==============================================================================
template <typename BV>
bool BVHCollisionTraversalNode<BV>::isSecondNodeLeaf(int b) const
{
return model2->getBV(b).isLeaf();
}

//==============================================================================
template <typename BV>
bool BVHCollisionTraversalNode<BV>::firstOverSecond(int b1, int b2) const
{
S sz1 = model1->getBV(b1).bv.size();
S sz2 = model2->getBV(b2).bv.size();

bool l1 = model1->getBV(b1).isLeaf();
bool l2 = model2->getBV(b2).isLeaf();

if(l2 || (!l1 && (sz1 > sz2)))
return true;
return false;
}

//==============================================================================
template <typename BV>
int BVHCollisionTraversalNode<BV>::getFirstLeftChild(int b) const
{
return model1->getBV(b).leftChild();
}

//==============================================================================
template <typename BV>
int BVHCollisionTraversalNode<BV>::getFirstRightChild(int b) const
{
return model1->getBV(b).rightChild();
}

//==============================================================================
template <typename BV>
int BVHCollisionTraversalNode<BV>::getSecondLeftChild(int b) const
{
return model2->getBV(b).leftChild();
}

//==============================================================================
template <typename BV>
int BVHCollisionTraversalNode<BV>::getSecondRightChild(int b) const
{
return model2->getBV(b).rightChild();
}

//==============================================================================
template <typename BV>
bool BVHCollisionTraversalNode<BV>::BVTesting(int b1, int b2) const
{
if(this->enable_statistics) num_bv_tests++;
return !model1->getBV(b1).overlap(model2->getBV(b2));
}

} // namespace detail
} // namespace fcl
Expand Up @@ -94,91 +94,9 @@ class BVHCollisionTraversalNode
mutable S query_time_seconds;
};

//============================================================================//
// //
// Implementations //
// //
//============================================================================//

//==============================================================================
template <typename BV>
BVHCollisionTraversalNode<BV>::BVHCollisionTraversalNode()
: CollisionTraversalNodeBase<typename BV::S>()
{
model1 = nullptr;
model2 = nullptr;

num_bv_tests = 0;
num_leaf_tests = 0;
query_time_seconds = 0.0;
}

//==============================================================================
template <typename BV>
bool BVHCollisionTraversalNode<BV>::isFirstNodeLeaf(int b) const
{
return model1->getBV(b).isLeaf();
}

//==============================================================================
template <typename BV>
bool BVHCollisionTraversalNode<BV>::isSecondNodeLeaf(int b) const
{
return model2->getBV(b).isLeaf();
}

//==============================================================================
template <typename BV>
bool BVHCollisionTraversalNode<BV>::firstOverSecond(int b1, int b2) const
{
S sz1 = model1->getBV(b1).bv.size();
S sz2 = model2->getBV(b2).bv.size();

bool l1 = model1->getBV(b1).isLeaf();
bool l2 = model2->getBV(b2).isLeaf();

if(l2 || (!l1 && (sz1 > sz2)))
return true;
return false;
}

//==============================================================================
template <typename BV>
int BVHCollisionTraversalNode<BV>::getFirstLeftChild(int b) const
{
return model1->getBV(b).leftChild();
}

//==============================================================================
template <typename BV>
int BVHCollisionTraversalNode<BV>::getFirstRightChild(int b) const
{
return model1->getBV(b).rightChild();
}

//==============================================================================
template <typename BV>
int BVHCollisionTraversalNode<BV>::getSecondLeftChild(int b) const
{
return model2->getBV(b).leftChild();
}

//==============================================================================
template <typename BV>
int BVHCollisionTraversalNode<BV>::getSecondRightChild(int b) const
{
return model2->getBV(b).rightChild();
}

//==============================================================================
template <typename BV>
bool BVHCollisionTraversalNode<BV>::BVTesting(int b1, int b2) const
{
if(this->enable_statistics) num_bv_tests++;
return !model1->getBV(b1).overlap(model2->getBV(b2));
}

} // namespace detail
} // namespace fcl

#include "fcl/narrowphase/detail/traversal/collision/bvh_collision_traversal_node-inl.h"

#endif
@@ -0,0 +1,89 @@
/*
* Software License Agreement (BSD License)
*
* Copyright (c) 2011-2014, Willow Garage, Inc.
* Copyright (c) 2014-2016, Open Source Robotics Foundation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
* * Neither the name of Open Source Robotics Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/

/** @author Jia Pan */

#include "fcl/narrowphase/detail/traversal/collision/bvh_shape_collision_traversal_node.h"

namespace fcl
{

namespace detail
{

//==============================================================================
template <typename Shape, typename BV>
BVHShapeCollisionTraversalNode<Shape, BV>::BVHShapeCollisionTraversalNode()
: CollisionTraversalNodeBase<typename BV::S>()
{
model1 = nullptr;
model2 = nullptr;

num_bv_tests = 0;
num_leaf_tests = 0;
query_time_seconds = 0.0;
}

//==============================================================================
template <typename Shape, typename BV>
bool BVHShapeCollisionTraversalNode<Shape, BV>::isFirstNodeLeaf(int b) const
{
return model1->getBV(b).isLeaf();
}

//==============================================================================
template <typename Shape, typename BV>
int BVHShapeCollisionTraversalNode<Shape, BV>::getFirstLeftChild(int b) const
{
return model1->getBV(b).leftChild();
}

//==============================================================================
template <typename Shape, typename BV>
int BVHShapeCollisionTraversalNode<Shape, BV>::getFirstRightChild(int b) const
{
return model1->getBV(b).rightChild();
}

//==============================================================================
template <typename Shape, typename BV>
bool BVHShapeCollisionTraversalNode<Shape, BV>::BVTesting(int b1, int b2) const
{
if(this->enable_statistics) num_bv_tests++;
return !model1->getBV(b1).bv.overlap(model2_bv);
}

} // namespace detail
} // namespace fcl

0 comments on commit 8f16c25

Please sign in to comment.