r44739 - in /packages/morse: ./ trunk/ trunk/debian/ trunk/debian/patches/ trunk/debian/source/
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Thu Apr 26 21:40:51 UTC 2012
Author: sylvestre
Date: Thu Apr 26 21:40:50 2012
New Revision: 44739
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44739
Log:
initial import of morse simulator
Added:
packages/morse/
packages/morse/trunk/
packages/morse/trunk/debian/
packages/morse/trunk/debian/changelog
packages/morse/trunk/debian/compat
packages/morse/trunk/debian/control
packages/morse/trunk/debian/copyright
packages/morse/trunk/debian/docs
packages/morse/trunk/debian/morse-simulator-data.install
packages/morse/trunk/debian/morse-simulator-doc.install
packages/morse/trunk/debian/morse-simulator.install
packages/morse/trunk/debian/morse-simulator.manpages
packages/morse/trunk/debian/patches/
packages/morse/trunk/debian/patches/series
packages/morse/trunk/debian/patches/support_blender_262.patch
packages/morse/trunk/debian/rules (with props)
packages/morse/trunk/debian/source/
packages/morse/trunk/debian/source/format
packages/morse/trunk/debian/watch
Added: packages/morse/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/changelog?rev=44739&op=file
==============================================================================
--- packages/morse/trunk/debian/changelog (added)
+++ packages/morse/trunk/debian/changelog Thu Apr 26 21:40:50 2012
@@ -1,0 +1,5 @@
+morse-simulator (0.5.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #670577)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 26 Apr 2012 21:37:50 +0200
Added: packages/morse/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/compat?rev=44739&op=file
==============================================================================
--- packages/morse/trunk/debian/compat (added)
+++ packages/morse/trunk/debian/compat Thu Apr 26 21:40:50 2012
@@ -1,0 +1,1 @@
+8
Added: packages/morse/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/control?rev=44739&op=file
==============================================================================
--- packages/morse/trunk/debian/control (added)
+++ packages/morse/trunk/debian/control Thu Apr 26 21:40:50 2012
@@ -1,0 +1,91 @@
+Source: morse-simulator
+Section: science
+Priority: extra
+Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Sylvestre Ledru <sylvestre at debian.org>, Séverin Lemaignan <severin at guakamole.org>
+Build-Depends: debhelper (>= 8.0.0), cmake, python3.2, python3.2-dev, python3-sphinx
+Standards-Version: 3.9.3
+Homepage: http://morse.openrobots.org/
+Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/morse/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/morse/trunk/
+
+
+Package: morse-simulator
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, blender (>= 2.59),
+ ${python:Depends}, morse-simulator-data
+Recommends: morse-simulator-doc
+Conflicts: morse
+Description: Multi-OpenRobot Simulation Engine
+ List of morse features:
+ * 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 license.
+
+Package: morse-simulator-data
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Multi-OpenRobot Simulation Engine
+ List of morse features:
+ * 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 license.
+ .
+ This package contains morse data.
+
+Package: morse-simulator-doc
+Section: doc
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Multi-OpenRobot Simulation Engine - Documentation
+ List of morse features:
+ * 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 license.
+ .
+ This package contains the documentation.
Added: packages/morse/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/copyright?rev=44739&op=file
==============================================================================
--- packages/morse/trunk/debian/copyright (added)
+++ packages/morse/trunk/debian/copyright Thu Apr 26 21:40:50 2012
@@ -1,0 +1,274 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Morse
+Upstream-Contact: morse-users at laas.fr
+Source: http://www.openrobots.org/wiki/morse/
+Disclaimer: Autogenerated by CDBS
+
+Files: ./addons/io_export_morse_scene.py
+ ./addons/io_import_morse_path.py
+ ./addons/io_import_morse_text.py
+ ./addons/morse_object_utils.py
+ ./bindings/pymorse/pymorse-testing.py
+ ./bindings/pymorse/pymorse.py
+ ./bindings/pymorse/setup.py
+ ./src/morse/sensors/semantic_camera.py
+ ./data/morse_default.py
+ ./doc/exts/vimeo.py
+ ./examples/clients/arm/pocolibs_lwr_client.cpp
+ ./examples/clients/arm/yarp_pa10_client.py
+ ./examples/clients/atrv/Rosace_Client.py
+ ./examples/clients/atrv/agv_motion-1.0.cpp
+ ./examples/clients/atrv/atrv_destination-1.0.cpp
+ ./examples/clients/atrv/pocolibs_movement_client.cpp
+ ./examples/clients/atrv/pocolibs_platine_client.cpp
+ ./examples/clients/atrv/ros_v_omega_client.sh
+ ./examples/clients/atrv/socket_v_omega_client.py
+ ./examples/clients/atrv/socket_waypoint_client.py
+ ./examples/clients/playerRessac/playerRessac.cpp
+ ./examples/clients/ressac/compile.sh
+ ./examples/clients/ressac/ressac_client.cpp
+ ./examples/clients/scene/Scene_Client.py
+ ./examples/clients/scene/scene_init-2.0.cpp
+ ./examples/scenarii/action-1.py
+ ./examples/scenarii/ros_example.py
+ ./examples/scenarii/ros_example_multi.py
+ ./examples/scenarii/ros_example_pr2.py
+ ./examples/scenarii/rosace-1.py
+ ./examples/scenarii/test-1.py
+ ./examples/tutorials/multinode/dala_simple.py
+ ./examples/tutorials/multinode/tutorial-hla.py
+ ./examples/tutorials/multinode/tutorial-socket.py
+ ./examples/tutorials/tutorial-1-ros_navigation.py
+ ./examples/tutorials/tutorial-1-sockets.py
+ ./examples/tutorials/tutorial-2-yarp.py
+ ./src/morse/actuators/armature_actuator.py
+ ./src/morse/actuators/destination.py
+ ./src/morse/actuators/gripper.py
+ ./src/morse/actuators/keyboard.py
+ ./src/morse/actuators/kuka_lwr.py
+ ./src/morse/actuators/light.py
+ ./src/morse/actuators/orientation.py
+ ./src/morse/actuators/pa_10.py
+ ./src/morse/actuators/ptu.py
+ ./src/morse/actuators/steer_force.py
+ ./src/morse/actuators/v_omega.py
+ ./src/morse/actuators/waypoint.py
+ ./src/morse/actuators/xy_omega.py
+ ./src/morse/blender/billboard.py
+ ./src/morse/blender/calling.py
+ ./src/morse/blender/hud_text.py
+ ./src/morse/blender/human_interaction/camera.py
+ ./src/morse/blender/human_interaction/carriing_pose.py
+ ./src/morse/blender/human_interaction/head.py
+ ./src/morse/blender/human_interaction/human_control.py
+ ./src/morse/blender/human_interaction/interaction.py
+ ./src/morse/blender/human_interaction/limit_hand_control.py
+ ./src/morse/blender/human_interaction/show_objects.py
+ ./src/morse/blender/lights.py
+ ./src/morse/blender/main.py
+ ./src/morse/blender/view_camera.py
+ ./src/morse/builder/__init__.py
+ ./src/morse/builder/abstractcomponent.py
+ ./src/morse/builder/actuators.py
+ ./src/morse/builder/blenderobjects.py
+ ./src/morse/builder/creator.py
+ ./src/morse/builder/data.py
+ ./src/morse/builder/extensions/pr2extension.py
+ ./src/morse/builder/morsebuilder.py
+ ./src/morse/builder/robots.py
+ ./src/morse/builder/sensors.py
+ ./src/morse/core/abstractobject.py
+ ./src/morse/core/actuator.py
+ ./src/morse/core/exceptions.py
+ ./src/morse/core/logging.py
+ ./src/morse/core/middleware.py
+ ./src/morse/core/modifier.py
+ ./src/morse/core/multinode.py
+ ./src/morse/core/object.py
+ ./src/morse/core/overlay.py
+ ./src/morse/core/request_manager.py
+ ./src/morse/core/robot.py
+ ./src/morse/core/sensor.py
+ ./src/morse/core/services.py
+ ./src/morse/core/status.py
+ ./src/morse/geolandloader/geoDTMLoader.py
+ ./src/morse/geolandloader/geoDataLoaderPanel.py
+ ./src/morse/geolandloader/geoLandPlugin.py
+ ./src/morse/geolandloader/geoShapefileLoader.py
+ ./src/morse/helpers/colors.py
+ ./src/morse/helpers/math.py
+ ./src/morse/helpers/motion.py
+ ./src/morse/helpers/passive_objects.py
+ ./src/morse/helpers/transformation.py
+ ./src/morse/middleware/moos/__init__.py
+ ./src/morse/middleware/moos/gps.py
+ ./src/morse/middleware/moos/gyroscope.py
+ ./src/morse/middleware/moos/imu.py
+ ./src/morse/middleware/moos/pose.py
+ ./src/morse/middleware/moos/sick.py
+ ./src/morse/middleware/moos_mw.py
+ ./src/morse/middleware/pocolibs/actuators/Genpos_Poster/ors_genpos_poster.c
+ ./src/morse/middleware/pocolibs/actuators/Genpos_Poster/ors_genpos_poster.h
+ ./src/morse/middleware/pocolibs/actuators/Lwr_Poster/ors_lwr_poster.c
+ ./src/morse/middleware/pocolibs/actuators/Lwr_Poster/ors_lwr_poster.h
+ ./src/morse/middleware/pocolibs/actuators/Platine_Poster/ors_platine_poster.c
+ ./src/morse/middleware/pocolibs/actuators/Platine_Poster/ors_platine_poster.h
+ ./src/morse/middleware/pocolibs/actuators/PosterHandler.h
+ ./src/morse/middleware/pocolibs/actuators/genpos.py
+ ./src/morse/middleware/pocolibs/actuators/lwr.py
+ ./src/morse/middleware/pocolibs/actuators/platine.py
+ ./src/morse/middleware/pocolibs/sensors/General_Poster/ors_poster.c
+ ./src/morse/middleware/pocolibs/sensors/General_Poster/ors_poster.h
+ ./src/morse/middleware/pocolibs/sensors/Human_posture_Poster/ors_human_posture_poster.c
+ ./src/morse/middleware/pocolibs/sensors/Human_posture_Poster/ors_human_posture_poster.h
+ ./src/morse/middleware/pocolibs/sensors/Platine_posture_Poster/ors_platine_posture_poster.c
+ ./src/morse/middleware/pocolibs/sensors/Platine_posture_Poster/ors_platine_posture_poster.h
+ ./src/morse/middleware/pocolibs/sensors/Pom_Poster/ors_pom_poster.c
+ ./src/morse/middleware/pocolibs/sensors/Pom_Poster/ors_pom_poster.h
+ ./src/morse/middleware/pocolibs/sensors/Sick_Poster/ors_sick_poster.c
+ ./src/morse/middleware/pocolibs/sensors/Sick_Poster/ors_sick_poster.h
+ ./src/morse/middleware/pocolibs/sensors/Target_Poster/ors_target_poster.c
+ ./src/morse/middleware/pocolibs/sensors/Target_Poster/ors_target_poster.h
+ ./src/morse/middleware/pocolibs/sensors/Velodyne_Poster/ors_velodyne_poster.c
+ ./src/morse/middleware/pocolibs/sensors/Velodyne_Poster/ors_velodyne_poster.h
+ ./src/morse/middleware/pocolibs/sensors/Viam_Poster/ors_viam_poster.c
+ ./src/morse/middleware/pocolibs/sensors/Viam_Poster/ors_viam_poster.h
+ ./src/morse/middleware/pocolibs/sensors/Viman_Poster/ors_viman_poster.c
+ ./src/morse/middleware/pocolibs/sensors/Viman_Poster/ors_viman_poster.h
+ ./src/morse/middleware/pocolibs/sensors/human_posture.py
+ ./src/morse/middleware/pocolibs/sensors/platine_posture.py
+ ./src/morse/middleware/pocolibs/sensors/pom.py
+ ./src/morse/middleware/pocolibs/sensors/target.py
+ ./src/morse/middleware/pocolibs/sensors/velodyne.py
+ ./src/morse/middleware/pocolibs/sensors/viam.py
+ ./src/morse/middleware/pocolibs/sensors/viman.py
+ ./src/morse/middleware/pocolibs_mw.py
+ ./src/morse/middleware/pocolibs_request_manager.py
+ ./src/morse/middleware/ros/__init__.py
+ ./src/morse/middleware/ros/accelerometer.py
+ ./src/morse/middleware/ros/battery.py
+ ./src/morse/middleware/ros/camera.py
+ ./src/morse/middleware/ros/clock.py
+ ./src/morse/middleware/ros/gps.py
+ ./src/morse/middleware/ros/imu.py
+ ./src/morse/middleware/ros/infrared.py
+ ./src/morse/middleware/ros/jido_posture.py
+ ./src/morse/middleware/ros/kuka_jointState.py
+ ./src/morse/middleware/ros/light.py
+ ./src/morse/middleware/ros/odometry_sensor.py
+ ./src/morse/middleware/ros/overlays/actuator.py
+ ./src/morse/middleware/ros/overlays/pr2.py
+ ./src/morse/middleware/ros/platine.py
+ ./src/morse/middleware/ros/pose.py
+ ./src/morse/middleware/ros/pr2_posture.py
+ ./src/morse/middleware/ros/ptu_posture.py
+ ./src/morse/middleware/ros/read_vw_twist.py
+ ./src/morse/middleware/ros/read_xyw_twist.py
+ ./src/morse/middleware/ros/semantic_camera.py
+ ./src/morse/middleware/ros/sick.py
+ ./src/morse/middleware/ros/waypoint2D.py
+ ./src/morse/middleware/ros_mw.py
+ ./src/morse/middleware/ros_request_manager.py
+ ./src/morse/middleware/socket_mw.py
+ ./src/morse/middleware/socket_request_manager.py
+ ./src/morse/middleware/sockets/semantic_camera.py
+ ./src/morse/middleware/text_mw.py
+ ./src/morse/middleware/yarp/dictionary.py
+ ./src/morse/middleware/yarp/json_mod.py
+ ./src/morse/middleware/yarp/sick.py
+ ./src/morse/middleware/yarp_json_request_manager.py
+ ./src/morse/middleware/yarp_mw.py
+ ./src/morse/middleware/yarp_request_manager.py
+ ./src/morse/modifiers/gaussian.c
+ ./src/morse/modifiers/gps_noise.py
+ ./src/morse/modifiers/ned.py
+ ./src/morse/modifiers/utm.py
+ ./src/morse/multinode/hla.py
+ ./src/morse/multinode/socket.py
+ ./src/morse/robots/atrv.py
+ ./src/morse/robots/daurade.py
+ ./src/morse/robots/environment.py
+ ./src/morse/robots/human.py
+ ./src/morse/robots/hummer.py
+ ./src/morse/robots/jido.py
+ ./src/morse/robots/pr2.py
+ ./src/morse/robots/ressac.py
+ ./src/morse/robots/victim.py
+ ./src/morse/sensors/accelerometer.py
+ ./src/morse/sensors/battery.py
+ ./src/morse/sensors/camera.py
+ ./src/morse/sensors/gps.py
+ ./src/morse/sensors/gyroscope.py
+ ./src/morse/sensors/human_posture.py
+ ./src/morse/sensors/imu.py
+ ./src/morse/sensors/jido_posture.py
+ ./src/morse/sensors/kuka_posture.py
+ ./src/morse/sensors/odometry.py
+ ./src/morse/sensors/pose.py
+ ./src/morse/sensors/pr2_posture.py
+ ./src/morse/sensors/proximity.py
+ ./src/morse/sensors/ptu_posture.py
+ ./src/morse/sensors/rosace.py
+ ./src/morse/sensors/sick.py
+ ./src/morse/sensors/stereo_unit.py
+ ./src/morse/sensors/thermometer.py
+ ./src/morse/sensors/velodyne.py
+ ./src/morse/sensors/video_camera.py
+ ./src/morse/services/communication_services.py
+ ./src/morse/services/supervision_services.py
+ ./src/morse/testing/exceptions.py
+ ./src/morse/testing/testing.py
+ ./testing/base/base_testing.py
+ ./testing/base/kuka_lwr_testing.py
+ ./testing/base/ned_testing.py
+ ./testing/base/odometry_testing.py
+ ./testing/base/pose_testing.py
+ ./testing/base/semantic_camera_testing.py
+ ./testing/base/sick_testing.py
+ ./testing/base/vw_testing.py
+ ./testing/base/waypoint_testing.py
+ ./testing/middlewares/ros/actions.py
+ ./testing/middlewares/ros/data_stream.py
+ ./testing/middlewares/ros/services.py
+ ./testing/middlewares/yarp/yarp_mw_testing.py
+ ./testing/robots/human/human_pose.py
+ ./testing/robots/pr2/jointstate.py
+ ./testing/test_all.py
+ ./tools/io_export_morse.py
+ ./tools/morse_gui.py
+ ./tools/simple_example.py
+ ./tools/wiimote_human_client.py
+Copyright: 2009-2010, LAAS-CNRS / ONERA -- 2011-2012, LAAS-CNRS
+License: BSD 3 clauses
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the LAAS-CNRS, ONERA nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+
+Files: ./examples/scenarii/armature_samples/armature_services_tests.py
+ ./examples/scenarii/armature_samples/pr2_services_tests.py
+Copyright: 2010, Name, peter.roelants at gmail.com, Department of Mechanical
+License: BSD (3 clause)
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the LAAS-CNRS, ONERA nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+Files: ./src/morse/core/ansistrm.py
+Copyright: 2010-2011, Vinay Sajip.
+License: BSD license.
+ FIXME
+
Added: packages/morse/trunk/debian/docs
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/docs?rev=44739&op=file
==============================================================================
--- packages/morse/trunk/debian/docs (added)
+++ packages/morse/trunk/debian/docs Thu Apr 26 21:40:50 2012
@@ -1,0 +1,4 @@
+README
+RELEASE_NOTES
+AUTHORS
+
Added: packages/morse/trunk/debian/morse-simulator-data.install
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/morse-simulator-data.install?rev=44739&op=file
==============================================================================
--- packages/morse/trunk/debian/morse-simulator-data.install (added)
+++ packages/morse/trunk/debian/morse-simulator-data.install Thu Apr 26 21:40:50 2012
@@ -1,0 +1,2 @@
+debian/tmp/usr/share/morse/addons
+debian/tmp/usr/share/morse/data
Added: packages/morse/trunk/debian/morse-simulator-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/morse-simulator-doc.install?rev=44739&op=file
==============================================================================
--- packages/morse/trunk/debian/morse-simulator-doc.install (added)
+++ packages/morse/trunk/debian/morse-simulator-doc.install Thu Apr 26 21:40:50 2012
@@ -1,0 +1,2 @@
+*/doc/html/ usr/share/doc/morse/
+examples/ usr/share/morse/
Added: packages/morse/trunk/debian/morse-simulator.install
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/morse-simulator.install?rev=44739&op=file
==============================================================================
--- packages/morse/trunk/debian/morse-simulator.install (added)
+++ packages/morse/trunk/debian/morse-simulator.install Thu Apr 26 21:40:50 2012
@@ -1,0 +1,2 @@
+debian/tmp/usr/bin/
+debian/tmp/usr/lib
Added: packages/morse/trunk/debian/morse-simulator.manpages
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/morse-simulator.manpages?rev=44739&op=file
==============================================================================
--- packages/morse/trunk/debian/morse-simulator.manpages (added)
+++ packages/morse/trunk/debian/morse-simulator.manpages Thu Apr 26 21:40:50 2012
@@ -1,0 +1,1 @@
+debian/tmp/usr/share/man/man1/*.1.gz
Added: packages/morse/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/patches/series?rev=44739&op=file
==============================================================================
--- packages/morse/trunk/debian/patches/series (added)
+++ packages/morse/trunk/debian/patches/series Thu Apr 26 21:40:50 2012
@@ -1,0 +1,1 @@
+support_blender_262.patch
Added: packages/morse/trunk/debian/patches/support_blender_262.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/patches/support_blender_262.patch?rev=44739&op=file
==============================================================================
--- packages/morse/trunk/debian/patches/support_blender_262.patch (added)
+++ packages/morse/trunk/debian/patches/support_blender_262.patch Thu Apr 26 21:40:50 2012
@@ -1,0 +1,219 @@
+diff --git a/bin/morse.in b/bin/morse.in
+index aa0e006..eb04ca7 100755
+--- a/bin/morse.in
++++ b/bin/morse.in
+@@ -34,7 +34,7 @@ STRICT_MAX_PYTHON_VERSION = "4.0"
+ #Blender version must be egal or bigger than...
+ MIN_BLENDER_VERSION = "2.59"
+ #Blender version must be smaller than...
+-STRICT_MAX_BLENDER_VERSION = "2.62"
++STRICT_MAX_BLENDER_VERSION = "2.63"
+
+ #Unix-style path to the MORSE default scene, within the prefix
+ DEFAULT_SCENE_PATH = "share/morse/data/morse_default.blend"
+diff --git a/src/morse/builder/abstractcomponent.py b/src/morse/builder/abstractcomponent.py
+index 32069f6..e1cc4cd 100644
+--- a/src/morse/builder/abstractcomponent.py
++++ b/src/morse/builder/abstractcomponent.py
+@@ -147,7 +147,11 @@ class AbstractComponent(object):
+ optional, auto-detect, default=None)
+ """
+ bpy.ops.object.select_all(action = 'DESELECT')
+- bpy.ops.object.select_name(name = self.name)
++ #bpy.ops.object.select_pattern(pattern = self.name, extend=False)
++ #bpy.ops.object.select_name(name = self.name)
++ blend_obj = bpy.data.objects[self.name]
++ blend_obj.select = True
++ bpy.context.scene.objects.active = blend_obj
+ bpy.ops.object.game_property_new()
+ prop = self._blendobj.game.properties
+ # select the last property in the list (which is the one we just added)
+diff --git a/src/morse/builder/morsebuilder.py b/src/morse/builder/morsebuilder.py
+index 613b967..3e1b430 100644
+--- a/src/morse/builder/morsebuilder.py
++++ b/src/morse/builder/morsebuilder.py
+@@ -379,7 +379,9 @@ class Environment(AbstractComponent):
+ camera_fp.rotation_euler = self._camera_rotation
+ # Make CameraFP the active camera
+ bpy.ops.object.select_all(action = 'DESELECT')
+- bpy.ops.object.select_name(name = 'CameraFP')
++ camera_fp.select = True
++ bpy.context.scene.objects.active = camera_fp
++ bpy.context.scene.camera = camera_fp
+ self._created = True
+
+ def show_debug_properties(self, value=True):
+diff --git a/src/morse/helpers/math.py b/src/morse/helpers/math.py
+index 5aacf9f..aa2441c 100644
+--- a/src/morse/helpers/math.py
++++ b/src/morse/helpers/math.py
+@@ -32,13 +32,6 @@ def invert_rotation_matrix(object):
+ this one. """
+ rotation_matrix = get_rotation_matrix(object)
+
+- # TEMPORARY solution for Blender 2.56
+- # Should be deprecated soon
+- import bpy
+- if bpy.app.version[1] <= 56:
+- inverted_matrix = mathutils.Matrix(rotation_matrix[0], rotation_matrix[1], rotation_matrix[2])
+- return inverted_matrix.invert()
+-
+ # Return a new inverted matrix (requires Blender 2.58)
+ return rotation_matrix.inverted()
+
+diff --git a/src/morse/helpers/transformation.py b/src/morse/helpers/transformation.py
+index 5608bb9..d5f09ca 100644
+--- a/src/morse/helpers/transformation.py
++++ b/src/morse/helpers/transformation.py
+@@ -24,17 +24,10 @@ class Transformation3d:
+ reference
+
+ """
+- if GameLogic.blenderVersion <= (2,56,0):
+- #if GameLogic.pythonVersion <= (3,1,0):
+- self.matrix = mathutils.Matrix([1, 0, 0, 0], \
+- [0, 1, 0, 0], \
+- [0, 0, 1, 0], \
+- [0, 0, 0, 1])
+- else:
+- self.matrix = mathutils.Matrix(([1, 0, 0, 0], \
+- [0, 1, 0, 0], \
+- [0, 0, 1, 0], \
+- [0, 0, 0, 1]))
++ self.matrix = mathutils.Matrix(([1, 0, 0, 0], \
++ [0, 1, 0, 0], \
++ [0, 0, 1, 0], \
++ [0, 0, 0, 1]))
+
+ self.euler = mathutils.Euler([0, 0, 0])
+ if obj != None:
+@@ -45,21 +38,30 @@ class Transformation3d:
+ """
+ Return the translation against the x axle
+ """
+- return self.matrix[3][0]
++ if GameLogic.blenderVersion <= (2,62,0):
++ return self.matrix[3][0]
++ else:
++ return self.matrix[0][3]
+
+ @property
+ def y(self):
+ """
+ Return the translation against the y axle
+ """
+- return self.matrix[3][1]
++ if GameLogic.blenderVersion <= (2,62,0):
++ return self.matrix[3][1]
++ else:
++ return self.matrix[1][3]
+
+ @property
+ def z(self):
+ """
+ Return the translation against the z axle
+ """
+- return self.matrix[3][2]
++ if GameLogic.blenderVersion <= (2,62,0):
++ return self.matrix[3][2]
++ else:
++ return self.matrix[2][3]
+
+ @property
+ def yaw(self):
+diff --git a/src/morse/sensors/camera.py b/src/morse/sensors/camera.py
+index 05054ad..6802bb7 100644
+--- a/src/morse/sensors/camera.py
++++ b/src/morse/sensors/camera.py
+@@ -104,25 +104,29 @@ class CameraClass(morse.core.sensor.MorseSensorClass):
+ GameLogic.cameras = {}
+
+ mat_id = VideoTexture.materialID(screen, material_name)
+- GameLogic.cameras[self.name()] = VideoTexture.Texture(screen, mat_id)
+- GameLogic.cameras[self.name()].source = \
+- VideoTexture.ImageRender(scene, camera)
++ vt_camera = VideoTexture.Texture(screen, mat_id)
++ vt_camera.source = VideoTexture.ImageRender(scene, camera)
+
+ # Set the focal length of the camera using the Game Logic Property
+ camera.lens = self.image_focal
++ logger.info("\tFocal length of the camera is: %s" % camera.lens)
+
+ # Set the background to be used for the render
+- GameLogic.cameras[self.name()].source.background = self.bg_color
++ vt_camera.source.background = self.bg_color
+ # Define an image size. It must be powers of two. Default 512 * 512
+- GameLogic.cameras[self.name()].source.capsize = \
+- [self.image_width, self.image_height]
+- logger.info("Camera '{0}': Exporting an image of capsize: {1} pixels". \
+- format(self.name(), GameLogic.cameras[self.name()].source.capsize))
+- logger.info("\tFocal length of the camera is: %s" % camera.lens)
++ vt_camera.source.capsize = [self.image_width, self.image_height]
++ logger.info("Camera '%s': Exporting an image of capsize: %s pixels" % \
++ (self.name(), vt_camera.source.capsize))
+
+ # Reverse the image (boolean game-property)
+ # cf. GameLogic.video.source.flip (VideoTexture.ImageRender)
+ # http://wiki.blender.org/index.php/Dev:Source/GameEngine/2.49/VideoTexture#Setup_the_source
+ if 'Vertical_Flip' in self.blender_obj: # backward compatibility
+- GameLogic.cameras[self.name()].source.flip = self.blender_obj['Vertical_Flip']
+-
++ vt_camera.source.flip = self.blender_obj['Vertical_Flip']
++
++ GameLogic.cameras[self.name()] = vt_camera
++#
++# import inspect
++# logger.error("CAMERA SOURCE '%s':" % self.name())
++# for name, thing in inspect.getmembers(GameLogic.cameras[self.name()].source):
++# logger.error("\t%s = %s" % (name, thing))
+diff --git a/src/morse/sensors/sick.py b/src/morse/sensors/sick.py
+index 7f3d3f8..56b6e73 100644
+--- a/src/morse/sensors/sick.py
++++ b/src/morse/sensors/sick.py
+@@ -134,10 +134,7 @@ class SICKClass(morse.core.sensor.MorseSensorClass):
+
+ # Multiply the resulting point by the inverse
+ # of the sensor rotation matrix
+- if GameLogic.blenderVersion < (2,59,0):
+- arc_point = vector_point * inverted_matrix
+- else:
+- arc_point = inverted_matrix * vector_point
++ arc_point = inverted_matrix * vector_point
+ logger.debug("\t\tARC POINT: [%.4f, %.4f, %.4f]" % (arc_point[0], arc_point[1], arc_point[2]))
+
+ # Do not move the point if the ray intersection
+diff --git a/src/morse/sensors/velodyne.py b/src/morse/sensors/velodyne.py
+index 11526ed..b6771d7 100644
+--- a/src/morse/sensors/velodyne.py
++++ b/src/morse/sensors/velodyne.py
+@@ -137,10 +137,7 @@ class VelodyneClass(morse.core.sensor.MorseSensorClass):
+
+ # Multiply the resulting point by the inverse
+ # of the sensor rotation matrix
+- if GameLogic.blenderVersion < (2,59,0):
+- arc_point = vector_point * robot_inverted_matrix
+- else:
+- arc_point = robot_inverted_matrix * vector_point
++ arc_point = robot_inverted_matrix * vector_point
+ logger.debug("\t\tARC POINT: [%.4f, %.4f, %.4f]" % (arc_point[0], arc_point[1], arc_point[2]))
+
+ # Do not move the point if the ray intersection
+diff --git a/src/morse/sensors/video_camera.py b/src/morse/sensors/video_camera.py
+index 9e88ddf..4ada1b8 100644
+--- a/src/morse/sensors/video_camera.py
++++ b/src/morse/sensors/video_camera.py
+@@ -34,8 +34,12 @@ class VideoCameraClass(morse.sensors.camera.CameraClass):
+ self.image_focal / BLENDER_HORIZONTAL_APERTURE
+ intrinsic[0][0] = alpha_u
+ intrinsic[1][1] = alpha_u
+- intrinsic[2][0] = self.image_width / 2.0
+- intrinsic[2][1] = self.image_height / 2.0
++ if GameLogic.blenderVersion <= (2,62,0):
++ intrinsic[2][0] = self.image_width / 2.0
++ intrinsic[2][1] = self.image_height / 2.0
++ else:
++ intrinsic[0][2] = self.image_width / 2.0
++ intrinsic[1][2] = self.image_height / 2.0
+ self.local_data['intrinsic_matrix'] = intrinsic
+
+ self.capturing = False
Added: packages/morse/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/rules?rev=44739&op=file
==============================================================================
--- packages/morse/trunk/debian/rules (added)
+++ packages/morse/trunk/debian/rules Thu Apr 26 21:40:50 2012
@@ -1,0 +1,13 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh $@
Propchange: packages/morse/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: packages/morse/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/source/format?rev=44739&op=file
==============================================================================
--- packages/morse/trunk/debian/source/format (added)
+++ packages/morse/trunk/debian/source/format Thu Apr 26 21:40:50 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)
Added: packages/morse/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/watch?rev=44739&op=file
==============================================================================
--- packages/morse/trunk/debian/watch (added)
+++ packages/morse/trunk/debian/watch Thu Apr 26 21:40:50 2012
@@ -1,0 +1,3 @@
+version=3
+opts=filenamemangle=s/.+\/tarball\/(.+)$/morse_$1.orig.tar.gz/ \
+https://github.com/laas/morse/tags .*/tarball/(\d[\d\.]+)
More information about the debian-science-commits
mailing list