Skip to content

Add parameterized constructor for FileSaveOptions Python binding #825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yutingye wants to merge 1 commit into from
Closed

Add parameterized constructor for FileSaveOptions Python binding #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 51 additions & 10 deletions pymomentum/geometry/geometry_pybind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ PYBIND11_MODULE(geometry, m) {
py::arg("collisions") = true,
py::arg("locators") = true,
py::arg("mesh") = true,
py::arg("blendShapes") = true)
py::arg("blend_shapes") = true)
.def(
"__repr__",
[](const mm::GltfOptions& self) {
Expand Down Expand Up @@ -493,19 +493,19 @@ The resulting tensors are as follows:
const momentum::FbxCoordSystem coordSystem) {
return momentum::FbxCoordSystemInfo{upVector, frontVector, coordSystem};
}),
py::arg("upVector"),
py::arg("frontVector"),
py::arg("coordSystem"))
py::arg("up_vector"),
py::arg("front_vector"),
py::arg("coord_system"))
.def_property_readonly(
"upVector",
"up_vector",
[](const mm::FbxCoordSystemInfo& coordSystemInfo) { return coordSystemInfo.upVector; },
"Returns the up vector.")
.def_property_readonly(
"frontVector",
"front_vector",
[](const mm::FbxCoordSystemInfo& coordSystemInfo) { return coordSystemInfo.frontVector; },
"Returns the front vector.")
.def_property_readonly(
"coordSystem",
"coord_system",
[](const mm::FbxCoordSystemInfo& coordSystemInfo) { return coordSystemInfo.coordSystem; },
"Returns the coordinate system.")
.def("__repr__", [](const mm::FbxCoordSystemInfo& info) {
Expand Down Expand Up @@ -565,7 +565,48 @@ The resulting tensors are as follows:
// - GLTF-specific: extensions, gltfFileFormat
// =====================================================

fileSaveOptionsClass.def(py::init<>())
fileSaveOptionsClass
.def(
py::init([](bool mesh,
bool locators,
bool collisions,
bool blendShapes,
bool permissive,
mm::FbxCoordSystemInfo coordSystemInfo,
std::string_view fbxNamespace,
bool extensions,
mm::GltfFileFormat gltfFileFormat) {
mm::FileSaveOptions options;
options.mesh = mesh;
options.locators = locators;
options.collisions = collisions;
options.blendShapes = blendShapes;
options.permissive = permissive;
options.coordSystemInfo = coordSystemInfo;
options.fbxNamespace = fbxNamespace;
options.extensions = extensions;
options.gltfFileFormat = gltfFileFormat;
return options;
}),
py::arg("mesh") = true,
py::arg("locators") = true,
py::arg("collisions") = true,
py::arg("blend_shapes") = true,
py::arg("permissive") = false,
py::arg("coord_system_info") = mm::FbxCoordSystemInfo{},
py::arg("fbx_namespace") = "",
py::arg("extensions") = true,
py::arg("gltf_file_format") = mm::GltfFileFormat::Auto,
"Create FileSaveOptions with custom settings.\n\n"
":param mesh: Include mesh geometry in the output (default: True)\n"
":param locators: Include locators in the output (default: True)\n"
":param collisions: Include collision geometry in the output (default: True)\n"
":param blend_shapes: Include blend shapes in the output (default: True)\n"
":param permissive: Permissive mode - allow saving mesh-only characters without skin weights (default: False)\n"
":param coord_system_info: FBX coordinate system configuration (default: Maya Y-up)\n"
":param fbx_namespace: Optional namespace prefix for FBX node names (default: empty)\n"
":param extensions: Enable GLTF extensions (default: True)\n"
":param gltf_file_format: GLTF file format selection (default: Auto)\n")
.def_readwrite(
"mesh", &mm::FileSaveOptions::mesh, "Include mesh geometry in the output (default: true)")
.def_readwrite(
Expand Down Expand Up @@ -667,8 +708,8 @@ The resulting tensors are as follows:
coordSystemStr);

return fmt::format(
"FileSaveOptions(mesh={}, locators={}, collisions={}, blendShapes={}, permissive={}, "
"coord_system_info={}, fbx_namespace='{}', extensions={}, gltfFileFormat={})",
"FileSaveOptions(mesh={}, locators={}, collisions={}, blend_shapes={}, permissive={}, "
"coord_system_info={}, fbx_namespace='{}', extensions={}, gltf_file_format={})",
opts.mesh,
opts.locators,
opts.collisions,
Expand Down
7 changes: 4 additions & 3 deletions pymomentum/geometry/gltf_builder_pybind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,12 @@ Setting this value will affect subsequently added motions and animations.
const mm::Character& character,
const std::optional<Eigen::Vector3f>& positionOffset,
const std::optional<Eigen::Vector4f>& rotationOffset,
const mm::GltfOptions& options) {
const std::optional<mm::GltfOptions>& options) {
// Use defaults if not provided
Eigen::Vector3f actualPositionOffset = positionOffset.value_or(Eigen::Vector3f::Zero());
Eigen::Vector4f actualRotationOffset =
rotationOffset.value_or(Eigen::Vector4f(0.0f, 0.0f, 0.0f, 1.0f));
mm::GltfOptions actualOptions = options.value_or(mm::GltfOptions{});

// Convert Vector4f (x,y,z,w) to Quaternionf (w,x,y,z)
mm::Quaternionf quaternionOffset(
Expand All @@ -95,7 +96,7 @@ Setting this value will affect subsequently added motions and animations.
actualRotationOffset[1], // y
actualRotationOffset[2]); // z

builder.addCharacter(character, actualPositionOffset, quaternionOffset, options);
builder.addCharacter(character, actualPositionOffset, quaternionOffset, actualOptions);
},
R"(Add a character to the GLTF scene.

Expand All @@ -113,7 +114,7 @@ can be provided as an initial transform for the character.
py::arg("character"),
py::arg("position_offset") = std::nullopt,
py::arg("rotation_offset") = std::nullopt,
py::arg("options") = mm::GltfOptions{})
py::arg("options") = std::nullopt)
.def(
"add_mesh",
&mm::GltfBuilder::addMesh,
Expand Down
Loading