Skip to content

Commit

Permalink
revert autoformatting
Browse files Browse the repository at this point in the history
  • Loading branch information
SpaceIm committed Jan 29, 2022
1 parent af00cc2 commit e9b313b
Show file tree
Hide file tree
Showing 91 changed files with 3,080 additions and 3,080 deletions.
2 changes: 1 addition & 1 deletion include/fcl/broadphase/broadphase_SSaP-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down
10 changes: 5 additions & 5 deletions include/fcl/broadphase/broadphase_SSaP.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand All @@ -44,7 +44,7 @@
namespace fcl
{

/// @brief Simple SAP collision manager
/// @brief Simple SAP collision manager
template <typename S>
class SSaPCollisionManager : public BroadPhaseCollisionManager<S>
{
Expand Down Expand Up @@ -89,21 +89,21 @@ class SSaPCollisionManager : public BroadPhaseCollisionManager<S>

/// @brief whether the manager is empty
bool empty() const;

/// @brief the number of objects managed by the manager
size_t size() const;

protected:
/// @brief check collision between one object and a list of objects, return value is whether stop is possible
bool checkColl(typename std::vector<CollisionObject<S>*>::const_iterator pos_start, typename std::vector<CollisionObject<S>*>::const_iterator pos_end,
CollisionObject<S>* obj, void* cdata, CollisionCallBack<S> callback) const;

/// @brief check distance between one object and a list of objects, return value is whether stop is possible
bool checkDis(typename std::vector<CollisionObject<S>*>::const_iterator pos_start, typename std::vector<CollisionObject<S>*>::const_iterator pos_end,
CollisionObject<S>* obj, void* cdata, DistanceCallBack<S> callback, S& min_dist) const;

bool collide_(CollisionObject<S>* obj, void* cdata, CollisionCallBack<S> callback) const;

bool distance_(CollisionObject<S>* obj, void* cdata, DistanceCallBack<S> callback, S& min_dist) const;

static size_t selectOptimalAxis(
Expand Down
2 changes: 1 addition & 1 deletion include/fcl/broadphase/broadphase_SaP-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down
6 changes: 3 additions & 3 deletions include/fcl/broadphase/broadphase_SaP.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down Expand Up @@ -103,7 +103,7 @@ class SaPCollisionManager : public BroadPhaseCollisionManager<S>

/// @brief whether the manager is empty
bool empty() const;

/// @brief the number of objects managed by the manager
size_t size() const;

Expand All @@ -130,7 +130,7 @@ class SaPCollisionManager : public BroadPhaseCollisionManager<S>

/// @brief End point list for x, y, z coordinates
EndPoint* elist[3];

/// @brief vector version of elist, for acceleration
std::vector<EndPoint*> velist[3];

Expand Down
2 changes: 1 addition & 1 deletion include/fcl/broadphase/broadphase_bruteforce-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down
4 changes: 2 additions & 2 deletions include/fcl/broadphase/broadphase_bruteforce.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down Expand Up @@ -92,7 +92,7 @@ class NaiveCollisionManager : public BroadPhaseCollisionManager<S>

/// @brief whether the manager is empty
bool empty() const;

/// @brief the number of objects managed by the manager
size_t size() const;

Expand Down
4 changes: 2 additions & 2 deletions include/fcl/broadphase/broadphase_collision_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down Expand Up @@ -117,7 +117,7 @@ class BroadPhaseCollisionManager

/// @brief whether the manager is empty
virtual bool empty() const = 0;

/// @brief the number of objects managed by the manager
virtual size_t size() const = 0;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down Expand Up @@ -117,7 +117,7 @@ class BroadPhaseContinuousCollisionManager

/// @brief whether the manager is empty
virtual bool empty() const = 0;

/// @brief the number of objects managed by the manager
virtual size_t size() const = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion include/fcl/broadphase/broadphase_dynamic_AABB_tree-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down
8 changes: 4 additions & 4 deletions include/fcl/broadphase/broadphase_dynamic_AABB_tree.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down Expand Up @@ -71,7 +71,7 @@ class DynamicAABBTreeCollisionManager : public BroadPhaseCollisionManager<S>

/// @brief add objects to the manager
void registerObjects(const std::vector<CollisionObject<S>*>& other_objs);

/// @brief add one object to the manager
void registerObject(CollisionObject<S>* obj);

Expand Down Expand Up @@ -113,10 +113,10 @@ class DynamicAABBTreeCollisionManager : public BroadPhaseCollisionManager<S>

/// @brief perform distance test with objects belonging to another manager
void distance(BroadPhaseCollisionManager<S>* other_manager_, void* cdata, DistanceCallBack<S> callback) const;

/// @brief whether the manager is empty
bool empty() const;

/// @brief the number of objects managed by the manager
size_t size() const;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down
10 changes: 5 additions & 5 deletions include/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down Expand Up @@ -67,12 +67,12 @@ class DynamicAABBTreeCollisionManager_Array : public BroadPhaseCollisionManager<

bool octree_as_geometry_collide;
bool octree_as_geometry_distance;

DynamicAABBTreeCollisionManager_Array();

/// @brief add objects to the manager
void registerObjects(const std::vector<CollisionObject<S>*>& other_objs);

/// @brief add one object to the manager
void registerObject(CollisionObject<S>* obj);

Expand Down Expand Up @@ -114,10 +114,10 @@ class DynamicAABBTreeCollisionManager_Array : public BroadPhaseCollisionManager<

/// @brief perform distance test with objects belonging to another manager
void distance(BroadPhaseCollisionManager<S>* other_manager_, void* cdata, DistanceCallBack<S> callback) const;

/// @brief whether the manager is empty
bool empty() const;

/// @brief the number of objects managed by the manager
size_t size() const;

Expand Down
2 changes: 1 addition & 1 deletion include/fcl/broadphase/broadphase_interval_tree-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down
4 changes: 2 additions & 2 deletions include/fcl/broadphase/broadphase_interval_tree.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down Expand Up @@ -99,7 +99,7 @@ class IntervalTreeCollisionManager : public BroadPhaseCollisionManager<S>

/// @brief whether the manager is empty
bool empty() const;

/// @brief the number of objects managed by the manager
size_t size() const;

Expand Down
2 changes: 1 addition & 1 deletion include/fcl/broadphase/broadphase_spatialhash-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down
2 changes: 1 addition & 1 deletion include/fcl/broadphase/broadphase_spatialhash.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* 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 */

Expand Down
Loading

0 comments on commit e9b313b

Please sign in to comment.