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

[ue4] Fix up compilation errors.

Browse Source
This commit is contained in:
badlogic 2021-12-23 15:30:20 +01:00
parent 899a9a80b9
commit ccc450f624
3 changed files with 6 additions and 6 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

@ -269,7 +269,7 @@ void SSpineWidget::UpdateMesh(int32 LayerId, FSlateWindowElementList &OutDrawEle
RegionAttachment *regionAttachment = (RegionAttachment *) attachment; RegionAttachment *regionAttachment = (RegionAttachment *) attachment;
attachmentColor.set(regionAttachment->getColor()); attachmentColor.set(regionAttachment->getColor());
attachmentAtlasRegion = (AtlasRegion *) regionAttachment->getRendererObject(); attachmentAtlasRegion = (AtlasRegion *) regionAttachment->getRendererObject();
regionAttachment->computeWorldVertices(slot->getBone(), *attachmentVertices, 0, 2); regionAttachment->computeWorldVertices(*slot, *attachmentVertices, 0, 2);
attachmentIndices = quadIndices; attachmentIndices = quadIndices;
attachmentUvs = regionAttachment->getUVs().buffer(); attachmentUvs = regionAttachment->getUVs().buffer();
numVertices = 4; numVertices = 4;
@ -278,7 +278,7 @@ void SSpineWidget::UpdateMesh(int32 LayerId, FSlateWindowElementList &OutDrawEle
MeshAttachment *mesh = (MeshAttachment *) attachment; MeshAttachment *mesh = (MeshAttachment *) attachment;
attachmentColor.set(mesh->getColor()); attachmentColor.set(mesh->getColor());
attachmentAtlasRegion = (AtlasRegion *) mesh->getRendererObject(); attachmentAtlasRegion = (AtlasRegion *) mesh->getRendererObject();
mesh->computeWorldVertices(*slot, 0, mesh->getWorldVerticesLength(), *attachmentVertices, 0, 2); mesh->computeWorldVertices(*slot, 0, mesh->getWorldVerticesLength(), attachmentVertices->buffer(), 0, 2);
attachmentIndices = mesh->getTriangles().buffer(); attachmentIndices = mesh->getTriangles().buffer();
attachmentUvs = mesh->getUVs().buffer(); attachmentUvs = mesh->getUVs().buffer();
numVertices = mesh->getWorldVerticesLength() >> 1; numVertices = mesh->getWorldVerticesLength() >> 1;

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

@ -100,11 +100,11 @@ void USpineSkeletonDataAsset::BeginDestroy() {
class SP_API NullAttachmentLoader : public AttachmentLoader { class SP_API NullAttachmentLoader : public AttachmentLoader {
public: public:
virtual RegionAttachment *newRegionAttachment(Skin &skin, const String &name, const String &path) { virtual RegionAttachment *newRegionAttachment(Skin &skin, const String &name, const String &path, Sequence *sequence) {
return new (__FILE__, __LINE__) RegionAttachment(name); return new (__FILE__, __LINE__) RegionAttachment(name);
} }
virtual MeshAttachment *newMeshAttachment(Skin &skin, const String &name, const String &path) { virtual MeshAttachment *newMeshAttachment(Skin &skin, const String &name, const String &path, Sequence *sequence) {
return new (__FILE__, __LINE__) MeshAttachment(name); return new (__FILE__, __LINE__) MeshAttachment(name);
} }

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

@ -226,7 +226,7 @@ void USpineSkeletonRendererComponent::UpdateMesh(Skeleton *Skeleton) {
attachmentColor.set(regionAttachment->getColor()); attachmentColor.set(regionAttachment->getColor());
attachmentAtlasRegion = (AtlasRegion *) regionAttachment->getRendererObject(); attachmentAtlasRegion = (AtlasRegion *) regionAttachment->getRendererObject();
regionAttachment->computeWorldVertices(slot->getBone(), *attachmentVertices, 0, 2); regionAttachment->computeWorldVertices(*slot, *attachmentVertices, 0, 2);
attachmentIndices = quadIndices; attachmentIndices = quadIndices;
attachmentUvs = regionAttachment->getUVs().buffer(); attachmentUvs = regionAttachment->getUVs().buffer();
numVertices = 4; numVertices = 4;
@ -242,7 +242,7 @@ void USpineSkeletonRendererComponent::UpdateMesh(Skeleton *Skeleton) {
attachmentColor.set(mesh->getColor()); attachmentColor.set(mesh->getColor());
attachmentAtlasRegion = (AtlasRegion *) mesh->getRendererObject(); attachmentAtlasRegion = (AtlasRegion *) mesh->getRendererObject();
mesh->computeWorldVertices(*slot, 0, mesh->getWorldVerticesLength(), *attachmentVertices, 0, 2); mesh->computeWorldVertices(*slot, 0, mesh->getWorldVerticesLength(), attachmentVertices->buffer(), 0, 2);
attachmentIndices = mesh->getTriangles().buffer(); attachmentIndices = mesh->getTriangles().buffer();
attachmentUvs = mesh->getUVs().buffer(); attachmentUvs = mesh->getUVs().buffer();
numVertices = mesh->getWorldVerticesLength() >> 1; numVertices = mesh->getWorldVerticesLength() >> 1;