Issue moveit#630: remove color information from addCollisionObjects m…

…ethod
otamachan · Jun 19, 2016 · e4951ef · e4951ef
1 parent d150389
commit e4951ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/...anning_scene_interface/include/moveit/planning_scene_interface/planning_scene_interface.h b/...anning_scene_interface/include/moveit/planning_scene_interface/planning_scene_interface.h
@@ -38,7 +38,6 @@
 #define MOVEIT_PLANNING_INTERFACE_PLANNING_SCENE_INTERFACE_
 
 #include <moveit/robot_state/robot_state.h>
-#include <moveit_msgs/ObjectColor.h>
 #include <moveit_msgs/CollisionObject.h>
 #include <moveit_msgs/AttachedCollisionObject.h>
 
@@ -84,10 +83,9 @@ class PlanningSceneInterface
 
   /** \brief Add collision objects to the world.
       Make sure object.operation is set to object.ADD. */
-  void addCollisionObjects(const std::vector<moveit_msgs::CollisionObject> &collision_objects,
-                           const std::vector<moveit_msgs::ObjectColor> &object_colors = std::vector<moveit_msgs::ObjectColor>()) const;
+  void addCollisionObjects(const std::vector<moveit_msgs::CollisionObject> &collision_objects) const;
 
-  /** \brief Remove collision objects from the world */
+  /** \brief Remove collision objects from the world. */
   void removeCollisionObjects(const std::vector<std::string> &object_ids) const;
 
   /**@}*/

diff --git a/moveit_ros/planning_interface/planning_scene_interface/src/planning_scene_interface.cpp b/moveit_ros/planning_interface/planning_scene_interface/src/planning_scene_interface.cpp
@@ -202,12 +202,10 @@ class PlanningSceneInterface::PlanningSceneInterfaceImpl
     return result;
   }
 
-  void addCollisionObjects(const std::vector<moveit_msgs::CollisionObject> &collision_objects,
-                           const std::vector<moveit_msgs::ObjectColor> &object_colors) const
+  void addCollisionObjects(const std::vector<moveit_msgs::CollisionObject> &collision_objects) const
   {
     moveit_msgs::PlanningScene planning_scene;
     planning_scene.world.collision_objects = collision_objects;
-    planning_scene.object_colors = object_colors;
     planning_scene.is_diff = true;
     planning_scene_diff_publisher_.publish(planning_scene);
   }
@@ -269,10 +267,9 @@ std::map<std::string, moveit_msgs::AttachedCollisionObject> PlanningSceneInterfa
   return impl_->getAttachedObjects(object_ids);
 }
 
-void PlanningSceneInterface::addCollisionObjects(const std::vector<moveit_msgs::CollisionObject> &collision_objects,
-                                                 const std::vector<moveit_msgs::ObjectColor> &object_colors) const
+void PlanningSceneInterface::addCollisionObjects(const std::vector<moveit_msgs::CollisionObject> &collision_objects) const
 {
-  return impl_->addCollisionObjects(collision_objects, object_colors);
+  return impl_->addCollisionObjects(collision_objects);
 }
 
 void PlanningSceneInterface::removeCollisionObjects(const std::vector<std::string> &object_ids) const