From 1f0f1b937ac88534152e3e759229d99d7064a7d3 Mon Sep 17 00:00:00 2001 From: Guillaume Blanc Date: Fri, 24 Nov 2023 08:33:46 +0100 Subject: [PATCH 1/4] Updates fbx sdk url --- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 30379e681..e5eba112c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -80,7 +80,7 @@ jobs: run: | mkdir fbx cd fbx - sudo wget --user-agent='Mozilla/5.0' 'https://www.autodesk.com/content/dam/autodesk/www/adn/fbx/2020-2/fbx20202_fbxsdk_linux.tar.gz' -O 'fbx.tar.gz' + sudo wget --user-agent='Mozilla/5.0' 'https://damassets.autodesk.net/content/dam/autodesk/www/adn/fbx/2020-2/fbx20202_fbxsdk_linux.tar.gz' -O 'fbx.tar.gz' sudo tar -xf 'fbx.tar.gz' (yes yes | sudo ./*_fbxsdk_linux /usr/local) || true sudo chmod -R 755 /usr/local/lib diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 540e569bb..8678850ea 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -19,7 +19,7 @@ jobs: run: | mkdir fbx cd fbx - sudo wget --user-agent='Mozilla/5.0' 'https://www.autodesk.com/content/dam/autodesk/www/adn/fbx/2020-0-1/fbx202001_fbxsdk_clang_mac.pkg.tgz' -O 'fbx.tgz' + sudo wget --user-agent='Mozilla/5.0' 'https://damassets.autodesk.net/content/dam/autodesk/www/adn/fbx/2020-0-1/fbx202001_fbxsdk_clang_mac.pkg.tgz' -O 'fbx.tgz' sudo tar -xf 'fbx.tgz' sudo installer -pkg *_fbxsdk_clang_macos.pkg -target / cd .. diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6923411fb..b809cda80 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,7 +19,7 @@ jobs: run: | md fbx cd fbx - Start-BitsTransfer -Source 'https://www.autodesk.com/content/dam/autodesk/www/adn/fbx/2020-2/fbx20202_fbxsdk_vs2019_win.exe' -Destination 'fbxsdk.exe' + Start-BitsTransfer -Source 'https://damassets.autodesk.net/content/dam/autodesk/www/adn/fbx/2020-3-4/fbx202034_fbxsdk_vs2019_win.exe' -Destination 'fbxsdk.exe' Start-Process -FilePath 'fbxsdk.exe' /S -Wait cd .. From 67785ddc184638f25c8db47c67ae9cca1ba53816 Mon Sep 17 00:00:00 2001 From: Guillaume Blanc Date: Thu, 23 Nov 2023 22:17:32 +0100 Subject: [PATCH 2/4] Simplify ik aim test --- test/animation/runtime/ik_aim_job_tests.cc | 37 +++++----------------- 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/test/animation/runtime/ik_aim_job_tests.cc b/test/animation/runtime/ik_aim_job_tests.cc index 21bf35367..40f827a5e 100644 --- a/test/animation/runtime/ik_aim_job_tests.cc +++ b/test/animation/runtime/ik_aim_job_tests.cc @@ -25,15 +25,13 @@ // // //----------------------------------------------------------------------------// +#include "gtest/gtest.h" #include "ozz/animation/runtime/ik_aim_job.h" - +#include "ozz/base/maths/gtest_math_helper.h" #include "ozz/base/maths/quaternion.h" #include "ozz/base/maths/simd_math.h" #include "ozz/base/maths/simd_quaternion.h" -#include "gtest/gtest.h" -#include "ozz/base/maths/gtest_math_helper.h" - TEST(JobValidity, IKAimJob) { const ozz::math::Float4x4 joint = ozz::math::Float4x4::identity(); ozz::math::SimdQuaternion quat; @@ -428,43 +426,24 @@ TEST(Twist, IKAimJob) { EXPECT_SIMDQUATERNION_EQ_TOL(quat, 0.f, 0.f, 0.f, 1.f, 2e-3f); } - { // Pole y, twist pi + { // Pole y, twist pi / 2 job.pole_vector = ozz::math::simd_float4::y_axis(); - job.twist_angle = ozz::math::kPi; + job.twist_angle = ozz::math::kPi_2; EXPECT_TRUE(job.Run()); const ozz::math::Quaternion x_Pi = ozz::math::Quaternion::FromAxisAngle( - ozz::math::Float3::x_axis(), -ozz::math::kPi); + ozz::math::Float3::x_axis(), ozz::math::kPi_2); EXPECT_SIMDQUATERNION_EQ_TOL(quat, x_Pi.x, x_Pi.y, x_Pi.z, x_Pi.w, 2e-3f); } - { // Pole y, twist -pi + { // Pole y, twist -pi / 2 job.pole_vector = ozz::math::simd_float4::y_axis(); - job.twist_angle = -ozz::math::kPi; + job.twist_angle = -ozz::math::kPi_2; EXPECT_TRUE(job.Run()); const ozz::math::Quaternion x_mPi = ozz::math::Quaternion::FromAxisAngle( - ozz::math::Float3::x_axis(), -ozz::math::kPi); + ozz::math::Float3::x_axis(), -ozz::math::kPi_2); EXPECT_SIMDQUATERNION_EQ_TOL(quat, x_mPi.x, x_mPi.y, x_mPi.z, x_mPi.w, 2e-3f); } - - { // Pole y, twist pi/2 - job.pole_vector = ozz::math::simd_float4::y_axis(); - job.twist_angle = ozz::math::kPi_2; - EXPECT_TRUE(job.Run()); - const ozz::math::Quaternion x_Pi_2 = ozz::math::Quaternion::FromAxisAngle( - ozz::math::Float3::x_axis(), ozz::math::kPi_2); - EXPECT_SIMDQUATERNION_EQ_TOL(quat, x_Pi_2.x, x_Pi_2.y, x_Pi_2.z, x_Pi_2.w, - 2e-3f); - } - - { // Pole z, twist pi/2 - job.pole_vector = ozz::math::simd_float4::z_axis(); - job.twist_angle = ozz::math::kPi_2; - EXPECT_TRUE(job.Run()); - const ozz::math::Quaternion x_Pi = ozz::math::Quaternion::FromAxisAngle( - ozz::math::Float3::x_axis(), ozz::math::kPi); - EXPECT_SIMDQUATERNION_EQ_TOL(quat, x_Pi.x, x_Pi.y, x_Pi.z, x_Pi.w, 2e-3f); - } } TEST(AlignedTargetUp, IKAimJob) { From 085835f62eb619f6faa26941581a154fa95407ac Mon Sep 17 00:00:00 2001 From: Jiajun <75730859+T-rvw@users.noreply.github.com> Date: Fri, 24 Nov 2023 20:22:46 +0800 Subject: [PATCH 3/4] Adds vs2022 compiler support for fbxsdk (#170) --- build-utils/cmake/modules/FindFbx.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-utils/cmake/modules/FindFbx.cmake b/build-utils/cmake/modules/FindFbx.cmake index f3bebe005..2d007a754 100644 --- a/build-utils/cmake/modules/FindFbx.cmake +++ b/build-utils/cmake/modules/FindFbx.cmake @@ -67,7 +67,9 @@ function(FindFbxLibrariesGeneric _FBX_ROOT_DIR _OUT_FBX_LIBRARIES _OUT_FBX_LIBRA # Figures out matching compiler/os directory. if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC") - if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.20) + if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.30) + set(FBX_CP_PATH "vs2022") + elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.20) set(FBX_CP_PATH "vs2019") elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) set(FBX_CP_PATH "vs2017") From 74e8b3f9050bb1483526b840f51848fe52325ba3 Mon Sep 17 00:00:00 2001 From: Guillaume Blanc Date: Fri, 24 Nov 2023 13:26:47 +0100 Subject: [PATCH 4/4] Switches fbx sdk to vs 2022 --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b809cda80..2848ea53a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,7 +19,7 @@ jobs: run: | md fbx cd fbx - Start-BitsTransfer -Source 'https://damassets.autodesk.net/content/dam/autodesk/www/adn/fbx/2020-3-4/fbx202034_fbxsdk_vs2019_win.exe' -Destination 'fbxsdk.exe' + Start-BitsTransfer -Source 'https://damassets.autodesk.net/content/dam/autodesk/www/adn/fbx/2020-3-4/fbx202034_fbxsdk_vs2022_win.exe' -Destination 'fbxsdk.exe' Start-Process -FilePath 'fbxsdk.exe' /S -Wait cd ..