From eee28e0a17366225b75a34134d2bd1056260c653 Mon Sep 17 00:00:00 2001
From: Lucile Remigy <lucile.remigy@epitech.eu>
Date: Tue, 15 Oct 2019 16:32:54 +0200
Subject: [PATCH] correction request
delete one class, 2 class are the same
add inline to initialize
---
src/traversal/traversal_node_setup.h | 2 +-
src/traversal/traversal_recurse.cpp | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/traversal/traversal_node_setup.h b/src/traversal/traversal_node_setup.h
index 4dc10681..6c50a0e7 100644
--- a/src/traversal/traversal_node_setup.h
+++ b/src/traversal/traversal_node_setup.h
@@ -62,7 +62,7 @@ inline bool initialize(OcTreeCollisionTraversalNode& node,
const OcTree& model2, const Transform3f& tf2,
const OcTreeSolver* otsolver,
CollisionResult& result)
-
+{
node.result = &result;
node.model1 = &model1;
diff --git a/src/traversal/traversal_recurse.cpp b/src/traversal/traversal_recurse.cpp
index 14a232cd..0a139b35 100644
--- a/src/traversal/traversal_recurse.cpp
+++ b/src/traversal/traversal_recurse.cpp
@@ -89,7 +89,6 @@ void collisionRecurse(CollisionTraversalNodeBase* node, int b1, int b2,
collisionRecurse(node, b1, c2, front_list, sqrDistLowerBound2);
sqrDistLowerBound = std::min (sqrDistLowerBound1, sqrDistLowerBound2);
}
- return;
}
void collisionNonRecurse(CollisionTraversalNodeBase* node,
--
GitLab