Skip to content

Commit

Permalink
Merge branch 'SaggitalToSagittal' into develop
Browse files Browse the repository at this point in the history 
- roboticslab-uc3m/teo-main#37
  • Loading branch information
@jgvictores
jgvictores committed Nov 19, 2019
2 parents 9c8ab84 + 6057939 commit fa8aa33
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 48 deletions.
16 changes: 8 additions & 8 deletions openrave/teo/teo_leftArm.kinbody.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,23 @@
<resolution>1</resolution>
</Joint>

<Body name="SaggitalLeftShoulder" type="dynamic">
<Body name="SagittalLeftShoulder" type="dynamic">
<offsetfrom>FrontalLeftShoulder</offsetfrom>
<Translation>0 0.084 0</Translation>
<RotationAxis>0 0 1 0</RotationAxis>
<Geom type="trimesh">
<Render>wrls/SaggitalLeftShoulder.wrl</Render>
<collision>wrls/SaggitalLeftShoulder.wrl</collision>
<Render>wrls/SagittalLeftShoulder.wrl</Render>
<collision>wrls/SagittalLeftShoulder.wrl</collision>
</Geom>
<Mass type="custom">
<density>1</density>
</Mass>
</Body>

<Joint circular="false" name="SaggitalLeftShoulder" type="hinge">
<Joint circular="false" name="SagittalLeftShoulder" type="hinge">
<Body>FrontalLeftShoulder</Body>
<Body>SaggitalLeftShoulder</Body>
<offsetfrom>SaggitalLeftShoulder</offsetfrom>
<Body>SagittalLeftShoulder</Body>
<offsetfrom>SagittalLeftShoulder</offsetfrom>
<weight>1.0</weight>
<limitsdeg>-23.9 76.5</limitsdeg>
<axis>1 0 0</axis>
Expand All @@ -53,7 +53,7 @@
</Joint>

<Body name="AxialLeftShoulder" type="dynamic">
<offsetfrom>SaggitalLeftShoulder</offsetfrom>
<offsetfrom>SagittalLeftShoulder</offsetfrom>
<Translation>0 0 -0.329</Translation>
<RotationAxis>0 0 1 0</RotationAxis>
<Geom type="trimesh">
Expand All @@ -66,7 +66,7 @@
</Body>

<Joint circular="false" name="AxialLeftShoulder" type="hinge">
<Body>SaggitalLeftShoulder</Body>
<Body>SagittalLeftShoulder</Body>
<Body>AxialLeftShoulder</Body>
<offsetfrom>AxialLeftShoulder</offsetfrom>
<weight>1.0</weight>
Expand Down
32 changes: 16 additions & 16 deletions openrave/teo/teo_leftLeg.kinbody.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@
<resolution>1</resolution>
</Joint>

<Body name="SaggitalLeftHip" type="dynamic">
<Body name="SagittalLeftHip" type="dynamic">
<offsetfrom>AxialLeftHip</offsetfrom>
<Translation>0 0 -0.092</Translation>
<Geom type="trimesh">
<Render>wrls/SaggitalLeftHip.wrl</Render>
<collision>wrls/SaggitalLeftHip.wrl</collision>
<Render>wrls/SagittalLeftHip.wrl</Render>
<collision>wrls/SagittalLeftHip.wrl</collision>
</Geom>
<Mass type="custom">
<density>1</density>
</Mass>
</Body>

<Joint circular="false" name="SaggitalLeftHip" type="hinge">
<Joint circular="false" name="SagittalLeftHip" type="hinge">
<Body>AxialLeftHip</Body>
<Body>SaggitalLeftHip</Body>
<offsetfrom>SaggitalLeftHip</offsetfrom>
<Body>SagittalLeftHip</Body>
<offsetfrom>SagittalLeftHip</offsetfrom>
<weight>1.0</weight>
<limitsdeg>-12.5 14.2</limitsdeg>
<axis>1 0 0</axis>
Expand All @@ -54,7 +54,7 @@

<Body name="FrontalLeftHip" type="dynamic">
<Translation>0 0 0</Translation>
<offsetfrom>SaggitalLeftHip</offsetfrom>
<offsetfrom>SagittalLeftHip</offsetfrom>
<Geom type="trimesh">
<Render>wrls/FrontalLeftHip.wrl</Render>
<collision>wrls/FrontalLeftHip.wrl</collision>
Expand All @@ -65,7 +65,7 @@
</Body>

<Joint circular="false" name="FrontalLeftHip" type="hinge">
<Body>SaggitalLeftHip</Body>
<Body>SagittalLeftHip</Body>
<Body>FrontalLeftHip</Body>
<offsetfrom>FrontalLeftHip</offsetfrom>
<weight>1.0</weight>
Expand Down Expand Up @@ -134,21 +134,21 @@
<resolution>1</resolution>
</Joint>

