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

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
Mario Zechner 2023-02-27 13:44:34 +01:00
commit 4a66ced952
3 changed files with 208 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spine-c/spine-c/src/spine/SkeletonJson.c
View File

@ -1354,10 +1354,9 @@ spSkeletonData *spSkeletonJson_readSkeletonData(spSkeletonJson *self, const char
skeletonData->skins[skeletonData->skinsCount++] = skin; skeletonData->skins[skeletonData->skinsCount++] = skin;
if (strcmp(skin->name, "default") == 0) skeletonData->defaultSkin = skin; if (strcmp(skin->name, "default") == 0) skeletonData->defaultSkin = skin;
for (attachmentsMap = Json_getItem(skinMap, skinPart = Json_getItem(skinMap, "attachments");
"attachments") if (skinPart) {
->child; for (attachmentsMap = skinPart->child; attachmentsMap; attachmentsMap = attachmentsMap->next) {
attachmentsMap; attachmentsMap = attachmentsMap->next) {
spSlotData *slot = spSkeletonData_findSlot(skeletonData, attachmentsMap->name); spSlotData *slot = spSkeletonData_findSlot(skeletonData, attachmentsMap->name);
Json *attachmentMap; Json *attachmentMap;
@ -1392,7 +1391,8 @@ spSkeletonData *spSkeletonJson_readSkeletonData(spSkeletonJson *self, const char
} }
sequence = readSequence(Json_getItem(attachmentMap, "sequence")); sequence = readSequence(Json_getItem(attachmentMap, "sequence"));
attachment = spAttachmentLoader_createAttachment(self->attachmentLoader, skin, type, attachmentName, attachment = spAttachmentLoader_createAttachment(self->attachmentLoader, skin, type,
attachmentName,
path, sequence); path, sequence);
if (!attachment) { if (!attachment) {
if (self->attachmentLoader->error1) { if (self->attachmentLoader->error1) {
@ -1572,6 +1572,7 @@ spSkeletonData *spSkeletonJson_readSkeletonData(spSkeletonJson *self, const char
} }
} }
} }
}
/* Linked meshes. */ /* Linked meshes. */
for (i = 0; i < internal->linkedMeshCount; ++i) { for (i = 0; i < internal->linkedMeshCount; ++i) {

6
spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp
View File

@ -28,7 +28,6 @@
*****************************************************************************/ *****************************************************************************/
#include <spine/MeshAttachment.h> #include <spine/MeshAttachment.h>
#include <spine/HasRendererObject.h>
using namespace spine; using namespace spine;
@ -53,10 +52,13 @@ void MeshAttachment::updateRegion() {
_uvs.setSize(_regionUVs.size(), 0); _uvs.setSize(_regionUVs.size(), 0);
} }
if (_region == nullptr) {
return;
}
int i = 0, n = (int) _regionUVs.size(); int i = 0, n = (int) _regionUVs.size();
float u = _region->u, v = _region->v; float u = _region->u, v = _region->v;
float width = 0, height = 0; float width = 0, height = 0;
switch (_region->degrees) { switch (_region->degrees) {
case 90: { case 90: {
float textureWidth = _region->height / (_region->u2 - _region->u); float textureWidth = _region->height / (_region->u2 - _region->u);

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

@ -264,7 +264,7 @@ void USpineSkeletonRendererComponent::UpdateMesh(USpineSkeletonComponent *compon
// ignore regions for which we can't find a material // ignore regions for which we can't find a material
UMaterialInstanceDynamic *material = nullptr; UMaterialInstanceDynamic *material = nullptr;
int foundPageIndex = -1; int foundPageIndex = -1;
for (int pageIndex = 0; i < component->Atlas->atlasPages.Num(); pageIndex++) { for (int pageIndex = 0; pageIndex < component->Atlas->atlasPages.Num(); pageIndex++) {
AtlasPage *page = component->Atlas->GetAtlas()->getPages()[pageIndex]; AtlasPage *page = component->Atlas->GetAtlas()->getPages()[pageIndex];
if (attachmentAtlasRegion->page == page) { if (attachmentAtlasRegion->page == page) {
foundPageIndex = pageIndex; foundPageIndex = pageIndex;
@ -277,33 +277,33 @@ void USpineSkeletonRendererComponent::UpdateMesh(USpineSkeletonComponent *compon
} }
switch (slot->getData().getBlendMode()) { switch (slot->getData().getBlendMode()) {
case BlendMode_Additive: case BlendMode_Additive:
if (i >= atlasAdditiveBlendMaterials.Num()) { if (foundPageIndex >= atlasAdditiveBlendMaterials.Num()) {
clipper.clipEnd(*slot); clipper.clipEnd(*slot);
continue; continue;
} }
material = atlasAdditiveBlendMaterials[i]; material = atlasAdditiveBlendMaterials[foundPageIndex];
break; break;
case BlendMode_Multiply: case BlendMode_Multiply:
if (i >= atlasMultiplyBlendMaterials.Num()) { if (foundPageIndex >= atlasMultiplyBlendMaterials.Num()) {
clipper.clipEnd(*slot); clipper.clipEnd(*slot);
continue; continue;
} }
material = atlasMultiplyBlendMaterials[i]; material = atlasMultiplyBlendMaterials[foundPageIndex];
break; break;
case BlendMode_Screen: case BlendMode_Screen:
if (i >= atlasScreenBlendMaterials.Num()) { if (foundPageIndex >= atlasScreenBlendMaterials.Num()) {
clipper.clipEnd(*slot); clipper.clipEnd(*slot);
continue; continue;
} }
material = atlasScreenBlendMaterials[i]; material = atlasScreenBlendMaterials[foundPageIndex];
break; break;
case BlendMode_Normal: case BlendMode_Normal:
default: default:
if (i >= atlasNormalBlendMaterials.Num()) { if (foundPageIndex >= atlasNormalBlendMaterials.Num()) {
clipper.clipEnd(*slot); clipper.clipEnd(*slot);
continue; continue;
} }
material = atlasNormalBlendMaterials[i]; material = atlasNormalBlendMaterials[foundPageIndex];
break; break;
} }