UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ue4] Updated sample project to require UE 4.21+. Fixed shadowing local variables. See #1250.

Browse Source
This commit is contained in:
badlogic 2019-01-17 16:19:12 +01:00
parent d2e9b6bab5
commit 4c9ec06083
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,7 +210,7 @@ void SSpineWidget::Flush(int32 LayerId, FSlateWindowElementList& OutDrawElements
setVertex(&vertexData[i], Vertices[i].X, Vertices[i].Y, Uvs[i].X, Uvs[i].Y, Colors[i], offset); setVertex(&vertexData[i], Vertices[i].X, Vertices[i].Y, Uvs[i].X, Uvs[i].Y, Colors[i], offset);
} }
FSlateBrush brush; /*FSlateBrush brush;
brush.SetResourceObject(Material); brush.SetResourceObject(Material);
brush = widget->Brush; brush = widget->Brush;
@ -218,7 +218,7 @@ void SSpineWidget::Flush(int32 LayerId, FSlateWindowElementList& OutDrawElements
if (shaderResource) { if (shaderResource) {
FSlateResourceHandle resourceHandle = FSlateApplication::Get().GetRenderer()->GetResourceHandle(brush); FSlateResourceHandle resourceHandle = FSlateApplication::Get().GetRenderer()->GetResourceHandle(brush);
FSlateDrawElement::MakeCustomVerts(OutDrawElements, LayerId, resourceHandle, renderData.VertexData, renderData.IndexData, nullptr, 0, 0); FSlateDrawElement::MakeCustomVerts(OutDrawElements, LayerId, resourceHandle, renderData.VertexData, renderData.IndexData, nullptr, 0, 0);
} }*/
Vertices.SetNum(0); Vertices.SetNum(0);
Indices.SetNum(0); Indices.SetNum(0);

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

@ -34,8 +34,8 @@
using namespace spine; using namespace spine;
void UTrackEntry::SetTrackEntry(TrackEntry* entry) { void UTrackEntry::SetTrackEntry(TrackEntry* trackEntry) {
this->entry = entry; this->entry = trackEntry;
if (entry) entry->setRendererObject((void*)this); if (entry) entry->setRendererObject((void*)this);
} }

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

@ -136,8 +136,8 @@ SkeletonData* USpineSkeletonDataAsset::GetSkeletonData (Atlas* Atlas, bool Force
AnimationStateData* USpineSkeletonDataAsset::GetAnimationStateData(Atlas* atlas) { AnimationStateData* USpineSkeletonDataAsset::GetAnimationStateData(Atlas* atlas) {
if (!animationStateData) { if (!animationStateData) {
SkeletonData* skeletonData = GetSkeletonData(atlas, false); SkeletonData* data = GetSkeletonData(atlas, false);
animationStateData = new (__FILE__, __LINE__) AnimationStateData(skeletonData); animationStateData = new (__FILE__, __LINE__) AnimationStateData(data);
} }
for (auto& data : MixData) { for (auto& data : MixData) {
if (!data.From.IsEmpty() && !data.To.IsEmpty()) { if (!data.From.IsEmpty() && !data.To.IsEmpty()) {

2
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h
View File

@ -81,7 +81,7 @@ public:
UTrackEntry () { } UTrackEntry () { }
void SetTrackEntry (spine::TrackEntry* entry); void SetTrackEntry (spine::TrackEntry* trackEntry);
spine::TrackEntry* GetTrackEntry() { return entry; } spine::TrackEntry* GetTrackEntry() { return entry; }
UFUNCTION(BlueprintCallable, Category="Components|Spine|TrackEntry") UFUNCTION(BlueprintCallable, Category="Components|Spine|TrackEntry")

2
spine-ue4/SpineUE4.uproject
View File

@ -1,6 +1,6 @@
{ {
"FileVersion": 3, "FileVersion": 3,
"EngineAssociation": "4.20", "EngineAssociation": "4.21",
"Category": "", "Category": "",
"Description": "", "Description": "",
"Modules": [ "Modules": [