<Body name="SaggitalLeftAnkle" type="dynamic">
<Body name="SagittalLeftAnkle" type="dynamic">
<offsetfrom>FrontalLeftAnkle</offsetfrom>
<Geom type="trimesh">
<Render>wrls/SaggitalLeftAnkle.wrl</Render>
<collision>wrls/SaggitalLeftAnkle.wrl</collision>
<Render>wrls/SagittalLeftAnkle.wrl</Render>
<collision>wrls/SagittalLeftAnkle.wrl</collision>
</Geom>
<Mass type="custom">
<density>1</density>
</Mass>
</Body>

<Joint circular="false" name="SaggitalLeftAnkle" type="hinge">
<Joint circular="false" name="SagittalLeftAnkle" type="hinge">
<Body>FrontalLeftAnkle</Body>
<Body>SaggitalLeftAnkle</Body>
<offsetfrom>SaggitalLeftAnkle</offsetfrom>
<Body>SagittalLeftAnkle</Body>
<offsetfrom>SagittalLeftAnkle</offsetfrom>
<weight>1.0</weight>
<limitsdeg>-42.5 19.9</limitsdeg>
<axis>1 0 0</axis>
Expand All @@ -158,12 +158,12 @@


<Body name="LeftLegTCP" type="dynamic">
<offsetfrom>SaggitalLeftAnkle</offsetfrom>
<offsetfrom>SagittalLeftAnkle</offsetfrom>
<Translation>0 0 -0.123</Translation>
</Body>

<Joint name="q6Man" type="hinge" enable="False">
<Body>SaggitalLeftAnkle</Body>
<Body>SagittalLeftAnkle</Body>
<Body>LeftLegTCP</Body>
<limitsdeg>0 0</limitsdeg>
</Joint>
Expand Down
16 changes: 8 additions & 8 deletions openrave/teo/teo_rightArm.kinbody.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,23 @@
<resolution>1</resolution>
</Joint>

<Body name="SaggitalRightShoulder" type="dynamic">
<Body name="SagittalRightShoulder" type="dynamic">
<offsetfrom>FrontalRightShoulder</offsetfrom>
<Translation>0 -0.084 0</Translation>
<RotationAxis>0 0 1 0</RotationAxis>
<Geom type="trimesh">
<Render>wrls/SaggitalRightShoulder.wrl</Render>
<collision>wrls/SaggitalRightShoulder.wrl</collision>
<Render>wrls/SagittalRightShoulder.wrl</Render>
<collision>wrls/SagittalRightShoulder.wrl</collision>
</Geom>
<Mass type="custom">
<density>1</density>
</Mass>
</Body>

<Joint circular="false" name="SaggitalRightShoulder" type="hinge">
<Joint circular="false" name="SagittalRightShoulder" type="hinge">
<Body>FrontalRightShoulder</Body>
<Body>SaggitalRightShoulder</Body>
<offsetfrom>SaggitalRightShoulder</offsetfrom>
<Body>SagittalRightShoulder</Body>
<offsetfrom>SagittalRightShoulder</offsetfrom>
<weight>1.0</weight>
<limitsdeg>-75.5 22.4</limitsdeg>
<axis>1 0 0</axis>
Expand All @@ -53,7 +53,7 @@
</Joint>

<Body name="AxialRightShoulder" type="dynamic">
<offsetfrom>SaggitalRightShoulder</offsetfrom>
<offsetfrom>SagittalRightShoulder</offsetfrom>
<Translation>0 0 -0.329</Translation>
<RotationAxis>0 0 1 0</RotationAxis>
<Geom type="trimesh">
Expand All @@ -66,7 +66,7 @@
</Body>

<Joint circular="false" name="AxialRightShoulder" type="hinge">
<Body>SaggitalRightShoulder</Body>
<Body>SagittalRightShoulder</Body>
<Body>AxialRightShoulder</Body>
<offsetfrom>AxialRightShoulder</offsetfrom>
<weight>1.0</weight>
Expand Down
32 changes: 16 additions & 16 deletions openrave/teo/teo_rightLeg.kinbody.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@
<resolution>1</resolution>
</Joint>

