diff --git a/Makefile b/Makefile index c8e6e2af6646506c2cb708f17138c7719a9f24de..d3c8a6bd8a5009b0eacd783ea936a12b807770f4 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,6 @@ SUBDIR+= py-hpp-affordance-corba SUBDIR+= py-hpp-baxter SUBDIR+= py-hpp-bezier-com-traj SUBDIR+= py-hpp-centroidal-dynamics -SUBDIR+= py-hpp-environments SUBDIR+= py-hpp-hrp2 SUBDIR+= py-hpp-rbprm SUBDIR+= py-hpp-rbprm-corba diff --git a/py-hpp-environments/DESCR b/py-hpp-environments/DESCR deleted file mode 100644 index 20f1514ab2dd83cba0fdd3b1de062da412eeaf3b..0000000000000000000000000000000000000000 --- a/py-hpp-environments/DESCR +++ /dev/null @@ -1 +0,0 @@ -Environments and robot descriptions for HPP diff --git a/py-hpp-environments/Makefile b/py-hpp-environments/Makefile deleted file mode 100644 index 2e9f8bf82f31beee4e3c17e21e56044918e57055..0000000000000000000000000000000000000000 --- a/py-hpp-environments/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# robotpkg Makefile for: wip/py-hpp-environments -# Created: Guilhem Saurel on Fri, 10 Oct 2018 -# - -HPP_PACKAGE= hpp-environments -HPP_COMMENT= Environments and robot descriptions for HPP - -CATEGORIES= wip - -PYTHON_NOTAG_CONFLICT= yes - -include ../../meta-pkgs/hpp/Makefile.common - -include ../../mk/language/c.mk -include ../../mk/language/c++11.mk -include ../../mk/robotpkg.mk diff --git a/py-hpp-environments/PLIST b/py-hpp-environments/PLIST deleted file mode 100644 index 1997698ca6fe37896ac177501dc95eea7ace0b9b..0000000000000000000000000000000000000000 --- a/py-hpp-environments/PLIST +++ /dev/null @@ -1,278 +0,0 @@ -@comment Fri Oct 19 16:39:15 CEST 2018 -include/hpp/environments/config.hh -include/hpp/environments/deprecated.hh -include/hpp/environments/warning.hh -lib/pkgconfig/hpp-environments.pc -${PYTHON_SITELIB}/hpp/environments/__init__.py -${PYTHON_SITELIB}/hpp/environments/robot.py -share/hpp_environments/meshes/CMakeLists.txt -share/hpp_environments/meshes/buggy/buggy.dae -share/hpp_environments/meshes/buggy/buggyBB.dae -share/hpp_environments/meshes/buggy/buggy_rearwheel.dae -share/hpp_environments/meshes/buggy/scene.dae -share/hpp_environments/meshes/buggy/scene.stl -share/hpp_environments/meshes/buggy/wheel_frontleft.dae -share/hpp_environments/meshes/buggy/wheel_frontright.dae -share/hpp_environments/meshes/hrp2/floor.dae -share/hpp_environments/meshes/multicontact/antfarm_firstLevel.stl -share/hpp_environments/meshes/multicontact/bauzil_ramp.stl -share/hpp_environments/meshes/multicontact/bauzil_ramp_simplified.stl -share/hpp_environments/meshes/multicontact/bauzil_ramp_up.stl -share/hpp_environments/meshes/multicontact/bauzil_simplified.stl -share/hpp_environments/meshes/multicontact/bauzil_stairs.stl -share/hpp_environments/meshes/multicontact/bauzil_stairs_10cm.stl -share/hpp_environments/meshes/multicontact/bauzil_stairs_10cm_scale.stl -share/hpp_environments/meshes/multicontact/bauzil_stairs_noRamp.stl -share/hpp_environments/meshes/multicontact/bauzil_stairs_noRamp_simplified.stl -share/hpp_environments/meshes/multicontact/bauzil_walk_stairs.stl -share/hpp_environments/meshes/multicontact/board.stl -share/hpp_environments/meshes/multicontact/box.stl -share/hpp_environments/meshes/multicontact/box_rom.stl -share/hpp_environments/meshes/multicontact/bridge.stl -share/hpp_environments/meshes/multicontact/car.dae -share/hpp_environments/meshes/multicontact/car.stl -share/hpp_environments/meshes/multicontact/car_simple.stl -share/hpp_environments/meshes/multicontact/cave_simplified.stl -share/hpp_environments/meshes/multicontact/chair.stl -share/hpp_environments/meshes/multicontact/chair_simple.stl -share/hpp_environments/meshes/multicontact/climb.stl -share/hpp_environments/meshes/multicontact/cross_gap.stl -share/hpp_environments/meshes/multicontact/cross_gap2.stl -share/hpp_environments/meshes/multicontact/cubeWorld3.stl -share/hpp_environments/meshes/multicontact/cube_non_coplanar.stl -share/hpp_environments/meshes/multicontact/cube_non_coplanar2.stl -share/hpp_environments/meshes/multicontact/cube_non_coplanar2_panel.stl -share/hpp_environments/meshes/multicontact/darpa.stl -share/hpp_environments/meshes/multicontact/darpa_no_ctc_mid.stl -share/hpp_environments/meshes/multicontact/darpa_no_ctc_mid_collision.stl -share/hpp_environments/meshes/multicontact/darpa_no_mid.stl -share/hpp_environments/meshes/multicontact/darpareduced.stl -share/hpp_environments/meshes/multicontact/downSlope.stl -share/hpp_environments/meshes/multicontact/downSlope2.stl -share/hpp_environments/meshes/multicontact/downSlope_easy.stl -share/hpp_environments/meshes/multicontact/downSlope_easy20.stl -share/hpp_environments/meshes/multicontact/flat_hole.stl -share/hpp_environments/meshes/multicontact/flat_step.stl -share/hpp_environments/meshes/multicontact/floor_bauzil.stl -share/hpp_environments/meshes/multicontact/floor_bauzil_obstacles.stl -share/hpp_environments/meshes/multicontact/floor_bauzil_obstacles_simu.stl -share/hpp_environments/meshes/multicontact/ground.stl -share/hpp_environments/meshes/multicontact/ground_bigStep.stl -share/hpp_environments/meshes/multicontact/ground_jump_bar.stl -share/hpp_environments/meshes/multicontact/ground_jump_easy.stl -share/hpp_environments/meshes/multicontact/ground_jump_easyGoal.stl -share/hpp_environments/meshes/multicontact/ground_jump_easyStart.stl -share/hpp_environments/meshes/multicontact/ground_jump_easyStart2.stl -share/hpp_environments/meshes/multicontact/ground_jump_lowGoal.stl -share/hpp_environments/meshes/multicontact/ground_jump_med.stl -share/hpp_environments/meshes/multicontact/ground_square.stl -share/hpp_environments/meshes/multicontact/ground_table.stl -share/hpp_environments/meshes/multicontact/ground_table2.stl -share/hpp_environments/meshes/multicontact/ground_tablec.stl -share/hpp_environments/meshes/multicontact/ground_with_bridge.stl -share/hpp_environments/meshes/multicontact/groundcrouch.stl -share/hpp_environments/meshes/multicontact/maze_easy.stl -share/hpp_environments/meshes/multicontact/maze_hard.stl -share/hpp_environments/meshes/multicontact/obstacle.stl -share/hpp_environments/meshes/multicontact/ori_plinth.stl -share/hpp_environments/meshes/multicontact/pedal.stl -share/hpp_environments/meshes/multicontact/plane.stl -share/hpp_environments/meshes/multicontact/plateforme_not_flat.stl -share/hpp_environments/meshes/multicontact/plateforme_surfaces.stl -share/hpp_environments/meshes/multicontact/plateforme_surfaces_scale.stl -share/hpp_environments/meshes/multicontact/plateformes_full.stl -share/hpp_environments/meshes/multicontact/platform_hand.stl -share/hpp_environments/meshes/multicontact/polaris.stl -share/hpp_environments/meshes/multicontact/polaris_reduced.stl -share/hpp_environments/meshes/multicontact/robot_box.stl -share/hpp_environments/meshes/multicontact/roomWall.stl -share/hpp_environments/meshes/multicontact/sideWall.stl -share/hpp_environments/meshes/multicontact/sideWall_long.stl -share/hpp_environments/meshes/multicontact/slalom.stl -share/hpp_environments/meshes/multicontact/slalom_debris.stl -share/hpp_environments/meshes/multicontact/slalom_new.stl -share/hpp_environments/meshes/multicontact/slope_towr.stl -share/hpp_environments/meshes/multicontact/spaces.stl -share/hpp_environments/meshes/multicontact/stair_bauzil.stl -share/hpp_environments/meshes/multicontact/stair_bauzil_reduced.stl -share/hpp_environments/meshes/multicontact/stair_bauzil_reduced_backup.stl -share/hpp_environments/meshes/multicontact/stair_bauzil_save.stl -share/hpp_environments/meshes/multicontact/stairs_towr.stl -share/hpp_environments/meshes/multicontact/stepladder.stl -share/hpp_environments/meshes/multicontact/test.stl -share/hpp_environments/meshes/multicontact/truck.stl -share/hpp_environments/meshes/multicontact/truck_vision.stl -share/hpp_environments/meshes/multicontact/untitled.stl -share/hpp_environments/meshes/ori/modular_palet_low.stl -share/hpp_environments/meshes/ori/modular_palet_low_collision.stl -share/hpp_environments/meshes/tests/baxter_simple/torso.dae -share/hpp_environments/meshes/ur_benchmark/pokeball.dae -share/hpp_environments/package.xml -share/hpp_environments/srdf/beam.srdf -share/hpp_environments/srdf/beam_support.srdf -share/hpp_environments/srdf/buggy.srdf -share/hpp_environments/srdf/construction_set/cylinder_08.srdf -share/hpp_environments/srdf/construction_set/cylinder_13.srdf -share/hpp_environments/srdf/construction_set/ground.srdf -share/hpp_environments/srdf/construction_set/sphere.srdf -share/hpp_environments/srdf/drawer_desk/desk.srdf -share/hpp_environments/srdf/hrp2/floor_as_mesh.srdf -share/hpp_environments/srdf/multicontact/antfarm_firstLevel.srdf -share/hpp_environments/srdf/multicontact/bauzil_ramp.srdf -share/hpp_environments/srdf/multicontact/bauzil_ramp_simplified.srdf -share/hpp_environments/srdf/multicontact/bauzil_ramp_up.srdf -share/hpp_environments/srdf/multicontact/bauzil_stairs.srdf -share/hpp_environments/srdf/multicontact/bauzil_stairs_10cm.srdf -share/hpp_environments/srdf/multicontact/bauzil_stairs_collision.srdf -share/hpp_environments/srdf/multicontact/box.srdf -share/hpp_environments/srdf/multicontact/box_rom.srdf -share/hpp_environments/srdf/multicontact/bridge_towr.srdf -share/hpp_environments/srdf/multicontact/car.srdf -share/hpp_environments/srdf/multicontact/climb.srdf -share/hpp_environments/srdf/multicontact/cross_gap.srdf -share/hpp_environments/srdf/multicontact/cubeWorld3.srdf -share/hpp_environments/srdf/multicontact/cubeWorld_nonCoplanar.srdf -share/hpp_environments/srdf/multicontact/cubeWorld_nonCoplanar2.srdf -share/hpp_environments/srdf/multicontact/darpa.srdf -share/hpp_environments/srdf/multicontact/darpa_no_ctc_mid.srdf -share/hpp_environments/srdf/multicontact/darpa_no_mid.srdf -share/hpp_environments/srdf/multicontact/downSlope.srdf -share/hpp_environments/srdf/multicontact/downSlope2.srdf -share/hpp_environments/srdf/multicontact/downSlope_easy.srdf -share/hpp_environments/srdf/multicontact/downSlope_easy20.srdf -share/hpp_environments/srdf/multicontact/flat_hole.srdf -share/hpp_environments/srdf/multicontact/flat_step.srdf -share/hpp_environments/srdf/multicontact/floor_bauzil.srdf -share/hpp_environments/srdf/multicontact/floor_bauzil_obstacles.srdf -share/hpp_environments/srdf/multicontact/ground.srdf -share/hpp_environments/srdf/multicontact/ground_bigStep.srdf -share/hpp_environments/srdf/multicontact/ground_jump_bar.srdf -share/hpp_environments/srdf/multicontact/ground_jump_easy.srdf -share/hpp_environments/srdf/multicontact/ground_jump_low.srdf -share/hpp_environments/srdf/multicontact/ground_jump_med.srdf -share/hpp_environments/srdf/multicontact/ground_with_bridge.srdf -share/hpp_environments/srdf/multicontact/groundcrouch.srdf -share/hpp_environments/srdf/multicontact/maze.srdf -share/hpp_environments/srdf/multicontact/maze2.srdf -share/hpp_environments/srdf/multicontact/maze_easy.srdf -share/hpp_environments/srdf/multicontact/maze_hard.srdf -share/hpp_environments/srdf/multicontact/obstacle_towr.srdf -share/hpp_environments/srdf/multicontact/ori_plinth.srdf -share/hpp_environments/srdf/multicontact/plane.srdf -share/hpp_environments/srdf/multicontact/plane_hole.srdf -share/hpp_environments/srdf/multicontact/plateforme_not_flat.srdf -share/hpp_environments/srdf/multicontact/plateforme_surfaces.srdf -share/hpp_environments/srdf/multicontact/polaris.srdf -share/hpp_environments/srdf/multicontact/roomWall.srdf -share/hpp_environments/srdf/multicontact/scene.srdf -share/hpp_environments/srdf/multicontact/scene2.srdf -share/hpp_environments/srdf/multicontact/scene_wall.srdf -share/hpp_environments/srdf/multicontact/scene_wall2.srdf -share/hpp_environments/srdf/multicontact/sideWall.srdf -share/hpp_environments/srdf/multicontact/sideWall_long.srdf -share/hpp_environments/srdf/multicontact/slalom.srdf -share/hpp_environments/srdf/multicontact/slalom_debris.srdf -share/hpp_environments/srdf/multicontact/slope_towr.srdf -share/hpp_environments/srdf/multicontact/stair_bauzil.srdf -share/hpp_environments/srdf/multicontact/stairs_towr.srdf -share/hpp_environments/srdf/multicontact/stepladder.srdf -share/hpp_environments/srdf/multicontact/table.srdf -share/hpp_environments/srdf/multicontact/truck.srdf -share/hpp_environments/srdf/ori/modular_palet_low.srdf -share/hpp_environments/srdf/ori/modular_palet_low_collision.srdf -share/hpp_environments/srdf/placard.srdf -share/hpp_environments/srdf/scene.srdf -share/hpp_environments/srdf/tests/baxter_simple.srdf -share/hpp_environments/srdf/ur_benchmark/box.srdf -share/hpp_environments/srdf/ur_benchmark/ground.srdf -share/hpp_environments/srdf/ur_benchmark/pokeball.srdf -share/hpp_environments/texture/logo_romeo.jpg -share/hpp_environments/urdf/beam.urdf -share/hpp_environments/urdf/beam_support.urdf -share/hpp_environments/urdf/buggy.urdf -share/hpp_environments/urdf/construction_set/cylinder.srdf -share/hpp_environments/urdf/construction_set/cylinder_08.urdf -share/hpp_environments/urdf/construction_set/cylinder_13.urdf -share/hpp_environments/urdf/construction_set/ground.urdf -share/hpp_environments/urdf/construction_set/sphere.urdf -share/hpp_environments/urdf/drawer_desk/case.urdf.xacro -share/hpp_environments/urdf/drawer_desk/desk.urdf -share/hpp_environments/urdf/drawer_desk/desk.urdf.xacro -share/hpp_environments/urdf/drawer_desk/drawer.urdf.xacro -share/hpp_environments/urdf/drawer_desk/table.urdf.xacro -share/hpp_environments/urdf/drawer_desk/table_leg.urdf.xacro -share/hpp_environments/urdf/hrp2/floor_as_mesh.urdf -share/hpp_environments/urdf/multicontact/antfarm_firstLevel.urdf -share/hpp_environments/urdf/multicontact/bauzil_ramp.urdf -share/hpp_environments/urdf/multicontact/bauzil_ramp_simplified.urdf -share/hpp_environments/urdf/multicontact/bauzil_ramp_up.urdf -share/hpp_environments/urdf/multicontact/bauzil_stairs.urdf -share/hpp_environments/urdf/multicontact/bauzil_stairs_10cm.urdf -share/hpp_environments/urdf/multicontact/bauzil_stairs_collision.urdf -share/hpp_environments/urdf/multicontact/box.urdf -share/hpp_environments/urdf/multicontact/box_rom.urdf -share/hpp_environments/urdf/multicontact/bridge_towr.urdf -share/hpp_environments/urdf/multicontact/car.urdf -share/hpp_environments/urdf/multicontact/climb.urdf -share/hpp_environments/urdf/multicontact/cross_gap.urdf -share/hpp_environments/urdf/multicontact/cubeWorld3.urdf -share/hpp_environments/urdf/multicontact/cubeWorld_nonCoplanar.urdf -share/hpp_environments/urdf/multicontact/cubeWorld_nonCoplanar2.urdf -share/hpp_environments/urdf/multicontact/darpa.urdf -share/hpp_environments/urdf/multicontact/darpa_no_ctc_mid.urdf -share/hpp_environments/urdf/multicontact/darpa_no_mid.urdf -share/hpp_environments/urdf/multicontact/downSlope.urdf -share/hpp_environments/urdf/multicontact/downSlope2.urdf -share/hpp_environments/urdf/multicontact/downSlope_easy.urdf -share/hpp_environments/urdf/multicontact/downSlope_easy20.urdf -share/hpp_environments/urdf/multicontact/flat_hole.urdf -share/hpp_environments/urdf/multicontact/flat_step.urdf -share/hpp_environments/urdf/multicontact/floor_bauzil.urdf -share/hpp_environments/urdf/multicontact/floor_bauzil_obstacles.urdf -share/hpp_environments/urdf/multicontact/ground.urdf -share/hpp_environments/urdf/multicontact/ground_bigStep.urdf -share/hpp_environments/urdf/multicontact/ground_jump_bar.urdf -share/hpp_environments/urdf/multicontact/ground_jump_easy.urdf -share/hpp_environments/urdf/multicontact/ground_jump_easy_old.urdf -share/hpp_environments/urdf/multicontact/ground_jump_low.urdf -share/hpp_environments/urdf/multicontact/ground_jump_med.urdf -share/hpp_environments/urdf/multicontact/ground_with_bridge.urdf -share/hpp_environments/urdf/multicontact/groundcrouch.urdf -share/hpp_environments/urdf/multicontact/maze.urdf -share/hpp_environments/urdf/multicontact/maze2.urdf -share/hpp_environments/urdf/multicontact/maze_easy.urdf -share/hpp_environments/urdf/multicontact/maze_hard.urdf -share/hpp_environments/urdf/multicontact/obstacle_towr.urdf -share/hpp_environments/urdf/multicontact/ori_plinth.urdf -share/hpp_environments/urdf/multicontact/plane.urdf -share/hpp_environments/urdf/multicontact/plateforme_not_flat.urdf -share/hpp_environments/urdf/multicontact/plateforme_surfaces.urdf -share/hpp_environments/urdf/multicontact/polaris.urdf -share/hpp_environments/urdf/multicontact/roomWall.urdf -share/hpp_environments/urdf/multicontact/scene.urdf -share/hpp_environments/urdf/multicontact/scene2.urdf -share/hpp_environments/urdf/multicontact/scene_wall.urdf -share/hpp_environments/urdf/multicontact/scene_wall2.urdf -share/hpp_environments/urdf/multicontact/sideWall.urdf -share/hpp_environments/urdf/multicontact/sideWall_long.urdf -share/hpp_environments/urdf/multicontact/slalom.urdf -share/hpp_environments/urdf/multicontact/slalom_debris.urdf -share/hpp_environments/urdf/multicontact/slope_towr.urdf -share/hpp_environments/urdf/multicontact/stair_bauzil.urdf -share/hpp_environments/urdf/multicontact/stairs_towr.urdf -share/hpp_environments/urdf/multicontact/stepladder.urdf -share/hpp_environments/urdf/multicontact/table.urdf -share/hpp_environments/urdf/multicontact/truck.urdf -share/hpp_environments/urdf/ori/modular_palet_low.urdf -share/hpp_environments/urdf/ori/modular_palet_low_collision.urdf -share/hpp_environments/urdf/placard-vertical.urdf -share/hpp_environments/urdf/placard.urdf -share/hpp_environments/urdf/scene.urdf -share/hpp_environments/urdf/tests/baxter_simple.urdf -share/hpp_environments/urdf/ur_benchmark/box.urdf -share/hpp_environments/urdf/ur_benchmark/ground.urdf -share/hpp_environments/urdf/ur_benchmark/obstacle_sphere.urdf -share/hpp_environments/urdf/ur_benchmark/obstacles.urdf -share/hpp_environments/urdf/ur_benchmark/pokeball.urdf -share/hpp_environments/urdf/ur_benchmark/table.urdf -share/hpp_environments/urdf/ur_benchmark/wall.urdf diff --git a/py-hpp-environments/depend.mk b/py-hpp-environments/depend.mk deleted file mode 100644 index e73b14012336b2803662a0178e43f0d07b40c360..0000000000000000000000000000000000000000 --- a/py-hpp-environments/depend.mk +++ /dev/null @@ -1,29 +0,0 @@ -# robotpkg depend.mk for: wip/py-hpp-environments -# Created: Guilhem Saurel on Fri, 19 Oct 2018 -# - -DEPEND_DEPTH:= ${DEPEND_DEPTH}+ -PY_HPP_ENVIRONMENTS_DEPEND_MK:= ${PY_HPP_ENVIRONMENTS_DEPEND_MK}+ - -ifeq (+,$(DEPEND_DEPTH)) -DEPEND_PKG+= py-hpp-environments -endif - -ifeq (+,$(PY_HPP_ENVIRONMENTS_DEPEND_MK)) # -------------------------------------- - -include ../../mk/sysdep/python.mk - -PREFER.py-hpp-environments?= robotpkg - -DEPEND_USE+= py-hpp-environments - -DEPEND_ABI.py-hpp-environments?= ${PKGTAG.python-}hpp-environments>=4.7.0 -DEPEND_DIR.py-hpp-environments?= ../../wip/py-hpp-environments - -SYSTEM_SEARCH.py-hpp-environments=\ - include/hpp/environments/config.hh \ - 'lib/pkgconfig/hpp-environments.pc:/Version/s/[^0-9.]//gp' - -endif # PY_HPP_ENVIRONMENTS_DEPEND_MK -------------------------------------------- - -DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/py-hpp-environments/distinfo b/py-hpp-environments/distinfo deleted file mode 100644 index 3b715e7b280de9643b7b4592327f73ae68c8986f..0000000000000000000000000000000000000000 --- a/py-hpp-environments/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -SHA1 (hpp-environments-4.8.0.tar.gz) = 7ec68eec8d204ddb4f0b68404df4bda340ccdd7f -RMD160 (hpp-environments-4.8.0.tar.gz) = a6e1512642161a73221e3974ec8f2b9c2c30a140 -Size (hpp-environments-4.8.0.tar.gz) = 5843775 bytes diff --git a/py-hpp-rbprm/Makefile b/py-hpp-rbprm/Makefile index e993fc5c4b3fbeb368f500cec0e1771721733533..1fcf3892d982b09eabd0993bf4a01b0d4ad17e26 100644 --- a/py-hpp-rbprm/Makefile +++ b/py-hpp-rbprm/Makefile @@ -14,7 +14,7 @@ PYTHON_NOTAG_CONFLICT= yes include ../../meta-pkgs/hpp/Makefile.common include ../../wip/py-hpp-rbprm-robot-data/depend.mk -include ../../wip/py-hpp-environments/depend.mk +include ../../simulation/py-hpp-environments/depend.mk include ../../math/curves/depend.mk include ../../math/py-curves/depend.mk