Merge pull request graspit-simulator#26 from BoyuanChen/master

importObstacleCB now takes both obstacle name and absolute path
lwohlhart · Aug 30, 2017 · 16deb2a · 16deb2a
2 parents c31d849 + feb41fa
commit 16deb2a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/graspit_interface.cpp b/src/graspit_interface.cpp
@@ -508,8 +508,12 @@ bool GraspitInterface::importObstacleCB(graspit_interface::ImportObstacle::Reque
 
     Body * b = graspitCore->getWorld()->importBody(QString("Body"),filename);
     if(b == NULL){
-        response.result = response.RESULT_FAILURE;
-        return true;
+        //Now try to load using unaltered filepath from request.
+        b = graspitCore->getWorld()->importBody(QString("Body"),QString(request.filename.data()));
+        if(b == NULL){
+            response.result = response.RESULT_FAILURE;
+            return true;
+        }
     }
 
     vec3 newTranslation(request.pose.position.x * 1000.0,