[Jderobot-admin] jderobot-r904 - trunk/src/components/gazeboserver

[bmenendez en jderobot.org]

Author: bmenendez
Date: 2013-04-19 11:35:04 +0200 (Fri, 19 Apr 2013)
New Revision: 904

Modified:
   trunk/src/components/gazeboserver/CMakeLists.txt
   trunk/src/components/gazeboserver/pioneer2dxJde.world
   trunk/src/components/gazeboserver/pioneer2dx_cam_sensor_left.cfg
   trunk/src/components/gazeboserver/pioneer2dx_cam_sensor_right.cfg
   trunk/src/components/gazeboserver/pioneer2dx_laser.cfg
Log:
[bmenendez] Modificados los ficheros de configuraci?\195?\179n para que cuadren con
los de introrob y la versi?\195?\179n paquetizada de gazeboserver, de forma que si hay
alguien que inicialmente utilizaba gazeboserver paquetizado + introrob y ahora
utiliza gazeboserver de repositorio + introrob no tenga que modificar nada
para que funcione todo a la primera.


Modified: trunk/src/components/gazeboserver/CMakeLists.txt
===================================================================
--- trunk/src/components/gazeboserver/CMakeLists.txt	2013-04-16 10:48:28 UTC (rev 903)
+++ trunk/src/components/gazeboserver/CMakeLists.txt	2013-04-19 09:35:04 UTC (rev 904)
@@ -56,3 +56,13 @@
     ${LIBS_DIR}/jderobotutil/libjderobotutil.so
     ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
     ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so)
+    
+add_library(pose3dencodersbrazo SHARED pose3dencodersbrazo.cc)
+target_link_libraries(pose3dencodersbrazo ${GAZEBO_libraries} 	 	
+	${GAZEBO_libraries} 
+
+	${ZeroCIce_LIBRARIES} 
+    ${LIBS_DIR}/jderobotice/libjderobotice.so
+    ${LIBS_DIR}/jderobotutil/libjderobotutil.so
+    ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
+    ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so)

Modified: trunk/src/components/gazeboserver/pioneer2dxJde.world
===================================================================
--- trunk/src/components/gazeboserver/pioneer2dxJde.world	2013-04-16 10:48:28 UTC (rev 903)
+++ trunk/src/components/gazeboserver/pioneer2dxJde.world	2013-04-19 09:35:04 UTC (rev 904)
@@ -5,6 +5,11 @@
     <include>
       <uri>model://ground_plane</uri>
     </include>
+    
+    <!-- A global light source -->
+    <include>
+      <uri>model://sun</uri>
+    </include>
 
     <!-- Pioneer2dx model -->
     <include>
@@ -14,19 +19,14 @@
     
         <!-- Pioneer2dx model -->
     <include>
-      <uri>model://pioneer2dxJde</uri>
+<!--      <uri>model://pioneer2dxJde</uri>
       <name>pioneer2dx2</name>
       <pose>2 0 0 0 0 0</pose>
-    </include>
+    </include> -->
     
-    <!-- A global light source -->
-    <include>
-      <uri>model://sun</uri>
-    </include>
-    
-    <include>
+<!--    <include>
       <uri>model://simpleWorld</uri>
-    </include>
+    </include> -->
 
   </world>
 </sdf>

Modified: trunk/src/components/gazeboserver/pioneer2dx_cam_sensor_left.cfg
===================================================================
--- trunk/src/components/gazeboserver/pioneer2dx_cam_sensor_left.cfg	2013-04-16 10:48:28 UTC (rev 903)
+++ trunk/src/components/gazeboserver/pioneer2dx_cam_sensor_left.cfg	2013-04-19 09:35:04 UTC (rev 904)
@@ -1,5 +1,5 @@
 #without registry
-CameraGazebo.Endpoints=default -h 0.0.0.0 -p 9995
+CameraGazebo.Endpoints=default -h 0.0.0.0 -p 9991
 
 #camera 1
 CameraGazebo.Camera.0.Name=cameraA

Modified: trunk/src/components/gazeboserver/pioneer2dx_cam_sensor_right.cfg
===================================================================
--- trunk/src/components/gazeboserver/pioneer2dx_cam_sensor_right.cfg	2013-04-16 10:48:28 UTC (rev 903)
+++ trunk/src/components/gazeboserver/pioneer2dx_cam_sensor_right.cfg	2013-04-19 09:35:04 UTC (rev 904)
@@ -1,5 +1,5 @@
 #without registry
-CameraGazebo.Endpoints=default -h 0.0.0.0 -p 9994
+CameraGazebo.Endpoints=default -h 0.0.0.0 -p 9992
 
 #camera 1
 CameraGazebo.Camera.0.Name=cameraA

Modified: trunk/src/components/gazeboserver/pioneer2dx_laser.cfg
===================================================================
--- trunk/src/components/gazeboserver/pioneer2dx_laser.cfg	2013-04-16 10:48:28 UTC (rev 903)
+++ trunk/src/components/gazeboserver/pioneer2dx_laser.cfg	2013-04-19 09:35:04 UTC (rev 904)
@@ -1,2 +1,2 @@
 #without registry
-Laser.Endpoints=default -h 0.0.0.0 -p 9996
+Laser.Endpoints=default -h 0.0.0.0 -p 9998