CSIRO ASL ROS

Merge lp:~nicholas-hillier/csiro-asl-ros-pkg/trunk into lp:csiro-asl-ros-pkg

  1. trunk
  2. Merge into trunk
Proposed by Nick Hillier
Status: Merged
Approved by: Nick Hillier
Approved revision: 4
Merge reported by: Nick Hillier
Merged at revision: not available
Proposed branch: lp:~nicholas-hillier/csiro-asl-ros-pkg/trunk
Merge into: lp:csiro-asl-ros-pkg
Diff against target: 12 lines (+1/-1)
1 file modified
csiro_asl_openrave_plugins/odephysics_ORplugin/include/odephysics_ORplugin/csiro_odespace.h (+1/-1)
To merge this branch: bzr merge lp:~nicholas-hillier/csiro-asl-ros-pkg/trunk
Reviewer Review Type Date Requested Status
Nick Hillier Pending
Review via email: mp+46864@code.launchpad.net

Description of the change

Update of odephysics plugin to new OpenRAVE API

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'csiro_asl_openrave_plugins/odephysics_ORplugin/include/odephysics_ORplugin/csiro_odespace.h'
2--- csiro_asl_openrave_plugins/odephysics_ORplugin/include/odephysics_ORplugin/csiro_odespace.h 2011-01-06 01:31:36 +0000
3+++ csiro_asl_openrave_plugins/odephysics_ORplugin/include/odephysics_ORplugin/csiro_odespace.h 2011-01-20 03:26:12 +0000
4@@ -403,7 +403,7 @@
5 if( (*itjoint)->GetType() == KinBody::Joint::JointSpherical ) {
6 continue;
7 }
8- if( (*itjoint)->IsCircular() ) {
9+ if( (*itjoint)->IsCircular(i) ) {
10 _jointset[dJointGetType(joint)](joint,dParamLoStop+dParamGroup*i,-dInfinity);
11 _jointset[dJointGetType(joint)](joint,dParamHiStop+dParamGroup*i,dInfinity);
12 }

Subscribers

People subscribed via source and target branches

to all changes: