UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.7' into 3.8-beta

Browse Source
This commit is contained in:
badlogic 2019-03-07 17:23:07 +01:00
commit 492a977f04
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Private/SpineSkeletonImportFactory.cpp
View File

@ -81,9 +81,9 @@ UObject* USpineSkeletonAssetFactory::FactoryCreateFile (UClass * InClass, UObjec
if (!FFileHelper::LoadFileToArray(rawData, *Filename, 0)) { if (!FFileHelper::LoadFileToArray(rawData, *Filename, 0)) {
return nullptr; return nullptr;
} }
asset->SetSkeletonDataFileName(FName(*Filename));
asset->SetRawData(rawData); asset->SetRawData(rawData);
asset->SetSkeletonDataFileName(FName(*Filename));
const FString longPackagePath = FPackageName::GetLongPackagePath(asset->GetOutermost()->GetPathName()); const FString longPackagePath = FPackageName::GetLongPackagePath(asset->GetOutermost()->GetPathName());
LoadAtlas(Filename, longPackagePath); LoadAtlas(Filename, longPackagePath);
return asset; return asset;

4
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonAnimationComponent.cpp
View File

@ -97,13 +97,13 @@ void USpineSkeletonAnimationComponent::InternalTick(float DeltaTime, bool CallDe
if (state && bAutoPlaying) { if (state && bAutoPlaying) {
if (lastPreviewAnimation != PreviewAnimation) { if (lastPreviewAnimation != PreviewAnimation) {
if (PreviewAnimation != "") SetAnimation(0, TCHAR_TO_UTF8(*PreviewAnimation), true); if (PreviewAnimation != "") SetAnimation(0, PreviewAnimation, true);
else SetEmptyAnimation(0, 0); else SetEmptyAnimation(0, 0);
lastPreviewAnimation = PreviewAnimation; lastPreviewAnimation = PreviewAnimation;
} }
if (lastPreviewSkin != PreviewSkin) { if (lastPreviewSkin != PreviewSkin) {
if (PreviewSkin != "") SetSkin(TCHAR_TO_UTF8(*PreviewSkin)); if (PreviewSkin != "") SetSkin(PreviewSkin);
else SetSkin("default"); else SetSkin("default");
lastPreviewSkin = PreviewSkin; lastPreviewSkin = PreviewSkin;
} }

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

@ -151,13 +151,19 @@ void USpineSkeletonDataAsset::LoadInfo() {
if (skeletonData) { if (skeletonData) {
Bones.Empty(); Bones.Empty();
for (int i = 0; i < skeletonData->getBones().size(); i++) for (int i = 0; i < skeletonData->getBones().size(); i++)
Bones.Add(skeletonData->getBones()[i]->getName().buffer()); Bones.Add(UTF8_TO_TCHAR(skeletonData->getBones()[i]->getName().buffer()));
Skins.Empty(); Skins.Empty();
for (int i = 0; i < skeletonData->getSkins().size(); i++) for (int i = 0; i < skeletonData->getSkins().size(); i++)
Skins.Add(skeletonData->getSkins()[i]->getName().buffer()); Skins.Add(UTF8_TO_TCHAR(skeletonData->getSkins()[i]->getName().buffer()));
Slots.Empty();
for (int i = 0; i < skeletonData->getSlots().size(); i++)
Slots.Add(UTF8_TO_TCHAR(skeletonData->getSlots()[i]->getName().buffer()));
Animations.Empty(); Animations.Empty();
for (int i = 0; i < skeletonData->getAnimations().size(); i++) for (int i = 0; i < skeletonData->getAnimations().size(); i++)
Animations.Add(skeletonData->getAnimations()[i]->getName().buffer()); Animations.Add(UTF8_TO_TCHAR(skeletonData->getAnimations()[i]->getName().buffer()));
Events.Empty();
for (int i = 0; i < skeletonData->getEvents().size(); i++)
Events.Add(UTF8_TO_TCHAR(skeletonData->getEvents()[i]->getName().buffer()));
delete skeletonData; delete skeletonData;
} }
#endif #endif

3
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonDataAsset.h
View File

@ -83,6 +83,9 @@ public:
UPROPERTY(Transient, VisibleAnywhere) UPROPERTY(Transient, VisibleAnywhere)
TArray<FString> Animations; TArray<FString> Animations;
UPROPERTY(Transient, VisibleAnywhere)
TArray<FString> Events;
protected: protected:
UPROPERTY() UPROPERTY()
TArray<uint8> rawData; TArray<uint8> rawData;