Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[16396] pkg/trunk
|
From: <hsu...@us...> - 2009-05-29 20:33:54
|
Revision: 16396
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=16396&view=rev
Author: hsujohnhsu
Date: 2009-05-29 20:32:53 +0000 (Fri, 29 May 2009)
Log Message:
-----------
Merging from branch:
svn merge -r 15682:15684 https://personalrobots.svn.sf.net/svnroot/personalrobots/pkg/branches/gazebo-branch-merge .
Modified Paths:
--------------
pkg/trunk/3rdparty/opencv_latest/manifest.xml
pkg/trunk/common/bullet/manifest.xml
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_stereo_camera.h
pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_block_laser.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_bumper.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_camera.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_laser.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_stereo_camera.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/urdf2gazebo.cpp
pkg/trunk/motion_planning/navfn/manifest.xml
pkg/trunk/nav/map_server/manifest.xml
pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_objects/desk2.model
pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/base_defs.xml
pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/head_defs.xml
pkg/trunk/simulators/gazebo/Makefile
pkg/trunk/simulators/gazebo/manifest.xml
pkg/trunk/visualization/rviz/manifest.xml
pkg/trunk/visualization_core/ogre/Makefile
pkg/trunk/visualization_core/ogre/manifest.xml
Added Paths:
-----------
pkg/trunk/3rdparty/opencv_latest/cmake_2.4.7.patch
Property Changed:
----------------
pkg/trunk/
pkg/trunk/robot_descriptions/gazebo_robot_description/Media/
pkg/trunk/visualization/
pkg/trunk/visualization/rviz/src/rviz/generated/rviz_generated.i
pkg/trunk/visualization/rviz/src/rviz/properties/forwards.h
pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp
pkg/trunk/visualization/rviz/src/rviz/robot/robot.h
pkg/trunk/visualization_core/ogre_tools/
pkg/trunk/visualization_core/ogre_tools/media/
pkg/trunk/visualization_core/ogre_tools/src/stl_to_mesh/
pkg/trunk/visualization_core/ogre_tools/test/
Property changes on: pkg/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
+ /pkg/branches/gazebo-branch-merge:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
Added: svnmerge-integrated
+ /pkg/trunk:1-15310
Copied: pkg/trunk/3rdparty/opencv_latest/cmake_2.4.7.patch (from rev 15684, pkg/branches/gazebo-branch-merge/3rdparty/opencv_latest/cmake_2.4.7.patch)
===================================================================
--- pkg/trunk/3rdparty/opencv_latest/cmake_2.4.7.patch (rev 0)
+++ pkg/trunk/3rdparty/opencv_latest/cmake_2.4.7.patch 2009-05-29 20:32:53 UTC (rev 16396)
@@ -0,0 +1,38 @@
+Index: src/cv/cvimgwarp.cpp
+===================================================================
+--- src/cv/cvimgwarp.cpp (revision 1734)
++++ src/cv/cvimgwarp.cpp (working copy)
+@@ -2751,7 +2751,8 @@
+ {
+ short* alpha = A + y1*bw;
+ x1 = 0;
+- #if CV_SSE2
++ //#if CV_SSE2
++ #if 0
+ __m128i XX = _mm_set1_epi32(X0), YY = _mm_set1_epi32(Y0);
+ for( ; x1 <= bw - 8; x1 += 8 )
+ {
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt (revision 1734)
++++ CMakeLists.txt (working copy)
+@@ -221,13 +221,15 @@
+ if (${ALIAS_FOUND})
+ set(${define} 1)
+ foreach(P "${ALIAS_INCLUDE_DIRS}")
+- list(APPEND HIGHGUI_INCLUDE_DIRS ${${P}})
++ if (${P})
++ list(APPEND HIGHGUI_INCLUDE_DIRS ${${P}})
++ endif(${P})
+ endforeach()
+
+ foreach(P "${ALIAS_LIBRARY_DIRS}")
+- if (${${P}})
+- list(APPEND HIGHGUI_LIBRARY_DIRS ${${P}})
+- endif()
++ if (${P})
++ list(APPEND HIGHGUI_LIBRARY_DIRS ${P})
++ endif(${P})
+ endforeach()
+
+ list(APPEND HIGHGUI_LIBRARIES ${${ALIAS_LIBRARIES}})
Modified: pkg/trunk/3rdparty/opencv_latest/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/opencv_latest/manifest.xml 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/3rdparty/opencv_latest/manifest.xml 2009-05-29 20:32:53 UTC (rev 16396)
@@ -18,10 +18,13 @@
<depend package="image_msgs" />
<sysdepend os="ubuntu" version="7.04-feisty" package="libavformat-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libavformat-dev"/>
+<sysdepend os="ubuntu" version="9.04-jaunty" package="libavformat-dev"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libavcodec-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libavcodec-dev"/>
+<sysdepend os="ubuntu" version="9.04-jaunty" package="libavcodec-dev"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libjasper-1.701-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libjasper-dev"/>
+<sysdepend os="ubuntu" version="9.04-jaunty" package="libjasper-dev"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libgraphicsmagick++1-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libgraphicsmagick++1-dev"/>
<sysdepend os="ubuntu" version="9.04-jaunty" package="libswscale-dev"/>
Modified: pkg/trunk/common/bullet/manifest.xml
===================================================================
--- pkg/trunk/common/bullet/manifest.xml 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/common/bullet/manifest.xml 2009-05-29 20:32:53 UTC (rev 16396)
@@ -9,10 +9,13 @@
<review status="3rdparty" notes=""/>
<url>http://code.google.com/p/bullet/</url>
<depend package="rostest"/>
+<sysdepend os="ubuntu" version="9.04-jaunty" package="libXext-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libXext-dev"/>
<sysdepend os="ubuntu" version="7.10-gutsy" package="libXext-dev"/>
+<sysdepend os="ubuntu" version="9.04-jaunty" package="libglut3-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libglut3-dev"/>
<sysdepend os="ubuntu" version="7.10-gutsy" package="libglut3-dev"/>
+<sysdepend os="ubuntu" version="9.04-jaunty" package="swig"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="swig"/>
<sysdepend os="ubuntu" version="7.10-gutsy" package="swig"/>
<rosdep name="libxext"/>
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_stereo_camera.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_stereo_camera.h 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_stereo_camera.h 2009-05-29 20:32:53 UTC (rev 16396)
@@ -31,7 +31,7 @@
#include <ros/node.h>
#include "boost/thread/mutex.hpp"
-#include <Generic_Camera.hh>
+#include <gazebo/Generic_Camera.hh>
#include <gazebo/gazebo.h>
#include <gazebo/Param.hh>
#include <gazebo/Controller.hh>
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml 2009-05-29 20:32:53 UTC (rev 16396)
@@ -30,6 +30,7 @@
<export>
<cpp cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib" />
</export>
+ <sysdepend os="ubuntu" version="9.04-jaunty" package="python-numpy"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-numpy"/>
<sysdepend os="ubuntu" version="7.10-gutsy" package="python-numpy"/>
</package>
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_block_laser.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_block_laser.cpp 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_block_laser.cpp 2009-05-29 20:32:53 UTC (rev 16396)
@@ -39,7 +39,7 @@
#include <gazebo/gazebo.h>
#include <gazebo/GazeboError.hh>
#include <gazebo/ControllerFactory.hh>
-#include <RaySensor.hh>
+#include <gazebo/RaySensor.hh>
using namespace gazebo;
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_bumper.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_bumper.cpp 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_bumper.cpp 2009-05-29 20:32:53 UTC (rev 16396)
@@ -26,15 +26,15 @@
#include <gazebo_plugin/ros_bumper.h>
-#include "gazebo/Global.hh"
-#include "gazebo/XMLConfig.hh"
-#include "ContactSensor.hh"
-#include "gazebo/World.hh"
-#include "gazebo/gazebo.h"
-#include "gazebo/GazeboError.hh"
-#include "gazebo/ControllerFactory.hh"
-#include "gazebo/Simulator.hh"
-#include "gazebo/Body.hh"
+#include <gazebo/Global.hh>
+#include <gazebo/XMLConfig.hh>
+#include <gazebo/ContactSensor.hh>
+#include <gazebo/World.hh>
+#include <gazebo/gazebo.h>
+#include <gazebo/GazeboError.hh>
+#include <gazebo/ControllerFactory.hh>
+#include <gazebo/Simulator.hh>
+#include <gazebo/Body.hh>
using namespace gazebo;
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_camera.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_camera.cpp 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_camera.cpp 2009-05-29 20:32:53 UTC (rev 16396)
@@ -41,7 +41,7 @@
#include <gazebo/gazebo.h>
#include <gazebo/GazeboError.hh>
#include <gazebo/ControllerFactory.hh>
-#include "MonoCameraSensor.hh"
+#include <gazebo/MonoCameraSensor.hh>
#include "image_msgs/Image.h"
#include "image_msgs/FillImage.h"
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_laser.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_laser.cpp 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_laser.cpp 2009-05-29 20:32:53 UTC (rev 16396)
@@ -39,7 +39,7 @@
#include <gazebo/gazebo.h>
#include <gazebo/GazeboError.hh>
#include <gazebo/ControllerFactory.hh>
-#include "RaySensor.hh"
+#include <gazebo/RaySensor.hh>
using namespace gazebo;
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_stereo_camera.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_stereo_camera.cpp 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_stereo_camera.cpp 2009-05-29 20:32:53 UTC (rev 16396)
@@ -38,8 +38,8 @@
#include <gazebo/GazeboError.hh>
#include <gazebo/ControllerFactory.hh>
#include <gazebo/Model.hh>
-#include "MonoCameraSensor.hh"
-#include "Body.hh"
+#include <gazebo/MonoCameraSensor.hh>
+#include <gazebo/Body.hh>
#include "image_msgs/Image.h"
#include "image_msgs/FillImage.h"
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/urdf2gazebo.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/urdf2gazebo.cpp 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/urdf2gazebo.cpp 2009-05-29 20:32:53 UTC (rev 16396)
@@ -352,7 +352,7 @@
for (int j = 0 ; j < 3 ; ++j)
{
// undo Gazebo's shift of object anchor to geom cg center, stay in body cs
- tmpAnchor[j] = (link->joint->anchor)[j] - (link->inertial->com)[j] - 0*(link->collision->xyz)[j];
+ tmpAnchor[j] = (link->joint->anchor)[j]; // - (link->inertial->com)[j] - 0*(link->collision->xyz)[j];
}
addKeyValue(joint, "anchorOffset", values2str(3, tmpAnchor));
@@ -374,20 +374,20 @@
ROS_WARN("urdf2gazebo: limiting lowStop to <= 0 degrees");
*lowstop = 0.0;
}
- if (*lowstop < -(M_PI))
+ if (*lowstop < -(M_PI)*0.9)
{
- ROS_WARN("urdf2gazebo: limiting lowStop to >= -(180) degrees");
- *lowstop = -(M_PI);
+ ROS_WARN("urdf2gazebo: limiting lowStop to >= -(180)*0.9 degrees");
+ *lowstop = -(M_PI)*0.9;
}
if (*highstop < 0)
{
ROS_WARN("urdf2gazebo: limiting highStop to >= 0 degrees");
*highstop = 0.0;
}
- if (*highstop > (M_PI))
+ if (*highstop > (M_PI)*0.9)
{
- ROS_WARN("urdf2gazebo: limiting highStop to <= (180) degrees");
- *highstop = (M_PI);
+ ROS_WARN("urdf2gazebo: limiting highStop to <= (180)*0.9 degrees");
+ *highstop = (M_PI)*0.9;
}
addKeyValue(joint, "lowStop", values2str(1, link->joint->limit , rad2deg));
addKeyValue(joint, "highStop", values2str(1, link->joint->limit + 1, rad2deg));
Modified: pkg/trunk/motion_planning/navfn/manifest.xml
===================================================================
--- pkg/trunk/motion_planning/navfn/manifest.xml 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/motion_planning/navfn/manifest.xml 2009-05-29 20:32:53 UTC (rev 16396)
@@ -15,6 +15,9 @@
<sysdepend os="ubuntu" version="7.04-feisty" package="libnetpbm10-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libfltk1.1-dev"/> <!-- actually optional -->
<sysdepend os="ubuntu" version="8.04-hardy" package="libnetpbm10-dev"/>
+ <sysdepend os="ubuntu" version="9.04-jaunty" package="libfltk1.1-dev"/> <!-- actually optional -->
+ <sysdepend os="ubuntu" version="9.04-jaunty" package="libnetpbm10-dev"/>
+
<sysdepend os="osx" package="netpbm"/>
<rosdep name="fltk"/>
<rosdep name="netpbm"/>
Modified: pkg/trunk/nav/map_server/manifest.xml
===================================================================
--- pkg/trunk/nav/map_server/manifest.xml 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/nav/map_server/manifest.xml 2009-05-29 20:32:53 UTC (rev 16396)
@@ -20,13 +20,16 @@
<!-- <depend package="sdl_image"/> -->
<sysdepend os="ubuntu" version="7.04-feisty" package="libsdl-image1.2-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libsdl-image1.2-dev"/>
+ <sysdepend os="ubuntu" version="9.04-jaunty" package="libsdl-image1.2-dev"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="python-imaging"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-imaging"/>
+ <sysdepend os="ubuntu" version="9.04-jaunty" package="python-imaging"/>
<sysdepend package="python-yaml" os="ubuntu" version="7.04-feisty"/>
<sysdepend package="python-yaml" os="ubuntu" version="7.10-gutsy"/>
<sysdepend package="python-yaml" os="ubuntu" version="8.04-hardy"/>
+ <sysdepend package="python-yaml" os="ubuntu" version="9.04-jaunty"/>
<sysdepend package="py25-yaml" os="macports" />
<sysdepend package="PyYAML" os="centos" version="5.2"/>
Property changes on: pkg/trunk/robot_descriptions/gazebo_robot_description/Media
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/robot_descriptions/gazebo_robot_description/Media:15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
+ /pkg/branches/gazebo-branch-merge/robot_descriptions/gazebo_robot_description/Media:15683-15684,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
Modified: pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_objects/desk2.model
===================================================================
--- pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_objects/desk2.model 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_objects/desk2.model 2009-05-29 20:32:53 UTC (rev 16396)
@@ -5,7 +5,7 @@
<body:box name="desk2">
<xyz>0 0 0.4</xyz>
<rpy>0 0 0</rpy>
- <geom:box name="desk1top_geom">
+ <geom:box name="desk2top_geom">
<kp>100000000.0</kp>
<kd>1.0</kd>
<xyz>0 0 0.8</xyz>
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/base_defs.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/base_defs.xml 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/base_defs.xml 2009-05-29 20:32:53 UTC (rev 16396)
@@ -339,6 +339,7 @@
<minRange>0.05</minRange>
<maxRange>10.0</maxRange>
+ <resRange>0.01</resRange>
<updateRate>20.0</updateRate>
<controller:ros_laser name="ros_base_laser_controller" plugin="libros_laser.so">
<gaussianNoise>0.005</gaussianNoise>
@@ -490,6 +491,7 @@
<minRange>0.05</minRange>
<maxRange>10.0</maxRange>
+ <resRange>0.01</resRange>
<updateRate>20.0</updateRate>
<controller:ros_laser name="ros_base_laser_controller" plugin="libros_laser.so">
<gaussianNoise>0.005</gaussianNoise>
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/head_defs.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/head_defs.xml 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/head_defs.xml 2009-05-29 20:32:53 UTC (rev 16396)
@@ -98,6 +98,7 @@
<minRange>0.05</minRange>
<maxRange>10.0</maxRange>
+ <resRange>0.01</resRange>
<updateRate>20.0</updateRate>
<controller:ros_laser name="ros_${name}_controller" plugin="libros_laser.so">
<gaussianNoise>0.005</gaussianNoise>
@@ -216,14 +217,14 @@
<map name="gazebo_material" flag="gazebo">
<elem key="material" value="PR2/Blue" />
</map>
- <geometry name="${name}_r_stereo_camera_visual">
+ <geometry name="${name}_l_stereo_camera_visual">
<mesh scale="0.01 0.01 0.01" />
</geometry>
</visual>
<collision>
<origin xyz="0 0 0" rpy="0 0 0" />
- <geometry name="${name}_r_stereo_camera_collision">
+ <geometry name="${name}_l_stereo_camera_collision">
<box size="0.01 0.01 0.01" />
</geometry>
</collision>
@@ -572,6 +573,7 @@
<minRange>0.05</minRange>
<maxRange>10.0</maxRange>
+ <resRange>0.01</resRange>
<updateRate>20.0</updateRate>
<controller:ros_laser name="ros_${name}_controller" plugin="libros_laser.so">
<gaussianNoise>0.005</gaussianNoise>
Modified: pkg/trunk/simulators/gazebo/Makefile
===================================================================
--- pkg/trunk/simulators/gazebo/Makefile 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/simulators/gazebo/Makefile 2009-05-29 20:32:53 UTC (rev 16396)
@@ -1,72 +1,69 @@
all: installed
-SVN_DIR = gazebo-svn-ogre-v1.4.9
-#SVN_URL = https://playerstage.svn.sourceforge.net/svnroot/playerstage/code/gazebo/trunk
-SVN_URL = https://playerstage.svn.sourceforge.net/svnroot/playerstage/code/gazebo/branches/ogre-1.4.9
-SVN_REVISION = -r 7599
-SVN_PATCH = gazebo_patch.diff
+INSTALL_DIR = $(shell rospack find gazebo)/gazebo
+TEST_INSTALL_DIR = $(shell rospack find gazebo)/test-gazebo
+
+SVN_DIR = gazebo-svn
+SVN_URL = https://playerstage.svn.sourceforge.net/svnroot/playerstage/code/gazebo/trunk
+SVN_REVISION =
+SVN_PATCH =
include $(shell rospack find mk)/svn_checkout.mk
+#SVN_URL = https://playerstage.svn.sourceforge.net/svnroot/playerstage/code/gazebo/branches/ogre-1.4.9
+#SVN_REVISION = -r 7599
+#SVN_PATCH = gazebo_patch.diff
+
OGRE_PKG = $(shell rospack find ogre)/ogre/lib/pkgconfig
PLAYER_PKG = $(shell rospack find player)/player/lib/pkgconfig
-FI_PKG = $(shell rospack find freeimage)/freeimage/lib/pkgconfig
ODE_PKG = $(shell rospack find opende)/opende/lib/pkgconfig
-CV_PKG = $(shell rospack find opencv_latest)/opencv/lib/pkgconfig
-
ODE_PATH = $(shell rospack find opende)/opende/bin
-FI_LD = $(shell rospack find freeimage)/freeimage/lib
-ROOT = $(shell rospack find gazebo)/gazebo
-TESTROOT = $(shell rospack find gazebo)/test-gazebo
-BOOST_CFLAGS = $(shell rosboost-cfg --cflags)
-BOOST_LFLAGS = $(shell rosboost-cfg --lflags signals,thread)
+FREEIMAGE_INCLUDE_DIR = $(shell rospack find freeimage)/freeimage/include
+FREEIMAGE_LIBRARY_DIR = $(shell rospack find freeimage)/freeimage/lib
+FREEIMAGE_LIBRARY = $(shell rospack find freeimage)/freeimage/lib/libfreeimage.so
-# these flags used to build opende
-# ipo seems to break ogre and opende, use ip instead
-#INTEL_OPTIONS = CC='/opt/intel/cc/10.1.008/bin/icc' CXX='/opt/intel/cc/10.1.008/bin/icpc' LD='/opt/intel/cc/10.1.008/bin/xild'
-INTEL_C_FLAGS = -march=core2 -msse3 -ip -no-prec-div -parallel -O3 -fPIC -I$(ROOT)/include
-INTEL_C_FLAGS_OMP = -march=core2 -msse3 -ip -no-prec-div -openmp -parallel -O3 -fPIC -I$(ROOT)/include
-INTEL_LD_FLAGS = -Wl,-rpath,/opt/intel/cc/10.1.008/lib,-rpath,$(ROOT)/lib -L/opt/intel/cc/10.1.008/lib -L$(ROOT)/lib -lguide -lcxaguard -limf -lsvml -lirc -pthread -lintlc
-INTEL_LD_FLAGS_OMP = -Wl,-rpath,/opt/intel/cc/10.1.008/lib,-rpath,$(ROOT)/lib -L/opt/intel/cc/10.1.008/lib -L$(ROOT)/lib -lguide -lcxaguard -limf -lsvml -lirc -pthread -lintlc -lompstub -liomp5 -lomp_db
+BOOST_INCLUDE_DIRS = $(shell rosboost-cfg --include_dirs)
+BOOST_LIBRARY_DIRS = $(shell rosboost-cfg --lib_dirs signals,thread)
+BOOST_LIBRARIES = $(shell rosboost-cfg --libs signals,thread)
-#build: SVN_UP_REVERT_PATCH gazebo
-installed: $(SVN_DIR) patched
- if [ ! -d gazebo ]; then mkdir -p gazebo; mkdir -p gazebo/share; mkdir -p gazebo/share/gazebo; mkdir -p gazebo/share/gazebo/worlds; mkdir -p gazebo/share/gazebo/Media; fi
- cd $(SVN_DIR) && PKG_CONFIG_PATH=${CV_PKG}:${ODE_PKG}:${FI_PKG}:${PLAYER_PKG}:${OGRE_PKG}:${PKG_CONFIG_PATH} PATH=${ODE_PATH}:${PATH} \
- scons $(JOBC) $(ROS_PARALLEL_JOBS) mode=optimized prefix=$(ROOT) boost_cflags="$(BOOST_CFLAGS)" boost_lflags="$(BOOST_LFLAGS)"
- -cd $(SVN_DIR) && PKG_CONFIG_PATH=${CV_PKG}:${ODE_PKG}:${FI_PKG}:${PLAYER_PKG}:${OGRE_PKG}:${PKG_CONFIG_PATH} PATH=${ODE_PATH}:${PATH} \
- scons $(JOBC) $(ROS_PARALLEL_JOBS) mode=optimized prefix=$(ROOT) boost_cflags="$(BOOST_CFLAGS)" boost_lflags="$(BOOST_LFLAGS)" install
- -cd $(SVN_DIR) && rm -f gazebo;
- touch installed
+PKG_PATHS = PKG_CONFIG_PATH=${ODE_PKG}:${PLAYER_PKG}:${OGRE_PKG}:${PKG_CONFIG_PATH}
+PATHS = PATH=${ODE_PATH}:${PATH}
-ROOT_ORIG = $(shell rospack find gazebo)/gazebo-original
-SVN_ORIG_DIR = gazebo-svn-original
-.PHONY: gazebo-original
-gazebo-original: $(SVN_ORIG_DIR)
- if [ ! -d gazebo-original ]; then mkdir -p gazebo-original; mkdir -p gazebo-original/share; mkdir -p gazebo-original/share/gazebo/worlds; mkdir -p gazebo-original/share/gazebo; mkdir -p gazebo-original/share/gazebo/Media; fi
- cd $(SVN_ORIG_DIR) && PKG_CONFIG_PATH=${CV_PKG}:${ODE_PKG}:${FI_PKG}:${PLAYER_PKG}:${OGRE_PKG}:${PKG_CONFIG_PATH} PATH=${ODE_PATH}:${PATH} \
- scons prefix=$(ROOT_ORIG)
- -cd $(SVN_ORIG_DIR) && PKG_CONFIG_PATH=${CV_PKG}:${ODE_PKG}:${FI_PKG}:${PLAYER_PKG}:${OGRE_PKG}:${PKG_CONFIG_PATH} PATH=${ODE_PATH}:${PATH} \
- scons prefix=$(ROOT_ORIG) install
- touch gazebo-original
+CMAKE = cmake
+CMAKE_ARGS = -D CMAKE_BUILD_TYPE=RELEASE \
+ -D CMAKE_INSTALL_PREFIX=$(INSTALL_DIR) \
+ -D boost_include_dirs=$(BOOST_INCLUDE_DIRS) \
+ -D boost_library_dirs=$(BOOST_LIBRARY_DIRS) \
+ -D boost_libraries="$(BOOST_LIBRARIES)" \
+ -D freeimage_include_dir=$(FREEIMAGE_INCLUDE_DIR) \
+ -D freeimage_library_dir=$(FREEIMAGE_LIBRARY_DIR) \
+ -D freeimage_library=$(FREEIMAGE_LIBRARY) \
+ -D LIBAVCODEC_PATH="" \
+ -D LIBAVFORMAT_PATH="" \
+ -D CMAKE_CXX_LINK_FLAGS="-lfltk -lfltk_gl"
-test-$(SVN_TARGET):
- @if [ ! -d test-$(SVN_DIR) ]; then svn co $(SVN_REVISION) https://playerstage.svn.sourceforge.net/svnroot/playerstage/code/gazebo/trunk test-$(SVN_DIR); fi
- -cd test-$(SVN_DIR) && svn up #$(REVISION)
- #-patch -N -p0 < gazebo_patch.diff
-test-gazebo: test-$(SVN_TARGET)
- if [ ! -d test-gazebo ]; then mkdir -p test-gazebo; fi
- cd test-$(SVN_DIR) && export PKG_CONFIG_PATH=${PLAYER_PKG}:${OGRE_PKG}:${PKG_CONFIG_PATH} && \
- export LIBPATH="${FI_LD}" && \
- export PATH=${ODE_PATH}/bin:${PATH} && scons prefix=$(TESTROOT) && scons prefix=$(TESTROOT) install
- touch test-gazebo
-# export LD_LIBRARY_PATH="/usr/lib" && \
+CMAKE_CMD = $(PKG_PATHS) $(PATHS) $(CMAKE) $(CMAKE_ARGS)
+#build: SVN_UP_REVERT_PATCH gazebo
+installed: $(SVN_DIR) patched
+ if [ ! -d $(SVN_DIR)/build ]; then mkdir -p $(SVN_DIR)/build; fi
+ cd $(SVN_DIR)/build && $(CMAKE_CMD) ..
+ cd $(SVN_DIR)/build && $(PKG_PATHS) $(PATHS) make $(ROS_PARALLEL_JOBS) && make install
+
clean:
- -cd $(SVN_DIR) && PKG_CONFIG_PATH=${CV_PKG}:${ODE_PKG}:${FI_PKG}:${PLAYER_PKG}:${OGRE_PKG}:${PKG_CONFIG_PATH} PATH=${ODE_PATH}:${PATH} scons --clean
+ -cd $(SVN_DIR) && PKG_CONFIG_PATH=${ODE_PKG}:${PLAYER_PKG}:${OGRE_PKG}:${PKG_CONFIG_PATH} PATH=${ODE_PATH}:${PATH} make clean
rm -rf gazebo installed
wipe: clean
rm -rf $(SVN_DIR) gazebo
+
+# these flags used to build opende
+# ipo seems to break ogre and opende, use ip instead
+#INTEL_OPTIONS = CC='/opt/intel/cc/10.1.008/bin/icc' CXX='/opt/intel/cc/10.1.008/bin/icpc' LD='/opt/intel/cc/10.1.008/bin/xild'
+INTEL_C_FLAGS = -march=core2 -msse3 -ip -no-prec-div -parallel -O3 -fPIC -I$(ROOT)/include
+INTEL_C_FLAGS_OMP = -march=core2 -msse3 -ip -no-prec-div -openmp -parallel -O3 -fPIC -I$(ROOT)/include
+INTEL_LD_FLAGS = -Wl,-rpath,/opt/intel/cc/10.1.008/lib,-rpath,$(ROOT)/lib -L/opt/intel/cc/10.1.008/lib -L$(ROOT)/lib -lguide -lcxaguard -limf -lsvml -lirc -pthread -lintlc
+INTEL_LD_FLAGS_OMP = -Wl,-rpath,/opt/intel/cc/10.1.008/lib,-rpath,$(ROOT)/lib -L/opt/intel/cc/10.1.008/lib -L$(ROOT)/lib -lguide -lcxaguard -limf -lsvml -lirc -pthread -lintlc -lompstub -liomp5 -lomp_db
+
Modified: pkg/trunk/simulators/gazebo/manifest.xml
===================================================================
--- pkg/trunk/simulators/gazebo/manifest.xml 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/simulators/gazebo/manifest.xml 2009-05-29 20:32:53 UTC (rev 16396)
@@ -8,13 +8,24 @@
<review status="3rdparty" notes=""/>
<depend package="opende" />
<depend package="ogre" />
- <depend package="opencv_latest" />
<url>http://playerstage.sf.net</url>
<export>
- <cpp lflags="`xml2-config --libs` -Wl,-rpath,${prefix}/gazebo/lib -L${prefix}/gazebo/lib -lgazebo -lgazeboServer" cflags="`xml2-config --cflags` -I${prefix}/gazebo/include -I${prefix}/gazebo-svn-ogre-v1.4.9/server/controllers -I${prefix}/gazebo-svn-ogre-v1.4.9/server/controllers/camera/generic -I${prefix}/gazebo-svn-ogre-v1.4.9/server/physics -I${prefix}/gazebo-svn-ogre-v1.4.9/server/sensors -I${prefix}/gazebo-svn-ogre-v1.4.9/server/sensors/ray -I${prefix}/gazebo-svn-ogre-v1.4.9/server/sensors/camera -I${prefix}/gazebo-svn-ogre-v1.4.9/server/sensors/contact -I${prefix}/gazebo-svn-ogre-v1.4.9/server -I${prefix}/gazebo-svn-ogre-v1.4.9/server/rendering"/>
+ <cpp lflags="`xml2-config --libs` `rosboost-cfg --lflags thread,signals` -Wl,-rpath,${prefix}/gazebo/lib -L${prefix}/gazebo/lib -lgazebo -lgazebo_server -lgazebo_av -lgazebo_gui -lfltk -lfltk_gl" cflags="`xml2-config --cflags` `rosboost-cfg --cflags` -I${prefix}/gazebo/include"/>
<doxymaker external="http://playerstage.sourceforge.net/doc/Gazebo-manual-svn-html/"/>
</export>
<versioncontrol type="svn" url="https://playerstage.svn.sourceforge.net/svnroot/playerstage/code/gazebo/trunk"/>
+ <sysdepend os="ubuntu" version="9.04-jaunty" package="scons"/>
+ <sysdepend os="ubuntu" version="9.04-jaunty" package="pkg-config"/>
+ <sysdepend os="ubuntu" version="9.04-jaunty" package="libxml2-dev"/>
+ <sysdepend os="ubuntu" version="9.04-jaunty" package="libltdl3-dev"/>
+ <sysdepend os="ubuntu" version="9.04-jaunty" package="libfltk1.1"/>
+ <sysdepend os="ubuntu" version="9.04-jaunty" package="libfltk1.1-dev"/>
+ <sysdepend os="ubuntu" version="8.10-intrepid" package="scons"/>
+ <sysdepend os="ubuntu" version="8.10-intrepid" package="pkg-config"/>
+ <sysdepend os="ubuntu" version="8.10-intrepid" package="libxml2-dev"/>
+ <sysdepend os="ubuntu" version="8.10-intrepid" package="libltdl3-dev"/>
+ <sysdepend os="ubuntu" version="8.10-intrepid" package="libfltk1.1"/>
+ <sysdepend os="ubuntu" version="8.10-intrepid" package="libfltk1.1-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="scons"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="pkg-config"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libxml2-dev"/>
Property changes on: pkg/trunk/visualization
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/rviz_selection:12152-13640
/pkg/branches/josh/visualization_scratch:14041-14428
+ /pkg/branches/gazebo-branch-merge/visualization:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/rviz_selection:12152-13640
/pkg/branches/josh/visualization_scratch:14041-14428
Modified: pkg/trunk/visualization/rviz/manifest.xml
===================================================================
--- pkg/trunk/visualization/rviz/manifest.xml 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/visualization/rviz/manifest.xml 2009-05-29 20:32:53 UTC (rev 16396)
@@ -38,5 +38,7 @@
<sysdepend os="ubuntu" version="7.04-feisty" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-wxgtk2.8"/>
+ <sysdepend os="ubuntu" version="9.04-jaunty" package="libwxgtk2.8-dev"/>
+ <sysdepend os="ubuntu" version="9.04-jaunty" package="python-wxgtk2.8"/>
</package>
Property changes on: pkg/trunk/visualization/rviz/src/rviz/generated/rviz_generated.i
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/generated/rviz_generated.i:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/generated/rviz_generated.i:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/generated/visualization_panel_generated.i:12189
+ /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/generated/rviz_generated.i:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/generated/rviz_generated.i:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/generated/visualization_panel_generated.i:12189
Property changes on: pkg/trunk/visualization/rviz/src/rviz/properties/forwards.h
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/properties/forwards.h:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/properties/forwards.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/properties/property_forwards.h:12189,12408-12643,12667
+ /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/properties/forwards.h:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/properties/forwards.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/properties/property_forwards.h:12189,12408-12643,12667
Property changes on: pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.cpp:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.cpp:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp:497-13654
+ /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.cpp:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.cpp:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp:497-13654
Property changes on: pkg/trunk/visualization/rviz/src/rviz/robot/robot.h
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.h:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.h:497-13654
+ /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.h:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.h:497-13654
Modified: pkg/trunk/visualization_core/ogre/Makefile
===================================================================
--- pkg/trunk/visualization_core/ogre/Makefile 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/visualization_core/ogre/Makefile 2009-05-29 20:32:53 UTC (rev 16396)
@@ -2,7 +2,7 @@
OGRE_VERSION = ogre-v1-6-1
TARBALL = build/$(OGRE_VERSION).tar.bz2
-TARBALL_URL = http://pr.willowgarage.com/downloads/$(OGRE_VERSION).tar.bz2
+TARBALL_URL = http://superb-west.dl.sourceforge.net/sourceforge/ogre/$(OGRE_VERSION).tar.bz2
SOURCE_DIR = build/$(OGRE_VERSION)
UNPACK_CMD = tar xf
TARBALL_PATCH =
Modified: pkg/trunk/visualization_core/ogre/manifest.xml
===================================================================
--- pkg/trunk/visualization_core/ogre/manifest.xml 2009-05-29 20:26:47 UTC (rev 16395)
+++ pkg/trunk/visualization_core/ogre/manifest.xml 2009-05-29 20:32:53 UTC (rev 16396)
@@ -19,6 +19,14 @@
<cpp os="osx" lflags="-framework Ogre -framework Carbon -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib " cflags=""/>
<doxymaker external="http://ogre3d.org"/>
</export>
+<sysdepend os="ubuntu" version="9.04-jaunty" package="libzzip-0-13"/>
+<sysdepend os="ubuntu" version="9.04-jaunty" package="libzzip-dev"/>
+<sysdepend os="ubuntu" version="9.04-jaunty" package="libxaw7"/>
+<sysdepend os="ubuntu" version="9.04-jaunty" package="libxaw7-dev"/>
+<sysdepend os="ubuntu" version="9.04-jaunty" package="libgl1-mesa-dev"/>
+<sysdepend os="ubuntu" version="9.04-jaunty" package="libglu1-mesa-dev"/>
+<sysdepend os="ubuntu" version="9.04-jaunty" package="libgtk2.0-dev"/>
+<sysdepend os="ubuntu" version="9.04-jaunty" package="libxxf86vm-dev"/>
<sysdepend os="ubuntu" version="8.10-intrepid" package="libzzip-0-13"/>
<sysdepend os="ubuntu" version="8.10-intrepid" package="libzzip-dev"/>
<sysdepend os="ubuntu" version="8.10-intrepid" package="libxaw7"/>
@@ -27,7 +35,6 @@
<sysdepend os="ubuntu" version="8.10-intrepid" package="libglu1-mesa-dev"/>
<sysdepend os="ubuntu" version="8.10-intrepid" package="libgtk2.0-dev"/>
<sysdepend os="ubuntu" version="8.10-intrepid" package="libxxf86vm-dev"/>
-<sysdepend os="ubuntu" version="8.10-intrepid" package="libzzip-0-13"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libzzip-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libxaw7"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libxaw7-dev"/>
Property changes on: pkg/trunk/visualization_core/ogre_tools
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/ogre_tools:14041-14418
+ /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/ogre_tools:14041-14418
Property changes on: pkg/trunk/visualization_core/ogre_tools/media
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/media:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/ogre_tools/media:14041-14418
/pkg/trunk/visualization/ogre_tools/media:2217-8463
+ /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/media:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/ogre_tools/media:14041-14418
/pkg/trunk/visualization/ogre_tools/media:2217-8463
Property changes on: pkg/trunk/visualization_core/ogre_tools/src/stl_to_mesh
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/src/stl_to_mesh:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/ogre_tools/src/stl_to_mesh:14041-14418
/pkg/trunk/visualization/ogre_tools/src/stl_to_mesh:2217-2818
+ /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/src/stl_to_mesh:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/ogre_tools/src/stl_to_mesh:14041-14418
/pkg/trunk/visualization/ogre_tools/src/stl_to_mesh:2217-2818
Property changes on: pkg/trunk/visualization_core/ogre_tools/test
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/test:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/ogre_tools/test:14041-14418
/pkg/trunk/visualization/ogre_tools/test:2217-3599
+ /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/test:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262
/pkg/branches/josh/visualization_scratch/ogre_tools/test:14041-14418
/pkg/trunk/visualization/ogre_tools/test:2217-3599
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
