Update downstream callsites to use saveGltfCharacter

Differential Revision: D86017756

Author: yutingye

momentum/examples/animate_shapes/animate_shapes.cpp

@@ -87,7 +87,7 @@ int main(int argc, char* argv[]) {
     }
 
     // save the result
-    saveCharacter(
+    saveGltfCharacter(
         options->outFile,
         character,
         20.f,

momentum/examples/convert_model/convert_model.cpp

@@ -221,15 +221,15 @@ int main(int argc, char** argv) {
     } else if (oextension == ".glb" || oextension == ".gltf") {
       MT_LOGI("Saving gltf/glb file...");
       if (hasMotion) {
-        saveCharacter(
+        saveGltfCharacter(
             options->output_model_file,
             character,
             fps,
             {character.parameterTransform.name, poses},
             {character.skeleton.getJointNames(), offsets},
             markerSequence.frames);
       } else {
-        saveCharacter(options->output_model_file, character);
+        saveGltfCharacter(options->output_model_file, character);
       }
     }
     if (!options->output_locator_local.empty()) {

momentum/io/character_io.cpp

@@ -177,9 +177,9 @@ void saveCharacter(
 void saveCharacter(
     const filesystem::path& filename,
     const Character& character,
+    const float fps,
     std::span<const SkeletonState> skeletonStates,
-    const std::vector<std::vector<Marker>>& markerSequence,
-    float fps) {
+    const std::vector<std::vector<Marker>>& markerSequence) {
   // Parse format from file extension
   const auto format = parseCharacterFormat(filename);
   MT_THROW_IF(

momentum/io/character_io.h

@@ -69,7 +69,7 @@ void saveCharacter(
     const filesystem::path& filename,
     const Character& character,
     float fps,
-    const MatrixXf& motion /* = MatrixXf()*/,
+    const MatrixXf& motion = MatrixXf(),
     const std::vector<std::vector<Marker>>& markerSequence = {});
 
 /// High level function to save a character with motion in skeleton states and markers to any
@@ -85,7 +85,7 @@ void saveCharacter(
 void saveCharacter(
     const filesystem::path& filename,
     const Character& character,
-    std::span<const SkeletonState> skeletonStates,
-    const std::vector<std::vector<Marker>>& markerSequence = {},
-    float fps = 120.f);
+    float fps,
+    std::span<const SkeletonState> skeletonStates = {},
+    const std::vector<std::vector<Marker>>& markerSequence = {});
 } // namespace momentum

momentum/io/gltf/gltf_io.cpp

@@ -1325,19 +1325,6 @@ void saveGltfCharacter(
   GltfBuilder::save(model, filename, fileFormat, kEmbedResources);
 }
 
-void saveCharacter(
-    const filesystem::path& filename,
-    const Character& character,
-    const float fps,
-    const MotionParameters& motion,
-    const IdentityParameters& offsets,
-    const std::vector<std::vector<Marker>>& markerSequence,
-    const GltfFileFormat fileFormat,
-    const GltfOptions& options) {
-  return saveGltfCharacter(
-      filename, character, fps, motion, offsets, markerSequence, fileFormat, options);
-}
-
 void saveGltfCharacter(
     const filesystem::path& filename,
     const Character& character,
@@ -1354,18 +1341,6 @@ void saveGltfCharacter(
   GltfBuilder::save(model, filename, fileFormat, kEmbedResources);
 }
 
-void saveCharacter(
-    const filesystem::path& filename,
-    const Character& character,
-    const float fps,
-    std::span<const SkeletonState> skeletonStates,
-    const std::vector<std::vector<Marker>>& markerSequence,
-    const GltfFileFormat fileFormat,
-    const GltfOptions& options) {
-  return saveGltfCharacter(
-      filename, character, fps, skeletonStates, markerSequence, fileFormat, options);
-}
-
 std::vector<std::byte> saveCharacterToBytes(
     const Character& character,
     float fps,

momentum/io/gltf/gltf_io.h

@@ -108,22 +108,6 @@ fx::gltf::Document makeCharacterDocument(
     bool embedResource = true,
     const GltfOptions& options = GltfOptions());
 
-/// Saves character motion to a glb file.
-///
-/// @param[in] motion The model parameters representing the motion of the character (numModelParams,
-/// numFrames)
-/// @param[in] offsets Offset values per joint capturing the skeleton bone lengths using translation
-/// and scale offset (7*numJoints, 1)
-[[deprecated("Use saveGltfCharacter() instead")]] void saveCharacter(
-    const filesystem::path& filename,
-    const Character& character,
-    float fps = 120.0f,
-    const MotionParameters& motion = {},
-    const IdentityParameters& offsets = {},
-    const std::vector<std::vector<Marker>>& markerSequence = {},
-    GltfFileFormat fileFormat = GltfFileFormat::Extension,
-    const GltfOptions& options = GltfOptions());
-
 /// Saves character motion to a glb file.
 ///
 /// @param[in] motion The model parameters representing the motion of the character (numModelParams,
@@ -140,19 +124,6 @@ void saveGltfCharacter(
     GltfFileFormat fileFormat = GltfFileFormat::Extension,
     const GltfOptions& options = GltfOptions());
 
-/// Saves character skeleton states to a glb file.
-///
-/// @param[in] skeletonStates The skeleton states for each frame of the motion sequence (numFrames,
-/// numJoints, 8)
-[[deprecated("Use saveGltfCharacter() instead")]] void saveCharacter(
-    const filesystem::path& filename,
-    const Character& character,
-    float fps,
-    std::span<const SkeletonState> skeletonStates,
-    const std::vector<std::vector<Marker>>& markerSequence = {},
-    GltfFileFormat fileFormat = GltfFileFormat::Extension,
-    const GltfOptions& options = GltfOptions());
-
 /// Saves character skeleton states to a glb file.
 ///
 /// @param[in] skeletonStates The skeleton states for each frame of the motion sequence (numFrames,