UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ue] Fix compilation for UE 5+, closes #2328

Browse Source
This commit is contained in:
Mario Zechner 2023-07-31 09:58:38 +02:00
parent b309eac3ff
commit d67362b0ed
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp
View File

@ -318,9 +318,9 @@ SkeletonData *USpineSkeletonDataAsset::GetSkeletonData(Atlas *Atlas) {
void USpineSkeletonDataAsset::SetMixes(AnimationStateData *animationStateData) { void USpineSkeletonDataAsset::SetMixes(AnimationStateData *animationStateData) {
for (auto &data : MixData) { for (auto &data : MixData) {
if (!data.From.IsEmpty() && !data.To.IsEmpty()) { if (!data.From.IsEmpty() && !data.To.IsEmpty()) {
const char *fromChar = TCHAR_TO_UTF8(*data.From); std::string fromChar = TCHAR_TO_UTF8(*data.From);
const char *toChar = TCHAR_TO_UTF8(*data.To); std::string toChar = TCHAR_TO_UTF8(*data.To);
animationStateData->setMix(fromChar, toChar, data.Mix); animationStateData->setMix(fromChar.c_str(), toChar.c_str(), data.Mix);
} }
} }
animationStateData->setDefaultMix(DefaultMix); animationStateData->setDefaultMix(DefaultMix);

1
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineWidget.h
View File

@ -33,6 +33,7 @@
#include "Runtime/UMG/Public/UMG.h" #include "Runtime/UMG/Public/UMG.h"
#include "Runtime/UMG/Public/UMGStyle.h" #include "Runtime/UMG/Public/UMGStyle.h"
#include "SpineSkeletonDataAsset.h" #include "SpineSkeletonDataAsset.h"
#include "SpineSkeletonAnimationComponent.h"
#include "spine/spine.h" #include "spine/spine.h"
#include "SpineWidget.generated.h" #include "SpineWidget.generated.h"
// clang-format on // clang-format on