Cleanup

Author: yohjimane

src/xrAnimation/AGENT_NEXT_STEPS.md

@@ -1,7 +1 @@
 # AGENT_NEXT_STEPS
-
-## Align OMF → ozz Animation Conversion with Blender-XRay Workflow
-- Blender-XRay bakes animations in local joint space using parent-inverted matrices plus a +90° X rotation (MATRIX_BONE) before writing keys. Our converter currently does `inv_bind * parent_bind`, which leaves animations in mixed spaces.
-- In `ConvertSingleMotionWithBindMatrices`, switch to computing local transforms exactly like Blender-XRay: `local = parent_bind.inverted() * child_bind` (root uses the same +90° basis), then decompose.
-- Apply the consistent axis remap `(X, Y, Z) → (X, -Z, Y)` and matching quaternion reorder/sign adjustments when writing translation and rotation keys (use `TransformConverter` helpers).
-- Re-run the bind pose + animation frame comparisons (with `OZZ_SAMPLE_RATIO` for frame alignment) to confirm positional/rotational deltas drop near zero.

src/xrAnimation/CMakeLists.txt

@@ -13,6 +13,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../xrEngine
     ${CMAKE_CURRENT_SOURCE_DIR}/../Common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/ozz-animation/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/ozz-animation/samples
     ${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/imgui
     ${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/imgui-proj
 )
@@ -65,4 +66,4 @@ install(TARGETS xrAnimation
 add_subdirectory(tests)
 
 # Add tools
-add_subdirectory(tools)
+add_subdirectory(tools)

src/xrAnimation/tests/CMakeLists.txt

@@ -3,21 +3,27 @@ cmake_minimum_required(VERSION 3.8)
 add_executable(xrAnimation_converter_tests
     test_converter.cpp)
 
+# Resolve ozz samples include directory (submodule lives alongside xray-16).
+get_filename_component(OZZ_SAMPLES_ROOT ${CMAKE_SOURCE_DIR}/../ozz-animation/samples ABSOLUTE)
+
 # Provide include paths for dependency headers.
 target_include_directories(xrAnimation_converter_tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/..
-    ${CMAKE_SOURCE_DIR}/Externals/ozz-animation/include)
+    ${CMAKE_SOURCE_DIR}/Externals/ozz-animation/include
+    ${OZZ_SAMPLES_ROOT})
 
 target_link_libraries(xrAnimation_converter_tests PRIVATE
+    xrAnimation
     ozz_animation
-    ozz_base)
+    ozz_animation_offline
+    ozz_base
+    xrEngine
+    xrScriptEngine)
 
 target_compile_features(xrAnimation_converter_tests PRIVATE cxx_std_17)
 
-get_filename_component(XRAY_WORKSPACE_ROOT ${CMAKE_SOURCE_DIR} DIRECTORY)
-
 target_compile_definitions(xrAnimation_converter_tests PRIVATE
-    WORKSPACE_ROOT="${XRAY_WORKSPACE_ROOT}")
+    PROJECT_ROOT="${CMAKE_SOURCE_DIR}")
 
 set_target_properties(xrAnimation_converter_tests PROPERTIES
     FOLDER "xrAnimation/Tests")

src/xrAnimation/tests/test_converter.cpp

@@ -14,8 +14,8 @@
 #include <type_traits>
 #include <vector>
 
-#ifndef WORKSPACE_ROOT
-#error "WORKSPACE_ROOT compile definition must be provided"
+#ifndef PROJECT_ROOT
+#error "PROJECT_ROOT compile definition must be provided"
 #endif
 
 #ifdef _WIN32
@@ -33,30 +33,31 @@
 #include "ozz/base/maths/soa_transform.h"
 #include "ozz/base/maths/transform.h"
 
+
 namespace fs = std::filesystem;
 
 namespace
 {
 
-fs::path WorkspaceRoot()
+fs::path ProjectRoot()
 {
-    static const fs::path root = fs::path(WORKSPACE_ROOT);
+    static const fs::path root = fs::path(PROJECT_ROOT);
     return root;
 }
 
 fs::path TestArtifactsDir()
 {
-    return WorkspaceRoot() / "asset_tests" / "test_outputs";
+    return ProjectRoot() / "asset_tests" / "test_outputs";
 }
 
 fs::path SkeletonInputPath()
 {
-    return WorkspaceRoot() / "xray-16" / "res" / "testdata" / "stalker_hero_1.ogf";
+    return ProjectRoot() / "res" / "testdata" / "stalker_hero_1.ogf";
 }
 
 fs::path AnimationInputPath()
 {
-    return WorkspaceRoot() / "xray-16" / "res" / "testdata" / "critical_hit_grup_1.omf";
+    return ProjectRoot() / "res" / "testdata" / "critical_hit_grup_1.omf";
 }
 
 fs::path SkeletonOutputPath()
@@ -69,6 +70,11 @@ fs::path SkeletonCsvPath()
     return TestArtifactsDir() / "stalker_hero_bind_pose.csv";
 }
 
+fs::path BaselineDir()
+{
+    return ProjectRoot() / "src" / "xrAnimation" / "tests" / "baselines";
+}
+
 fs::path AnimationOutputPath()
 {
     return TestArtifactsDir() / "critical_hit_grup_1.ozz";
@@ -240,15 +246,9 @@ std::string QuoteForShell(const std::string& value)
 #endif
 }
 