<Body name="SaggitalRightHip" type="dynamic">
<Body name="SagittalRightHip" type="dynamic">
<offsetfrom>AxialRightHip</offsetfrom>
<Translation>0 0 -0.092</Translation>
<RotationAxis>0 0 1 0</RotationAxis>
<Geom type="trimesh">
<Render>wrls/SaggitalRightHip.wrl</Render>
<collision>wrls/SaggitalRightHip.wrl</collision>
<Render>wrls/SagittalRightHip.wrl</Render>
<collision>wrls/SagittalRightHip.wrl</collision>
</Geom>
<Mass type="custom">
<density>1</density>
</Mass>
</Body>

<Joint circular="false" name="SaggitalRightHip" type="hinge">
<Joint circular="false" name="SagittalRightHip" type="hinge">
<Body>AxialRightHip</Body>
<Body>SaggitalRightHip</Body>
<offsetfrom>SaggitalRightHip</offsetfrom>
<Body>SagittalRightHip</Body>
<offsetfrom>SagittalRightHip</offsetfrom>
<weight>1.0</weight>
<limitsdeg>-14.2 12.5</limitsdeg>
<axis>1 0 0</axis>
Expand All @@ -54,7 +54,7 @@
<Body name="FrontalRightHip" type="dynamic">
<Translation>0 0 0</Translation>
<RotationAxis>0 0 1 0</RotationAxis>
<offsetfrom>SaggitalRightHip</offsetfrom>
<offsetfrom>SagittalRightHip</offsetfrom>
<Geom type="trimesh">
<Render>wrls/FrontalRightHip.wrl</Render>
<collision>wrls/FrontalRightHip.wrl</collision>
Expand All @@ -65,7 +65,7 @@
</Body>

<Joint circular="false" name="FrontalRightHip" type="hinge">
<Body>SaggitalRightHip</Body>
<Body>SagittalRightHip</Body>
<Body>FrontalRightHip</Body>
<offsetfrom>FrontalRightHip</offsetfrom>
<weight>1.0</weight>
Expand Down Expand Up @@ -132,21 +132,21 @@
<resolution>1</resolution>
</Joint>

<Body name="SaggitalRightAnkle" type="dynamic">
<Body name="SagittalRightAnkle" type="dynamic">
<offsetfrom>FrontalRightAnkle</offsetfrom>
<Geom type="trimesh">
<Render>wrls/SaggitalRightAnkle.wrl</Render>
<collision>wrls/SaggitalRightAnkle.wrl</collision>
<Render>wrls/SagittalRightAnkle.wrl</Render>
<collision>wrls/SagittalRightAnkle.wrl</collision>
</Geom>
<Mass type="custom">
<density>10</density>
</Mass>
</Body>

<Joint circular="false" name="SaggitalRightAnkle" type="hinge">
<Joint circular="false" name="SagittalRightAnkle" type="hinge">
<Body>FrontalRightAnkle</Body>
<Body>SaggitalRightAnkle</Body>
<offsetfrom>SaggitalRightAnkle</offsetfrom>
<Body>SagittalRightAnkle</Body>
<offsetfrom>SagittalRightAnkle</offsetfrom>
<weight>1.0</weight>
<limitsdeg>-19.9 42.5</limitsdeg>
<axis>1 0 0</axis>
Expand All @@ -155,12 +155,12 @@
</Joint>

<Body name="RightLegTCP" type="dynamic">
<offsetfrom>SaggitalRightAnkle</offsetfrom>
<offsetfrom>SagittalRightAnkle</offsetfrom>
<Translation>0 0 -0.123</Translation>
</Body>

<Joint name="q5Man" type="hinge" enable="False">
<Body>SaggitalRightAnkle</Body>
<Body>SagittalRightAnkle</Body>
<Body>RightLegTCP</Body>
<limitsdeg>0 0</limitsdeg>
</Joint>
Expand Down
0 openrave/teo/wrls/SaggitalLeftAnkle.wrl → openrave/teo/wrls/SagittalLeftAnkle.wrl
View file
File renamed without changes.
0 openrave/teo/wrls/SaggitalLeftHip.wrl → openrave/teo/wrls/SagittalLeftHip.wrl
View file
File renamed without changes.
0 openrave/teo/wrls/SaggitalLeftShoulder.wrl → openrave/teo/wrls/SagittalLeftShoulder.wrl
View file
File renamed without changes.
0 openrave/teo/wrls/SaggitalRightAnkle.wrl → openrave/teo/wrls/SagittalRightAnkle.wrl
View file
File renamed without changes.
0 openrave/teo/wrls/SaggitalRightHip.wrl → openrave/teo/wrls/SagittalRightHip.wrl
View file
File renamed without changes.
0 openrave/teo/wrls/SaggitalRightShoulder.wrl → openrave/teo/wrls/SagittalRightShoulder.wrl
View file
File renamed without changes.

0 comments on commit fa8aa33

Please sign in to comment.