Skip to content

Commit a48cc97

Browse files
authored
[meshcat] Track breaking change in newer meshcat's three.js (#22975)
- change capsule 'length' to 'height'
1 parent 0ec2957 commit a48cc97

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

geometry/meshcat.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ class MeshcatShapeReifier : public ShapeReifier {
589589
auto geometry = std::make_unique<internal::CapsuleGeometryData>();
590590
geometry->uuid = uuid_generator_.GenerateRandom();
591591
geometry->radius = capsule.radius();
592-
geometry->length = capsule.length();
592+
geometry->height = capsule.length();
593593
lumped.geometry = std::move(geometry);
594594

595595
// Meshcat cylinders have their long axis in y.

geometry/meshcat_types_internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ struct CapsuleGeometryData : public GeometryData {
211211
// For a complete description of these parameters see:
212212
// https://threejs.org/docs/#api/en/geometries/CapsuleGeometry
213213
double radius{};
214-
double length{};
214+
double height{};
215215
double radialSegments{20}; // Number of segmented faces around the
216216
// circumference of the capsule.
217217
double capSegments{10}; // Number of curve segments used to build
@@ -224,7 +224,7 @@ struct CapsuleGeometryData : public GeometryData {
224224
o.pack("CapsuleGeometry");
225225
PACK_MAP_VAR(o, uuid);
226226
PACK_MAP_VAR(o, radius);
227-
PACK_MAP_VAR(o, length);
227+
PACK_MAP_VAR(o, height);
228228
PACK_MAP_VAR(o, radialSegments);
229229
PACK_MAP_VAR(o, capSegments);
230230
}

0 commit comments

Comments
 (0)