-fs::path ResolveConverterBinary()
+fs::path ResolveBinary(const std::string& executable_name)
 {
-#ifdef _WIN32
-    const std::string executable_name = "xray_to_ozz_converter.exe";
-#else
-    const std::string executable_name = "xray_to_ozz_converter";
-#endif
-
-    const fs::path build_bin = WorkspaceRoot() / "xray-16" / "ozz_utils" / "bin";
+    const fs::path build_bin = ProjectRoot() / "ozz_utils" / "bin";
 
     const std::array<fs::path, 2> candidates = {
         build_bin / "Debug" / executable_name,
@@ -261,19 +261,37 @@ fs::path ResolveConverterBinary()
     }
 
     std::ostringstream oss;
-    oss << "Unable to locate xray_to_ozz_converter binary. Checked:";
+    oss << "Unable to locate binary '" << executable_name << "'. Checked:";
     for (const auto& candidate : candidates)
         oss << '\n' << "  " << candidate.string();
     throw std::runtime_error(oss.str());
 }
 
-std::string BuildCommand(const std::vector<std::string>& args)
+fs::path ResolveConverterBinary()
 {
-    const fs::path converter = ResolveConverterBinary();
-    const fs::path converter_dir = converter.parent_path();
+#ifdef _WIN32
+    return ResolveBinary("xray_to_ozz_converter.exe");
+#else
+    return ResolveBinary("xray_to_ozz_converter");
+#endif
+}
+
+fs::path ResolveViewerBinary()
+{
+#ifdef _WIN32
+    return ResolveBinary("ozz_animation_viewer.exe");
+#else
+    return ResolveBinary("ozz_animation_viewer");
+#endif
+}
+
+std::string BuildCommand(const fs::path& binary,
+                         const std::vector<std::string>& args)
+{
+    const fs::path binary_dir = binary.parent_path();
 
 #ifdef _WIN32
-    std::string command = QuoteForShell(converter.string());
+    std::string command = QuoteForShell(binary.string());
     for (const std::string& arg : args)
     {
         command.push_back(' ');
@@ -282,9 +300,9 @@ std::string BuildCommand(const std::vector<std::string>& args)
     return command;
 #else
     std::string command = "LD_LIBRARY_PATH=";
-    command.append(QuoteForShell(converter_dir.string()));
+    command.append(QuoteForShell(binary_dir.string()));
     command.push_back(' ');
-    command.append(QuoteForShell(converter.string()));
+    command.append(QuoteForShell(binary.string()));
     for (const std::string& arg : args)
     {
         command.push_back(' ');
@@ -294,9 +312,10 @@ std::string BuildCommand(const std::vector<std::string>& args)
 #endif
 }
 
-int ExecuteCommand(const std::vector<std::string>& args)
+int ExecuteCommand(const fs::path& binary,
+                   const std::vector<std::string>& args)
 {
-    const std::string command = BuildCommand(args);
+    const std::string command = BuildCommand(binary, args);
     const int result = std::system(command.c_str());
     if (result == -1)
         return -1;
@@ -312,6 +331,11 @@ int ExecuteCommand(const std::vector<std::string>& args)
 #endif
 }
 
+int ExecuteConverterCommand(const std::vector<std::string>& args)
+{
+    return ExecuteCommand(ResolveConverterBinary(), args);
+}
+
 bool ConvertSkeleton(bool force)
 {
     const fs::path output_dir = TestArtifactsDir();
@@ -333,7 +357,7 @@ bool ConvertSkeleton(bool force)
         "--dump-bind",
         SkeletonCsvPath().string()};
 
-    const int exit_code = ExecuteCommand(args);
+    const int exit_code = ExecuteConverterCommand(args);
     if (exit_code != 0)
     {
         std::cerr << "xray_to_ozz_converter returned exit code " << exit_code << std::endl;
@@ -378,7 +402,7 @@ bool ConvertAnimation(bool force)
         "--metadata",
         AnimationMetadataPath().string()};
 
-    const int exit_code = ExecuteCommand(args);
+    const int exit_code = ExecuteConverterCommand(args);
     if (exit_code != 0)
     {
         std::cerr << "animation conversion failed with exit code " << exit_code << std::endl;
@@ -411,7 +435,7 @@ bool ConvertSpecificMotion(const std::string& motion_name, bool force)
         "--motion",
         motion_name};
 
-    const int exit_code = ExecuteCommand(args);
+    const int exit_code = ExecuteConverterCommand(args);
     if (exit_code != 0)
     {
         std::cerr << "animation conversion for motion '" << motion_name

src/xrAnimation/tools/ozz_animation_viewer.cpp

@@ -772,9 +772,9 @@ class PlaybackSampleApplication : public ozz::sample::Application {
             ozz::math::StorePtrU(quat_simd, quat);
 
             std::array<std::string, 7> value_strings = {
-                FormatFloat(tx, 3), FormatFloat(ty, 3), FormatFloat(tz, 3),
-                FormatFloat(quat[3], 4), FormatFloat(quat[0], 4),
-                FormatFloat(quat[1], 4), FormatFloat(quat[2], 4)};
+                FormatFloat(tx), FormatFloat(ty), FormatFloat(tz),
+                FormatFloat(quat[3]), FormatFloat(quat[0]),
+                FormatFloat(quat[1]), FormatFloat(quat[2])};
 
             std::ostringstream row_stream;
             row_stream.imbue(std::locale::classic());