dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-07-09 17:25:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update fusion to 1.3.0

Browse Source
This commit is contained in:
Megamouse 2026-07-08 07:57:14 +02:00
parent 5c90bf5865
commit bb5dc93bec
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/fusion/fusion vendored

@ -1 +1 @@
Subproject commit 008e03eac0ac1d5f85e16f5fcaefdda3fee75cb8 Subproject commit a853d08a858986b1f27c35a6f37f8458226330b3

8
3rdparty/fusion/fusion.vcxproj vendored
View File

@ -13,17 +13,17 @@
<ItemGroup> <ItemGroup>
<ClInclude Include="fusion\Fusion\Fusion.h" /> <ClInclude Include="fusion\Fusion\Fusion.h" />
<ClInclude Include="fusion\Fusion\FusionAhrs.h" /> <ClInclude Include="fusion\Fusion\FusionAhrs.h" />
<ClInclude Include="fusion\Fusion\FusionAxes.h" /> <ClInclude Include="fusion\Fusion\FusionBias.h" />
<ClInclude Include="fusion\Fusion\FusionCalibration.h" />
<ClInclude Include="fusion\Fusion\FusionCompass.h" /> <ClInclude Include="fusion\Fusion\FusionCompass.h" />
<ClInclude Include="fusion\Fusion\FusionConvention.h" /> <ClInclude Include="fusion\Fusion\FusionConvention.h" />
<ClInclude Include="fusion\Fusion\FusionMath.h" /> <ClInclude Include="fusion\Fusion\FusionMath.h" />
<ClInclude Include="fusion\Fusion\FusionOffset.h" /> <ClInclude Include="fusion\Fusion\FusionModel.h" />
<ClInclude Include="fusion\Fusion\FusionRemap.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="fusion\Fusion\FusionAhrs.c" /> <ClCompile Include="fusion\Fusion\FusionAhrs.c" />
<ClCompile Include="fusion\Fusion\FusionBias.c" />
<ClCompile Include="fusion\Fusion\FusionCompass.c" /> <ClCompile Include="fusion\Fusion\FusionCompass.c" />
<ClCompile Include="fusion\Fusion\FusionOffset.c" />
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<RootNamespace>Fusion</RootNamespace> <RootNamespace>Fusion</RootNamespace>

8
3rdparty/fusion/fusion.vcxproj.filters vendored
View File

@ -8,12 +8,12 @@
<ItemGroup> <ItemGroup>
<ClInclude Include="fusion\Fusion\Fusion.h" /> <ClInclude Include="fusion\Fusion\Fusion.h" />
<ClInclude Include="fusion\Fusion\FusionAhrs.h" /> <ClInclude Include="fusion\Fusion\FusionAhrs.h" />
<ClInclude Include="fusion\Fusion\FusionAxes.h" />
<ClInclude Include="fusion\Fusion\FusionCalibration.h" />
<ClInclude Include="fusion\Fusion\FusionCompass.h" /> <ClInclude Include="fusion\Fusion\FusionCompass.h" />
<ClInclude Include="fusion\Fusion\FusionConvention.h" /> <ClInclude Include="fusion\Fusion\FusionConvention.h" />
<ClInclude Include="fusion\Fusion\FusionMath.h" /> <ClInclude Include="fusion\Fusion\FusionMath.h" />
<ClInclude Include="fusion\Fusion\FusionOffset.h" /> <ClInclude Include="fusion\Fusion\FusionBias.h" />
<ClInclude Include="fusion\Fusion\FusionModel.h" />
<ClInclude Include="fusion\Fusion\FusionRemap.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="fusion\Fusion\FusionAhrs.c"> <ClCompile Include="fusion\Fusion\FusionAhrs.c">
@ -22,7 +22,7 @@
<ClCompile Include="fusion\Fusion\FusionCompass.c"> <ClCompile Include="fusion\Fusion\FusionCompass.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="fusion\Fusion\FusionOffset.c"> <ClCompile Include="fusion\Fusion\FusionBias.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>

5
rpcs3/Emu/Io/PadHandler.cpp
View File

@ -979,7 +979,7 @@ void PadDevice::reset_orientation()
ahrs->settings.convention = FusionConvention::FusionConventionEnu; ahrs->settings.convention = FusionConvention::FusionConventionEnu;
ahrs->settings.gain = 0.0f; // If gain is set, the algorithm tries to adjust the orientation over time. ahrs->settings.gain = 0.0f; // If gain is set, the algorithm tries to adjust the orientation over time.
FusionAhrsSetSettings(ahrs.get(), &ahrs->settings); FusionAhrsSetSettings(ahrs.get(), &ahrs->settings);
FusionAhrsReset(ahrs.get()); FusionAhrsRestart(ahrs.get());
} }
void PadDevice::update_orientation(ps_move_data& move_data) void PadDevice::update_orientation(ps_move_data& move_data)
@ -1028,7 +1028,8 @@ void PadDevice::update_orientation(ps_move_data& move_data)
} }
// Update Fusion // Update Fusion
FusionAhrsUpdate(ahrs.get(), gyroscope, accelerometer, magnetometer, elapsed_sec); FusionAhrsSetSamplePeriod(ahrs.get(), elapsed_sec);
FusionAhrsUpdate(ahrs.get(), gyroscope, accelerometer, magnetometer);
// Get quaternion // Get quaternion
const FusionQuaternion quaternion = FusionAhrsGetQuaternion(ahrs.get()); const FusionQuaternion quaternion = FusionAhrsGetQuaternion(ahrs.get());