Skip to content

Commit b7763d9

Browse files
authored
Merge pull request #2443 from jorisv/topic/fix_examples
Fix some examples
2 parents 5d591b5 + 4b8fbfa commit b7763d9

File tree

3 files changed

+9
-38
lines changed

3 files changed

+9
-38
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
2424
- Fix compilation issue with MSCV and C++17 ([#2437](https://github.com/stack-of-tasks/pinocchio/pull/2437))
2525
- Fix `pinocchio-test-py-robot_wrapper` when building with SDF and collision support ([#2437](https://github.com/stack-of-tasks/pinocchio/pull/2437))
2626
- Fix crash when calling `Inertia::FromDynamicParameters` in Python with wrong vector size ([#2296](https://github.com/stack-of-tasks/pinocchio/pull/2296))
27+
- Fix `examples/cassie-simulation.py` and `examples/talos-simulation.py` ([#2443](https://github.com/stack-of-tasks/pinocchio/pull/2443))
2728

2829
### Changed
2930

examples/cassie-simulation.py

+6-38
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,11 @@
11
from time import sleep
22

3+
import example_robot_data
34
import numpy as np
45
import pinocchio
5-
from example_robot_data import readParamsFromSrdf
6-
from pinocchio import JointModelFreeFlyer
7-
8-
model_dir = "/local/rbudhira/devel/install/sot/share/example-robot-data/robots/"
9-
# pinocchio_model_dir = join(dirname(dirname(str(abspath(__file__)))), "models")
10-
sdf_filename = model_dir + "cassie_description/robots/cassie.sdf"
11-
srdf_path = model_dir + "cassie_description/srdf/cassie_v2.srdf"
12-
package_dir = model_dir + "../../"
13-
14-
sdf_parent_guidance = [
15-
"left-roll-op",
16-
"left-yaw-op",
17-
"left-pitch-op",
18-
"left-knee-op",
19-
"left-tarsus-spring-joint",
20-
"left-foot-op",
21-
"right-roll-op",
22-
"right-yaw-op",
23-
"right-pitch-op",
24-
"right-knee-op",
25-
"right-tarsus-spring-joint",
26-
"right-foot-op",
27-
]
28-
29-
30-
robot = pinocchio.RobotWrapper.BuildFromSDF(
31-
sdf_filename,
32-
package_dirs=[package_dir],
33-
root_joint=JointModelFreeFlyer(),
34-
root_link_name="pelvis",
35-
parent_guidance=sdf_parent_guidance,
36-
)
37-
38-
robot.q0 = readParamsFromSrdf(
39-
robot.model, srdf_path, has_rotor_parameters=False, referencePose="standing"
40-
)
6+
from pinocchio.visualize import GepettoVisualizer
417

8+
robot = example_robot_data.load("cassie")
429

4310
constraint_models = robot.constraint_models
4411

@@ -92,9 +59,10 @@
9259
mid_point /= 4.0
9360

9461

95-
robot.initDisplay(loadModel=True)
62+
robot.setVisualizer(GepettoVisualizer())
63+
robot.initViewer()
64+
robot.loadViewerModel("pinocchio")
9665
gui = robot.viewer.gui
97-
9866
robot.display(robot.q0)
9967
q0 = robot.q0.copy()
10068
constraint_datas = pinocchio.StdVec_RigidConstraintData()

examples/talos-simulation.py

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import example_robot_data
44
import numpy as np
55
import pinocchio
6+
from pinocchio.visualize import GepettoVisualizer
67

78
robot = example_robot_data.load("talos")
89
model = robot.model
@@ -53,6 +54,7 @@
5354
pinocchio.rpy.rpyToMatrix(np.array([0, -np.pi / 2, 0.0])), np.array([0.6, 0.4, 1.0])
5455
)
5556

57+
robot.setVisualizer(GepettoVisualizer())
5658
robot.initViewer()
5759
robot.loadViewerModel("pinocchio")
5860
gui = robot.viewer.gui

0 commit comments

Comments
 (0)