[Jderobot-admin] jderobot-r1140 - in trunk/src/stable/components/gazeboserver/plugins: kinect kinect/worlds nao nao/worlds pioneer pioneer/worlds
rocapal en jderobot.org
rocapal en jderobot.org
Vie Ene 10 11:43:08 CET 2014
Author: rocapal
Date: 2014-01-10 11:43:07 +0100 (Fri, 10 Jan 2014)
New Revision: 1140
Added:
trunk/src/stable/components/gazeboserver/plugins/kinect/worlds/
trunk/src/stable/components/gazeboserver/plugins/kinect/worlds/kinect.world
trunk/src/stable/components/gazeboserver/plugins/nao/worlds/
trunk/src/stable/components/gazeboserver/plugins/nao/worlds/naoworld.world
trunk/src/stable/components/gazeboserver/plugins/pioneer/worlds/pioneer2dxJde-2.world
Removed:
trunk/src/stable/components/gazeboserver/plugins/kinect/kinect.world
trunk/src/stable/components/gazeboserver/plugins/nao/naoworld.world
trunk/src/stable/components/gazeboserver/plugins/pioneer/pioneer2dxJde.world
Log:
#74 regroup world files
Deleted: trunk/src/stable/components/gazeboserver/plugins/kinect/kinect.world
===================================================================
--- trunk/src/stable/components/gazeboserver/plugins/kinect/kinect.world 2014-01-10 10:14:34 UTC (rev 1139)
+++ trunk/src/stable/components/gazeboserver/plugins/kinect/kinect.world 2014-01-10 10:43:07 UTC (rev 1140)
@@ -1,49 +0,0 @@
-<?xml version ='1.0'?>
-<gazebo version ='1.0'>
-<world name='default'>
- <include>
- <uri>model://ground_plane</uri>
- </include>
-
- <model name='kinect_model'>
- <static>true</static>
- <link name="kinect">
- <inertial>
- <mass>0.30</mass>
- </inertial>
- <pose>-1.0 0 0.62 0 0 3.14</pose>
- <visual name="visual">
- <pose>0 0 0.04 0 0 0</pose>
- <geometry>
- <mesh>
- <uri>model://kinect/meshes/kinect.dae</uri>
- </mesh>
- </geometry>
- </visual>
- <sensor name="kinect" type="depth">
- <update_rate>5</update_rate>
- <camera>
- <horizontal_fov>1.047198</horizontal_fov>
- <image>
- <width>640</width>
- <height>480</height>
- <format>R8G8B8</format>
- </image>
- <clip>
- <near>0.05</near>
- <far>3</far>
- </clip>
- </camera>
-
- <plugin name='depth_camera_plugin' filename='libkinectPlugin.so'>
- </plugin>
- </sensor>
- </link>
- </model>
- <include>
- <uri>model://sun</uri>
- </include>
-
-
-</world>
-</gazebo>
Copied: trunk/src/stable/components/gazeboserver/plugins/kinect/worlds/kinect.world (from rev 1135, trunk/src/stable/components/gazeboserver/plugins/kinect/kinect.world)
===================================================================
--- trunk/src/stable/components/gazeboserver/plugins/kinect/worlds/kinect.world (rev 0)
+++ trunk/src/stable/components/gazeboserver/plugins/kinect/worlds/kinect.world 2014-01-10 10:43:07 UTC (rev 1140)
@@ -0,0 +1,49 @@
+<?xml version ='1.0'?>
+<gazebo version ='1.0'>
+<world name='default'>
+ <include>
+ <uri>model://ground_plane</uri>
+ </include>
+
+ <model name='kinect_model'>
+ <static>true</static>
+ <link name="kinect">
+ <inertial>
+ <mass>0.30</mass>
+ </inertial>
+ <pose>-1.0 0 0.62 0 0 3.14</pose>
+ <visual name="visual">
+ <pose>0 0 0.04 0 0 0</pose>
+ <geometry>
+ <mesh>
+ <uri>model://kinect/meshes/kinect.dae</uri>
+ </mesh>
+ </geometry>
+ </visual>
+ <sensor name="kinect" type="depth">
+ <update_rate>5</update_rate>
+ <camera>
+ <horizontal_fov>1.047198</horizontal_fov>
+ <image>
+ <width>640</width>
+ <height>480</height>
+ <format>R8G8B8</format>
+ </image>
+ <clip>
+ <near>0.05</near>
+ <far>3</far>
+ </clip>
+ </camera>
+
+ <plugin name='depth_camera_plugin' filename='libkinectPlugin.so'>
+ </plugin>
+ </sensor>
+ </link>
+ </model>
+ <include>
+ <uri>model://sun</uri>
+ </include>
+
+
+</world>
+</gazebo>
Deleted: trunk/src/stable/components/gazeboserver/plugins/nao/naoworld.world
===================================================================
--- trunk/src/stable/components/gazeboserver/plugins/nao/naoworld.world 2014-01-10 10:14:34 UTC (rev 1139)
+++ trunk/src/stable/components/gazeboserver/plugins/nao/naoworld.world 2014-01-10 10:43:07 UTC (rev 1140)
@@ -1,32 +0,0 @@
-<?xml version="1.0" ?>
-<sdf version="1.3">
- <world name="default">
- <!-- Ground -->
- <include>
- <uri>model://ground_plane</uri>
- </include>
-
- <!-- My robots -->
- <include>
- <uri>model://nao_robot</uri>
- <pose>0.08 0 0 0 0 3.14</pose>
- </include>
-
- <!-- A global light source -->
- <include>
- <uri>model://sun</uri>
- </include>
-
- <!-- A ball -->
-<!-- <include>
- <uri>model://pelota</uri>
- <pose>0 -2 0 0 0 0</pose>
- </include>
-
- <include>
- <uri>model://pelota_verde</uri>
- <pose>-0.5 -2.3 0 0 0 0</pose>
- </include>
--->
- </world>
-</sdf>
Copied: trunk/src/stable/components/gazeboserver/plugins/nao/worlds/naoworld.world (from rev 1135, trunk/src/stable/components/gazeboserver/plugins/nao/naoworld.world)
===================================================================
--- trunk/src/stable/components/gazeboserver/plugins/nao/worlds/naoworld.world (rev 0)
+++ trunk/src/stable/components/gazeboserver/plugins/nao/worlds/naoworld.world 2014-01-10 10:43:07 UTC (rev 1140)
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<sdf version="1.3">
+ <world name="default">
+ <!-- Ground -->
+ <include>
+ <uri>model://ground_plane</uri>
+ </include>
+
+ <!-- My robots -->
+ <include>
+ <uri>model://nao_robot</uri>
+ <pose>0.08 0 0 0 0 3.14</pose>
+ </include>
+
+ <!-- A global light source -->
+ <include>
+ <uri>model://sun</uri>
+ </include>
+
+ <!-- A ball -->
+<!-- <include>
+ <uri>model://pelota</uri>
+ <pose>0 -2 0 0 0 0</pose>
+ </include>
+
+ <include>
+ <uri>model://pelota_verde</uri>
+ <pose>-0.5 -2.3 0 0 0 0</pose>
+ </include>
+-->
+ </world>
+</sdf>
Deleted: trunk/src/stable/components/gazeboserver/plugins/pioneer/pioneer2dxJde.world
===================================================================
--- trunk/src/stable/components/gazeboserver/plugins/pioneer/pioneer2dxJde.world 2014-01-10 10:14:34 UTC (rev 1139)
+++ trunk/src/stable/components/gazeboserver/plugins/pioneer/pioneer2dxJde.world 2014-01-10 10:43:07 UTC (rev 1140)
@@ -1,32 +0,0 @@
-<?xml version="1.0" ?>
-<sdf version="1.3">
- <world name="default">
- <!-- Ground -->
- <include>
- <uri>model://ground_plane</uri>
- </include>
-
- <!-- A global light source -->
- <include>
- <uri>model://sun</uri>
- </include>
-
- <!-- Pioneer2dx model -->
- <include>
- <uri>model://pioneer2dxJde</uri>
- <name>pioneer2dx</name>
- </include>
-
- <!-- Pioneer2dx model
- <include>
-<!-- <uri>model://pioneer2dxJde</uri>
- <name>pioneer2dx2</name>
- <pose>2 0 0 0 0 0</pose>
- </include> -->
-
-<!-- <include>
- <uri>model://simpleWorld</uri>
- </include> -->
-
- </world>
-</sdf>
Copied: trunk/src/stable/components/gazeboserver/plugins/pioneer/worlds/pioneer2dxJde-2.world (from rev 1135, trunk/src/stable/components/gazeboserver/plugins/pioneer/pioneer2dxJde.world)
===================================================================
--- trunk/src/stable/components/gazeboserver/plugins/pioneer/worlds/pioneer2dxJde-2.world (rev 0)
+++ trunk/src/stable/components/gazeboserver/plugins/pioneer/worlds/pioneer2dxJde-2.world 2014-01-10 10:43:07 UTC (rev 1140)
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<sdf version="1.3">
+ <world name="default">
+ <!-- Ground -->
+ <include>
+ <uri>model://ground_plane</uri>
+ </include>
+
+ <!-- A global light source -->
+ <include>
+ <uri>model://sun</uri>
+ </include>
+
+ <!-- Pioneer2dx model -->
+ <include>
+ <uri>model://pioneer2dxJde</uri>
+ <name>pioneer2dx</name>
+ </include>
+
+ <!-- Pioneer2dx model
+ <include>
+<!-- <uri>model://pioneer2dxJde</uri>
+ <name>pioneer2dx2</name>
+ <pose>2 0 0 0 0 0</pose>
+ </include> -->
+
+<!-- <include>
+ <uri>model://simpleWorld</uri>
+ </include> -->
+
+ </world>
+</sdf>
More information about the Jderobot-admin
mailing list