diff --git a/morse/DESCR b/morse/DESCR
index e2630423b3b89567f3cdcbf0520a837abb787ed0..744cd9c20363efa9473be89d1d206ed251d96d0e 100644
--- a/morse/DESCR
+++ b/morse/DESCR
@@ -1,3 +1,28 @@
MORSE (Multi- OpenRobot Simulation Engine)
-MORSE is a 3D multi-purpose simulator for robotics, based on Blender.
+ * Versatile simulator for generic mobile robots simulation
+ (single or multi robots),
+
+ * Realistic and dynamic environments (interaction with other agents like
+ humans or objects),
+
+ * Based on well known and widely adopted open source projects (Blender for 3D
+ rendering + UI, Bullet for physics simulation, dedicated robotic
+ middlewares for communications + robot hardware support),
+
+ * Seamless workflow: since the simulator rely on Blender for both modeling
+ and the real time 3D engine, creating and modifying a simulated scene is
+ straightforward.
+
+ * Entirely scriptable in Python,
+
+ * Adaptable to various level of simulation realism (for instance the
+ simulation of exteroceptive sensors like cameras or a direct access to
+ higher level representations of the world, like labeled artifacts),
+
+ * Currently compatible with ROS, YARP and the LAAS OpenRobots robotics
+ frameworks,
+
+ * Easy to integrate to other environments via a simple socket interface,
+
+ * Fully open source, BSD-compatible.
diff --git a/morse/Makefile b/morse/Makefile
index 1ffa47383e8b6e4d9554d43eb7d2f4b8cffbfdd6..42a445e93b2cffeecb87daf2a1534f6aab486703 100644
--- a/morse/Makefile
+++ b/morse/Makefile
@@ -1,42 +1,16 @@
-#
-# Copyright (c) 2010 LAAS/CNRS
-# All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software for any purpose
-# with or without fee is hereby granted, provided that the above copyright
-# notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-#
-# Severin Lemaignan on Fri May 28 2010
+# robotpkg Makefile for: simulation/morse
+# Created: Séverin Lemaignan on Fri, 28 May 2010
#
-DISTNAME= morse-${VERSION}
-VERSION= 0.2.1
-MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=morse/}
-MASTER_REPOSITORY= git ssh://trac.laas.fr/git/robots/morse
+PKGNAME= morse-${MORSE_VERSION}
-CATEGORIES= wip
-MAINTAINER= morse-dev@laas.fr
-HOMEPAGE= http://softs.laas.fr
-COMMENT= A 3D simulator for robotics
-LICENSE= modified-bsd
+include ../../wip/morse/Makefile.common
-USE_LANGUAGES+= c c++ python
-PYTHON_REQUIRED= >=3
+CMAKE_ARGS+= -DBUILD_CORE_SUPPORT=ON
-CMAKE_ARGS+= -DPYTHON3_EXECUTABLE=${PYTHON}
-CMAKE_ARGS+= -DPYTHON3_INCLUDE_PATH=${PYTHON_INCLUDE}
-CMAKE_ARGS+= -DPYTHON3_LIBRARY=${PYTHON_LIB}
-
-BUILD_TARGET= all
-INSTALL_TARGET= install
+CMAKE_ARGS+= -DBUILD_POCOLIBS_SUPPORT=OFF
+CMAKE_ARGS+= -DBUILD_ROS_SUPPORT=OFF
+CMAKE_ARGS+= -DBUILD_YARP2_SUPPORT=OFF
# doc option
PKG_SUPPORTED_OPTIONS+= doc
@@ -44,95 +18,12 @@ PKG_SUGGESTED_OPTIONS+= doc
PKG_OPTION_DESCR.doc?= Install ${PKGBASE} documentation
define PKG_OPTION_SET.doc
- BUILD_TARGET+= doc
- #TODO! include ../../mk/sysdep/python-sphinx.mk
-endef
-
-# YARP support
-PKG_SUPPORTED_OPTIONS+= yarp
-PKG_OPTION_DESCR.yarp?= Install support for the YARP middleware
-
-define PKG_OPTION_SET.yarp
- CMAKE_ARGS+= -DBUILD_YARP2_SUPPORT=ON
- include ../../middleware/libpyyarp/depend.mk
+ CMAKE_ARGS+= -DBUILD_DOC_SUPPORT=ON
+ include ../../mk/sysdep/py-sphinx.mk
endef
-
-# Pocolibs support
-
-PKG_OPTIONS_OPTIONAL_GROUPS= pocolibs
-PKG_OPTIONS_GROUP.pocolibs= pocolibs-all pocolibs-outdoor pocolibs-hri
-
-PKG_SUPPORTED_OPTIONS+= pocolibs-outdoor
-PKG_OPTION_DESCR.pocolibs-outdoor?= Install support for Pocolibs modules useful for field robotics
-
-define PKG_OPTION_SET.pocolibs-outdoor
- CMAKE_ARGS+= -DBUILD_POCOLIBS_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_POM_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_VIAM_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_PLATINE_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_GENPOS_SUPPORT=ON
-
- include ../../interfaces/genPos-genom/depend.mk
- include ../../image/viam-genom/depend.mk
- include ../../localization/pom-genom/depend.mk
-
+define PKG_OPTION_UNSET.doc
+ CMAKE_ARGS+= -DBUILD_DOC_SUPPORT=OFF
endef
-PKG_SUPPORTED_OPTIONS+= pocolibs-hri
-PKG_OPTION_DESCR.pocolibs-hri?= Install support for Pocolibs modules useful for human-robot interaction
-
-define PKG_OPTION_SET.pocolibs-hri
- CMAKE_ARGS+= -DBUILD_POCOLIBS_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_POM_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_LWR_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_VIMAN_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_HUMAN_POSTURE_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_GENPOS_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_PLATINE_SUPPORT=ON
-
- include ../../interfaces/genPos-genom/depend.mk
- include ../../localization/pom-genom/depend.mk
- include ../../wip/lwr-genom/depend.mk
- include ../../wip/spark-genom/depend.mk
- include ../../image/viman-genom/depend.mk
-
-endef
-
-
-PKG_SUPPORTED_OPTIONS+= pocolibs-all
-PKG_OPTION_DESCR.pocolibs-all?= Install support for all Pocolibs modules
-
-define PKG_OPTION_SET.pocolibs-all
- CMAKE_ARGS+= -DBUILD_POCOLIBS_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_POM_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_VIAM_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_PLATINE_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_GENPOS_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_LWR_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_VIMAN_SUPPORT=ON
- CMAKE_ARGS+= -DBUILD_POCOLIBS_HUMAN_POSTURE_SUPPORT=ON
-
- include ../../interfaces/genPos-genom/depend.mk
- include ../../image/viam-genom/depend.mk
- include ../../localization/pom-genom/depend.mk
- include ../../wip/lwr-genom/depend.mk
- include ../../wip/spark-genom/depend.mk
- include ../../image/viman-genom/depend.mk
-
-endef
-
-# ROS support (only partial)
-#PKG_SUPPORTED_OPTIONS+= ros
-#PKG_OPTION_DESCR.ros?= Install support for the ROS middleware
-#
-#define PKG_OPTION_SET.ros
-# CMAKE_ARGS+= -DBUILD_ROS_SUPPORT=ON
-# include ../../meta-pkgs/ros-base/depend.mk
-#endef
-
-DEPEND_ABI.blender= blender>=2.55
-
-include ../../graphics/blender/depend.mk
-include ../../pkgtools/pkg-config/depend.mk
-include ../../mk/sysdep/cmake.mk
+include ../../mk/sysdep/python2.mk
include ../../mk/robotpkg.mk
diff --git a/morse/Makefile.common b/morse/Makefile.common
new file mode 100644
index 0000000000000000000000000000000000000000..ff88669a5230de5c9d26b3de93ed075e74135aab
--- /dev/null
+++ b/morse/Makefile.common
@@ -0,0 +1,31 @@
+# robotpkg Makefile for: simulation/morse
+# Created: Séverin Lemaignan on Fri, 28 May 2010
+#
+
+MORSE_VERSION= 0.3alpha2
+DISTNAME= morse-$(subst alpha,a,${MORSE_VERSION})
+MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=morse/}
+MASTER_REPOSITORY= git git://trac.laas.fr/robots/morse
+
+CATEGORIES= simulation
+MAINTAINER= morse-dev@laas.fr
+HOMEPAGE= http://morse.openrobots.org
+COMMENT= 3D simulator for robotics
+LICENSE= modified-bsd
+
+DISTINFO_FILE= ${CURDIR}/../../wip/morse/distinfo
+PATCHDIR= ${CURDIR}/../../wip/morse/patches
+
+USE_LANGUAGES+= c c++ python
+PYTHON_REQUIRED+= >=3
+
+CMAKE_ARGS+= -DPYTHON3_EXECUTABLE=${PYTHON}
+CMAKE_ARGS+= -DPYTHON3_INCLUDE_PATH=${PYTHON_INCLUDE}
+CMAKE_ARGS+= -DPYTHON3_LIBRARY=${PYTHON_LIB}
+CMAKE_ARGS+= -DPKG_CONFIG_EXECUTABLE=${PKG_CONFIG}
+
+DEPEND_ABI.blender+= blender>=2.55
+include ../../graphics/blender/depend.mk
+
+include ../../pkgtools/pkg-config/depend.mk
+include ../../mk/sysdep/cmake.mk
diff --git a/morse/PLIST b/morse/PLIST
index 90a7ee38029d1c26e16234ee55aa63ccd1765a9c..db589b61da528d1797d41b78cb362e811ab0469d 100644
--- a/morse/PLIST
+++ b/morse/PLIST
@@ -1,64 +1,77 @@
-@comment Tue Jan 4 14:46:28 CET 2011
+@comment Thu Mar 31 14:07:08 CEST 2011
+${PYTHON_SITELIB}/morse/__init__.py
+${PYTHON_SITELIB}/morse/actuators/__init__.py
+${PYTHON_SITELIB}/morse/actuators/destination.py
+${PYTHON_SITELIB}/morse/actuators/healer.py
+${PYTHON_SITELIB}/morse/actuators/keyboard.py
+${PYTHON_SITELIB}/morse/actuators/kuka.py
+${PYTHON_SITELIB}/morse/actuators/kuka_ik.py
+${PYTHON_SITELIB}/morse/actuators/orientation.py
+${PYTHON_SITELIB}/morse/actuators/pa_10.py
+${PYTHON_SITELIB}/morse/actuators/platine.py
+${PYTHON_SITELIB}/morse/actuators/v_omega.py
+${PYTHON_SITELIB}/morse/actuators/waypoint.py
+${PYTHON_SITELIB}/morse/actuators/xy_omega.py
+${PYTHON_SITELIB}/morse/blender/__init__.py
+${PYTHON_SITELIB}/morse/blender/billboard.py
+${PYTHON_SITELIB}/morse/blender/calling.py
+${PYTHON_SITELIB}/morse/blender/healer.py
+${PYTHON_SITELIB}/morse/blender/human_control.py
+${PYTHON_SITELIB}/morse/blender/main.py
+${PYTHON_SITELIB}/morse/blender/mouse_drag.py
+${PYTHON_SITELIB}/morse/blender/victim.py
+${PYTHON_SITELIB}/morse/blender/view_camera.py
+${PYTHON_SITELIB}/morse/core/__init__.py
+${PYTHON_SITELIB}/morse/core/actuator.py
+${PYTHON_SITELIB}/morse/core/exceptions.py
+${PYTHON_SITELIB}/morse/core/middleware.py
+${PYTHON_SITELIB}/morse/core/object.py
+${PYTHON_SITELIB}/morse/core/request_manager.py
+${PYTHON_SITELIB}/morse/core/robot.py
+${PYTHON_SITELIB}/morse/core/sensor.py
+${PYTHON_SITELIB}/morse/core/services.py
+${PYTHON_SITELIB}/morse/core/status.py
+${PYTHON_SITELIB}/morse/core/supervision_services.py
+${PYTHON_SITELIB}/morse/geolandloader/geoDTMLoader.py
+${PYTHON_SITELIB}/morse/geolandloader/geoLandPlugin.py
+${PYTHON_SITELIB}/morse/geolandloader/geoShapefileLoader.py
+${PYTHON_SITELIB}/morse/helpers/__init__.py
+${PYTHON_SITELIB}/morse/helpers/colors.py
+${PYTHON_SITELIB}/morse/helpers/math.py
+${PYTHON_SITELIB}/morse/helpers/motion.py
+${PYTHON_SITELIB}/morse/helpers/transformation.py
+${PYTHON_SITELIB}/morse/middleware/__init__.py
+${PYTHON_SITELIB}/morse/middleware/socket_mw.py
+${PYTHON_SITELIB}/morse/middleware/socket_request_manager.py
+${PYTHON_SITELIB}/morse/middleware/sockets/__init__.py
+${PYTHON_SITELIB}/morse/middleware/text_mw.py
+${PYTHON_SITELIB}/morse/modifiers/__init__.py
+${PYTHON_SITELIB}/morse/modifiers/gaussian.so
+${PYTHON_SITELIB}/morse/modifiers/gps_noise.py
+${PYTHON_SITELIB}/morse/modifiers/ned_mod.py
+${PYTHON_SITELIB}/morse/modifiers/utm_mod.py
+${PYTHON_SITELIB}/morse/robots/__init__.py
+${PYTHON_SITELIB}/morse/robots/atrv.py
+${PYTHON_SITELIB}/morse/robots/daurade.py
+${PYTHON_SITELIB}/morse/robots/human.py
+${PYTHON_SITELIB}/morse/robots/jido.py
+${PYTHON_SITELIB}/morse/robots/ressac.py
+${PYTHON_SITELIB}/morse/sensors/__init__.py
+${PYTHON_SITELIB}/morse/sensors/accelerometer.py
+${PYTHON_SITELIB}/morse/sensors/camera.py
+${PYTHON_SITELIB}/morse/sensors/gps.py
+${PYTHON_SITELIB}/morse/sensors/gyroscope.py
+${PYTHON_SITELIB}/morse/sensors/human_posture.py
+${PYTHON_SITELIB}/morse/sensors/kuka_posture.py
+${PYTHON_SITELIB}/morse/sensors/motion_sensor.py
+${PYTHON_SITELIB}/morse/sensors/proximity.py
+${PYTHON_SITELIB}/morse/sensors/ptu.py
+${PYTHON_SITELIB}/morse/sensors/semantic_camera.py
+${PYTHON_SITELIB}/morse/sensors/sick.py
+${PYTHON_SITELIB}/morse/sensors/thermometer.py
+${PYTHON_SITELIB}/morse/sensors/velodyne.py
+${PYTHON_SITELIB}/morse/sensors/video_camera.py
bin/morse
-lib/python3.1/site-packages/morse/__init__.py
-lib/python3.1/site-packages/morse/actuators/__init__.py
-lib/python3.1/site-packages/morse/actuators/destination.py
-lib/python3.1/site-packages/morse/actuators/keyboard.py
-lib/python3.1/site-packages/morse/actuators/kuka-ik.py
-lib/python3.1/site-packages/morse/actuators/kuka.py
-lib/python3.1/site-packages/morse/actuators/orientation.py
-lib/python3.1/site-packages/morse/actuators/pa-10.py
-lib/python3.1/site-packages/morse/actuators/platine.py
-lib/python3.1/site-packages/morse/actuators/v_omega.py
-lib/python3.1/site-packages/morse/actuators/waypoint.py
-lib/python3.1/site-packages/morse/blender/__init__.py
-lib/python3.1/site-packages/morse/blender/billboard.py
-lib/python3.1/site-packages/morse/blender/calling.py
-lib/python3.1/site-packages/morse/blender/human_control.py
-lib/python3.1/site-packages/morse/blender/human_head.py
-lib/python3.1/site-packages/morse/blender/human_stance.py
-lib/python3.1/site-packages/morse/blender/main.py
-lib/python3.1/site-packages/morse/blender/mouse_drag.py
-lib/python3.1/site-packages/morse/blender/victim.py
-lib/python3.1/site-packages/morse/blender/view_camera.py
-lib/python3.1/site-packages/morse/geolandloader/geoDTMLoader.py
-lib/python3.1/site-packages/morse/geolandloader/geoLandPlugin.py
-lib/python3.1/site-packages/morse/geolandloader/geoShapefileLoader.py
-lib/python3.1/site-packages/morse/helpers/__init__.py
-lib/python3.1/site-packages/morse/helpers/actuator.py
-lib/python3.1/site-packages/morse/helpers/colors.py
-lib/python3.1/site-packages/morse/helpers/math.py
-lib/python3.1/site-packages/morse/helpers/middleware.py
-lib/python3.1/site-packages/morse/helpers/object.py
-lib/python3.1/site-packages/morse/helpers/robot.py
-lib/python3.1/site-packages/morse/helpers/sensor.py
-lib/python3.1/site-packages/morse/helpers/transformation.py
-lib/python3.1/site-packages/morse/middleware/__init__.py
-lib/python3.1/site-packages/morse/middleware/socket_mw.py
-lib/python3.1/site-packages/morse/middleware/sockets/__init__.py
-lib/python3.1/site-packages/morse/middleware/text_mw.py
-lib/python3.1/site-packages/morse/modifiers/__init__.py
-lib/python3.1/site-packages/morse/modifiers/gaussian.so
-lib/python3.1/site-packages/morse/modifiers/gps_noise.py
-lib/python3.1/site-packages/morse/modifiers/ned_mod.py
-lib/python3.1/site-packages/morse/modifiers/utm_mod.py
-lib/python3.1/site-packages/morse/robots/__init__.py
-lib/python3.1/site-packages/morse/robots/atrv.py
-lib/python3.1/site-packages/morse/robots/daurade.py
-lib/python3.1/site-packages/morse/robots/jido.py
-lib/python3.1/site-packages/morse/robots/ressac.py
-lib/python3.1/site-packages/morse/sensors/__init__.py
-lib/python3.1/site-packages/morse/sensors/accelerometer.py
-lib/python3.1/site-packages/morse/sensors/camera.py
-lib/python3.1/site-packages/morse/sensors/gps.py
-lib/python3.1/site-packages/morse/sensors/gyroscope.py
-lib/python3.1/site-packages/morse/sensors/human_posture.py
-lib/python3.1/site-packages/morse/sensors/proximity.py
-lib/python3.1/site-packages/morse/sensors/ptu.py
-lib/python3.1/site-packages/morse/sensors/semantic_camera.py
-lib/python3.1/site-packages/morse/sensors/sick.py
-lib/python3.1/site-packages/morse/sensors/thermometer.py
-lib/python3.1/site-packages/morse/sensors/video_camera.py
share/data/morse/components/controllers/destination_control/destination_2.0.blend
share/data/morse/components/controllers/destination_control/destination_2.1.blend
share/data/morse/components/controllers/destination_control/destination_module.py
@@ -67,13 +80,16 @@ share/data/morse/components/controllers/destination_control/straight_destination
share/data/morse/components/controllers/destination_control/teleport_destination.py
share/data/morse/components/controllers/destination_control/waypoint_destination.py
share/data/morse/components/controllers/morse_destination_control.blend
+share/data/morse/components/controllers/morse_healer_beam.blend
share/data/morse/components/controllers/morse_manual_control.blend
share/data/morse/components/controllers/morse_orientation_control.blend
+share/data/morse/components/controllers/morse_platine_control.blend
share/data/morse/components/controllers/morse_vw_control.blend
share/data/morse/components/controllers/morse_waypoint_control.blend
-share/data/morse/components/human/achile-2.5.blend
-share/data/morse/components/human/achile3.blend
+share/data/morse/components/controllers/morse_xyw_control.blend
+share/data/morse/components/human/default_human.blend
share/data/morse/components/middleware/pocolibs_empty.blend
+share/data/morse/components/middleware/ros_empty.blend
share/data/morse/components/middleware/socket_empty.blend
share/data/morse/components/middleware/text_empty.blend
share/data/morse/components/middleware/yarp_empty.blend
@@ -90,105 +106,236 @@ share/data/morse/components/robots/daurade.blend
share/data/morse/components/robots/jido-armature.blend
share/data/morse/components/robots/jido-kuka.blend
share/data/morse/components/robots/jido.blend
-share/data/morse/components/robots/kuka_arm-1.blend
share/data/morse/components/robots/kuka_arm-rig.blend
+share/data/morse/components/robots/kuka_arm.blend
+share/data/morse/components/robots/pr2/pr2_25.blend
share/data/morse/components/robots/ressac-action.blend
share/data/morse/components/robots/ressac.blend
+share/data/morse/components/robots/sa_hand-8-semi_ok.blend
share/data/morse/components/robots/submarine.blend
share/data/morse/components/scenes/indoors-1/indoor_scene-2.0.blend
share/data/morse/components/scenes/laas/grande_salle.blend
share/data/morse/components/scenes/land-1/buildings_scene-2.0.blend
share/data/morse/components/scenes/land-1/buildings_scene-3.0.blend
-share/data/morse/components/scenes/props/achile.blend
share/data/morse/components/scenes/props/animated_water.blend
-share/data/morse/components/scenes/props/furniture-2.49.blend
-share/data/morse/components/scenes/props/furniture-2.5.blend
+share/data/morse/components/scenes/props/furnitures.blend
share/data/morse/components/scenes/props/human.blend
share/data/morse/components/scenes/props/sceneProps-2.0.blend
+share/data/morse/components/scenes/props/simplest_tree.blend
share/data/morse/components/scenes/props/victim.blend
share/data/morse/components/scenes/water-1/water_scene.blend
share/data/morse/components/sensors/morse_GPS.blend
share/data/morse/components/sensors/morse_accelerometer.blend
share/data/morse/components/sensors/morse_camera.blend
share/data/morse/components/sensors/morse_gyroscope.blend
+share/data/morse/components/sensors/morse_kuka_posture.blend
share/data/morse/components/sensors/morse_proximity.blend
share/data/morse/components/sensors/morse_ptu.blend
share/data/morse/components/sensors/morse_sick.blend
share/data/morse/components/sensors/morse_stereo_cameras.blend
share/data/morse/components/sensors/morse_thermometer.blend
+share/data/morse/components/sensors/morse_velodyne.blend
share/data/morse/morse_default.blend
-share/doc/Makefile
-share/doc/cover.svg.in
-share/doc/developers_guide.tex
-share/doc/media/LMB.png
-share/doc/media/MMB.png
-share/doc/media/RMB.png
-share/doc/media/attention.png
-share/doc/media/blender_logo.png
-share/doc/media/component_diagram.png
-share/doc/media/indoors_sick.jpg
-share/doc/media/laas.png
-share/doc/media/morse_intro.jpg
-share/doc/media/morse_uml.png
-share/doc/media/onera.png
-share/doc/media/openrobots-simulator.png
-share/doc/media/outdoor_example.jpg
-share/doc/media/simu_render_indoors.jpg
-share/doc/media/simulation_main_loop_overview.png
-share/doc/media/simulation_main_loop_overview.svg
-share/doc/media/stae_logo.png
-share/doc/morse/README_DOC
-share/doc/morse/dev/adding_component.txt
-share/doc/morse/dev/adding_modifier.txt
-share/doc/morse/dev/dev_overview.txt
-share/doc/morse/dev/dev_workflow.txt
-share/doc/morse/dev/morse_uml.dot
-share/doc/morse/dev/summary.txt
-share/doc/morse/morse.rst
-share/doc/morse/morse.txt
-share/doc/morse/user/actuators/destination.txt
-share/doc/morse/user/actuators/keyboard.txt
-share/doc/morse/user/actuators/v_omega.txt
-share/doc/morse/user/actuators/waypoint.txt
-share/doc/morse/user/advanced_tutorials/advanced_tutorials.txt
-share/doc/morse/user/advanced_tutorials/equip_robot.txt
-share/doc/morse/user/advanced_tutorials/yarp_tutorial.txt
-share/doc/morse/user/basic_morse.txt
-share/doc/morse/user/component_library.txt
-share/doc/morse/user/hooks.txt
-share/doc/morse/user/installation.txt
-share/doc/morse/user/middlewares/new_middleware.txt
-share/doc/morse/user/middlewares/socket.txt
-share/doc/morse/user/middlewares/text.txt
-share/doc/morse/user/middlewares/yarp.txt
-share/doc/morse/user/modifier_introduction.txt
-share/doc/morse/user/modifiers/json.txt
-share/doc/morse/user/modifiers/ned.txt
-share/doc/morse/user/modifiers/utm.txt
-share/doc/morse/user/robots/atrv.txt
-share/doc/morse/user/robots/jido.txt
-share/doc/morse/user/robots/ressac.txt
-share/doc/morse/user/sensors/accelerometer.txt
-share/doc/morse/user/sensors/camera.txt
-share/doc/morse/user/sensors/gps.txt
-share/doc/morse/user/sensors/gyroscope.txt
-share/doc/morse/user/sensors/pantilt.txt
-share/doc/morse/user/sensors/sick.txt
-share/doc/morse/user/sensors/stereo_camera.txt
-share/doc/morse/user/sensors/thermometer.txt
-share/doc/morse/user/summary.txt
-share/doc/morse/user/supported_middlewares.txt
-share/doc/morse/user/tips/bounding_boxes.txt
-share/doc/morse/user/tutorial.txt
-share/doc/morse/user/user_workflow.txt
-share/doc/user_guide.tex
+share/examples/morse/scenarii/ROS_tutorial1_navstack_5.blend
+share/examples/morse/scenarii/ROS_tutorial1_solved.blend
share/examples/morse/scenarii/action-4-2.54.blend
-share/examples/morse/scenarii/action-4.blend
-share/examples/morse/scenarii/camera_calibration-1.blend
-share/examples/morse/scenarii/grande_salle-1.blend
share/examples/morse/scenarii/grande_salle-2.5-kuka-poster.blend
-share/examples/morse/scenarii/grande_salle-2.55-kuka.blend
-share/examples/morse/scenarii/stereo_test-2.54-1.blend
-share/examples/morse/scenarii/stereo_test.blend
+share/examples/morse/scenarii/indoors_1/hri_laas_1.blend
+share/examples/morse/scenarii/pr2_test.blend
+share/examples/morse/scenarii/rosace-1.blend
share/examples/morse/tutorials/tutorial-1-solved.blend
+share/examples/morse/tutorials/tutorial-1-solved_ROS.blend
share/examples/morse/tutorials/tutorial-1.blend
+${PLIST.doc}share/doc/morse/html/.buildinfo
+${PLIST.doc}share/doc/morse/html/.doctrees/dev/adding_component.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/dev/adding_modifier.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/dev/dev_overview.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/dev/dev_workflow.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/dev/new_middleware.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/dev/services.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/dev/summary.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/environment.pickle
+${PLIST.doc}share/doc/morse/html/.doctrees/morse.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/actuators/destination.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/actuators/keyboard.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/actuators/kuka.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/actuators/orientation.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/actuators/pa_10.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/actuators/platine.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/actuators/v_omega.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/actuators/vx_vy_omega.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/actuators/waypoint.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/advanced_tutorials/equip_robot.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/advanced_tutorials/hri_tutorial.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/advanced_tutorials/yarp_tutorial.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/basic_morse.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/component_library.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/hooks.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/installation.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/middlewares/pocolibs.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/middlewares/ros.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/middlewares/ros/ros_installation.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/middlewares/socket.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/middlewares/text.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/middlewares/yarp.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/modifier_introduction.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/modifiers/ned.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/modifiers/utm.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/others/human.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/robots/atrv.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/robots/jido.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/robots/ressac.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/sensors/accelerometer.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/sensors/camera.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/sensors/gps.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/sensors/gyroscope.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/sensors/human_posture.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/sensors/pantilt.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/sensors/proximity.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/sensors/semantic_camera.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/sensors/sick.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/sensors/stereo_camera.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/sensors/thermometer.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/supported_middlewares.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/tips/bounding_boxes.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/tutorial.doctree
+${PLIST.doc}share/doc/morse/html/.doctrees/user/user_workflow.doctree
+${PLIST.doc}share/doc/morse/html/_images/component_diagram.png
+${PLIST.doc}share/doc/morse/html/_images/gameproperty_object.jpg
+${PLIST.doc}share/doc/morse/html/_images/hri.jpg
+${PLIST.doc}share/doc/morse/html/_images/hri_import_human.jpg
+${PLIST.doc}share/doc/morse/html/_images/hri_pick_object.jpg
+${PLIST.doc}share/doc/morse/html/_images/human_joints.png
+${PLIST.doc}share/doc/morse/html/_images/indoors_sick.jpg
+${PLIST.doc}share/doc/morse/html/_images/morse_interface.jpg
+${PLIST.doc}share/doc/morse/html/_images/morse_robot.jpg
+${PLIST.doc}share/doc/morse/html/_images/morse_uml.png
+${PLIST.doc}share/doc/morse/html/_images/outdoor_example.jpg
+${PLIST.doc}share/doc/morse/html/_images/place_3dcursor.jpg
+${PLIST.doc}share/doc/morse/html/_images/place_cube.jpg
+${PLIST.doc}share/doc/morse/html/_images/rosace.png
+${PLIST.doc}share/doc/morse/html/_images/simu_render_indoors.jpg
+${PLIST.doc}share/doc/morse/html/_images/simulation_main_loop_overview.png
+${PLIST.doc}share/doc/morse/html/_images/stae_logo.png
+${PLIST.doc}share/doc/morse/html/_sources/dev/adding_component.txt
+${PLIST.doc}share/doc/morse/html/_sources/dev/adding_modifier.txt
+${PLIST.doc}share/doc/morse/html/_sources/dev/dev_overview.txt
+${PLIST.doc}share/doc/morse/html/_sources/dev/dev_workflow.txt
+${PLIST.doc}share/doc/morse/html/_sources/dev/new_middleware.txt
+${PLIST.doc}share/doc/morse/html/_sources/dev/services.txt
+${PLIST.doc}share/doc/morse/html/_sources/dev/summary.txt
+${PLIST.doc}share/doc/morse/html/_sources/morse.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/actuators/destination.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/actuators/keyboard.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/actuators/kuka.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/actuators/orientation.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/actuators/pa_10.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/actuators/platine.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/actuators/v_omega.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/actuators/vx_vy_omega.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/actuators/waypoint.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/advanced_tutorials/equip_robot.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/advanced_tutorials/hri_tutorial.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/advanced_tutorials/yarp_tutorial.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/basic_morse.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/component_library.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/hooks.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/installation.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/middlewares/pocolibs.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/middlewares/ros.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/middlewares/ros/ros_installation.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/middlewares/socket.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/middlewares/text.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/middlewares/yarp.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/modifier_introduction.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/modifiers/ned.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/modifiers/utm.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/others/human.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/robots/atrv.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/robots/jido.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/robots/ressac.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/sensors/accelerometer.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/sensors/camera.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/sensors/gps.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/sensors/gyroscope.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/sensors/human_posture.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/sensors/pantilt.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/sensors/proximity.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/sensors/semantic_camera.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/sensors/sick.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/sensors/stereo_camera.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/sensors/thermometer.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/supported_middlewares.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/tips/bounding_boxes.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/tutorial.txt
+${PLIST.doc}share/doc/morse/html/_sources/user/user_workflow.txt
+${PLIST.doc}share/doc/morse/html/_static/Aller.ttf
+${PLIST.doc}share/doc/morse/html/_static/basic.css
+${PLIST.doc}share/doc/morse/html/_static/default.css
+${PLIST.doc}share/doc/morse/html/_static/doctools.js
+${PLIST.doc}share/doc/morse/html/_static/file.png
+${PLIST.doc}share/doc/morse/html/_static/jquery.js
+${PLIST.doc}share/doc/morse/html/_static/minus.png
+${PLIST.doc}share/doc/morse/html/_static/morse-logo.png
+${PLIST.doc}share/doc/morse/html/_static/plus.png
+${PLIST.doc}share/doc/morse/html/_static/pygments.css
+${PLIST.doc}share/doc/morse/html/_static/searchtools.js
+${PLIST.doc}share/doc/morse/html/_static/sphinx-laas.css
+${PLIST.doc}share/doc/morse/html/_static/www.png
+${PLIST.doc}share/doc/morse/html/dev/adding_component.html
+${PLIST.doc}share/doc/morse/html/dev/adding_modifier.html
+${PLIST.doc}share/doc/morse/html/dev/dev_overview.html
+${PLIST.doc}share/doc/morse/html/dev/dev_workflow.html
+${PLIST.doc}share/doc/morse/html/dev/new_middleware.html
+${PLIST.doc}share/doc/morse/html/dev/services.html
+${PLIST.doc}share/doc/morse/html/dev/summary.html
+${PLIST.doc}share/doc/morse/html/genindex.html
+${PLIST.doc}share/doc/morse/html/morse.html
+${PLIST.doc}share/doc/morse/html/objects.inv
+${PLIST.doc}share/doc/morse/html/search.html
+${PLIST.doc}share/doc/morse/html/searchindex.js
+${PLIST.doc}share/doc/morse/html/user/actuators/destination.html
+${PLIST.doc}share/doc/morse/html/user/actuators/keyboard.html
+${PLIST.doc}share/doc/morse/html/user/actuators/kuka.html
+${PLIST.doc}share/doc/morse/html/user/actuators/orientation.html
+${PLIST.doc}share/doc/morse/html/user/actuators/pa_10.html
+${PLIST.doc}share/doc/morse/html/user/actuators/platine.html
+${PLIST.doc}share/doc/morse/html/user/actuators/v_omega.html
+${PLIST.doc}share/doc/morse/html/user/actuators/vx_vy_omega.html
+${PLIST.doc}share/doc/morse/html/user/actuators/waypoint.html
+${PLIST.doc}share/doc/morse/html/user/advanced_tutorials/equip_robot.html
+${PLIST.doc}share/doc/morse/html/user/advanced_tutorials/hri_tutorial.html
+${PLIST.doc}share/doc/morse/html/user/advanced_tutorials/yarp_tutorial.html
+${PLIST.doc}share/doc/morse/html/user/basic_morse.html
+${PLIST.doc}share/doc/morse/html/user/component_library.html
+${PLIST.doc}share/doc/morse/html/user/hooks.html
+${PLIST.doc}share/doc/morse/html/user/installation.html
+${PLIST.doc}share/doc/morse/html/user/middlewares/pocolibs.html
+${PLIST.doc}share/doc/morse/html/user/middlewares/ros.html
+${PLIST.doc}share/doc/morse/html/user/middlewares/ros/ros_installation.html
+${PLIST.doc}share/doc/morse/html/user/middlewares/socket.html
+${PLIST.doc}share/doc/morse/html/user/middlewares/text.html
+${PLIST.doc}share/doc/morse/html/user/middlewares/yarp.html
+${PLIST.doc}share/doc/morse/html/user/modifier_introduction.html
+${PLIST.doc}share/doc/morse/html/user/modifiers/ned.html
+${PLIST.doc}share/doc/morse/html/user/modifiers/utm.html
+${PLIST.doc}share/doc/morse/html/user/others/human.html
+${PLIST.doc}share/doc/morse/html/user/robots/atrv.html
+${PLIST.doc}share/doc/morse/html/user/robots/jido.html
+${PLIST.doc}share/doc/morse/html/user/robots/ressac.html
+${PLIST.doc}share/doc/morse/html/user/sensors/accelerometer.html
+${PLIST.doc}share/doc/morse/html/user/sensors/camera.html
+${PLIST.doc}share/doc/morse/html/user/sensors/gps.html
+${PLIST.doc}share/doc/morse/html/user/sensors/gyroscope.html
+${PLIST.doc}share/doc/morse/html/user/sensors/human_posture.html
+${PLIST.doc}share/doc/morse/html/user/sensors/pantilt.html
+${PLIST.doc}share/doc/morse/html/user/sensors/proximity.html
+${PLIST.doc}share/doc/morse/html/user/sensors/semantic_camera.html
+${PLIST.doc}share/doc/morse/html/user/sensors/sick.html
+${PLIST.doc}share/doc/morse/html/user/sensors/stereo_camera.html
+${PLIST.doc}share/doc/morse/html/user/sensors/thermometer.html
+${PLIST.doc}share/doc/morse/html/user/supported_middlewares.html
+${PLIST.doc}share/doc/morse/html/user/tips/bounding_boxes.html
+${PLIST.doc}share/doc/morse/html/user/tutorial.html
+${PLIST.doc}share/doc/morse/html/user/user_workflow.html
+${PLIST.doc}share/examples/morse/scenarii/ROS_tutorial1_navstack_4.blend
diff --git a/morse/depend.mk b/morse/depend.mk
index c988cd2a8a5004272df50749a85cce47934a0ea0..dd6065e901d4011cbab0e2271c72b22862b13d69 100644
--- a/morse/depend.mk
+++ b/morse/depend.mk
@@ -1,20 +1,5 @@
-#
-# Copyright (c) 2010 LAAS/CNRS
-# All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software for any purpose
-# with or without fee is hereby granted, provided that the above copyright
-# notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-#
-# Severin Lemaignan on Fri May 28 2010
+# robotpkg depend.mk for: simulation/morse
+# Created: Séverin Lemaignan on Fri, 28 May 2010
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
@@ -24,12 +9,12 @@ ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= morse
endif
-ifeq (+,$(MORSE_DEPEND_MK)) # ---------------------------------------------
+ifeq (+,$(MORSE_DEPEND_MK)) # ----------------------------------------------
PREFER.morse?= robotpkg
SYSTEM_SEARCH.morse=\
- bin/morse \
+ 'bin/morse:1s/[^0-9.]//gp:% --version' \
share/data/morse/morse_default.blend
DEPEND_USE+= morse
@@ -37,6 +22,6 @@ DEPEND_USE+= morse
DEPEND_ABI.morse?= morse>=0.2
DEPEND_DIR.morse?= ../../wip/morse
-endif # MORSE_DEPEND_MK ---------------------------------------------------
+endif # MORSE_DEPEND_MK ----------------------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/morse/distinfo b/morse/distinfo
index f65b8842bf689930332850ba4ea253990905e799..d5d5211d1fb25bfcfbec3405211e42fdd8f29a55 100644
--- a/morse/distinfo
+++ b/morse/distinfo
@@ -1,3 +1,3 @@
-SHA1 (morse-0.2.1.tar.gz) = 31032a3e4a86a6b2d828583c30384b158dfb8611
-RMD160 (morse-0.2.1.tar.gz) = d904699702e097cdabfdfc2197045f62d031df2d
-Size (morse-0.2.1.tar.gz) = 34101962 bytes
+SHA1 (morse-0.3a2.tar.gz) = 94a19094b238a3e5b708fa462b9844bc1ca8975d
+RMD160 (morse-0.3a2.tar.gz) = 2005f4d9dcd5c87dc9e7e592c2e15101e92f1f27
+Size (morse-0.3a2.tar.gz) = 57312603 bytes