Skip to content
Snippets Groups Projects
Commit 716dcb8f authored by jpan's avatar jpan
Browse files

fix the bug which causes runtime error in grasping

git-svn-id: https://kforge.ros.org/fcl/fcl_ros@26 253336fb-580f-4252-a368-f3cef5a2a82b
parent ee4b79fd
No related branches found
No related tags found
No related merge requests found
......@@ -41,6 +41,8 @@
#include <set>
#include <deque>
#include <iostream>
namespace fcl
{
......@@ -139,7 +141,6 @@ void SSaPCollisionManager::unregisterObject(CollisionObject* obj)
DummyCollisionObject dummyHigh(AABB(obj->getCachedAABB().max_));
CollisionObject* found = NULL;
std::vector<CollisionObject*>::iterator pos_start1 = objs_x.begin();
std::vector<CollisionObject*>::iterator pos_end1 = std::upper_bound(pos_start1, objs_x.end(), &dummyHigh, SortByXLow());
......@@ -147,7 +148,6 @@ void SSaPCollisionManager::unregisterObject(CollisionObject* obj)
{
if(*pos_start1 == obj)
{
found = *pos_start1;
objs_x.erase(pos_start1);
break;
}
......@@ -156,6 +156,7 @@ void SSaPCollisionManager::unregisterObject(CollisionObject* obj)
std::vector<CollisionObject*>::iterator pos_start2 = objs_y.begin();
std::vector<CollisionObject*>::iterator pos_end2 = std::upper_bound(pos_start2, objs_y.end(), &dummyHigh, SortByYLow());
while(pos_start2 < pos_end2)
{
if(*pos_start2 == obj)
......@@ -168,6 +169,7 @@ void SSaPCollisionManager::unregisterObject(CollisionObject* obj)
std::vector<CollisionObject*>::iterator pos_start3 = objs_z.begin();
std::vector<CollisionObject*>::iterator pos_end3 = std::upper_bound(pos_start3, objs_z.end(), &dummyHigh, SortByZLow());
while(pos_start3 < pos_end3)
{
if(*pos_start3 == obj)
......@@ -201,6 +203,7 @@ void SSaPCollisionManager::setup()
void SSaPCollisionManager::update()
{
setup_ = false;
setup();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment