UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-11 17:48:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
Harald Csaszar 2024-03-07 16:06:59 +01:00
commit 651611b573
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-flutter/lib/spine_flutter.dart
View File

@ -183,6 +183,11 @@ class Atlas {
for (final image in atlasPages) {
image.dispose();
}
for (final map in atlasPagePaints) {
map.values.forEach((element) {
element.shader?.dispose();
});
}
}
}

6
spine-flutter/src/spine_flutter.cpp
View File

@ -1863,6 +1863,12 @@ spine_blend_mode spine_slot_data_get_blend_mode(spine_slot_data slot) {
return (spine_blend_mode) _slot->getBlendMode();
}
void spine_slot_data_set_blend_mode(spine_slot_data slot, spine_blend_mode blendMode) {
if (slot == nullptr) return;
SlotData *_slot = (SlotData *) slot;
_slot->setBlendMode((BlendMode) blendMode);
}
// Slot
void spine_slot_set_to_setup_pose(spine_slot slot) {
if (slot == nullptr) return;

6
spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataCompatibility.cs
View File

@ -163,6 +163,12 @@ namespace Spine.Unity {
public static bool IsJsonFile (TextAsset file) {
byte[] content = file.bytes;
// check for binary skeleton version number string, starts after 8 byte hash
char majorVersionChar = compatibleBinaryVersions[0][0].ToString()[0];
if (content.Length > 10 && content[9] == majorVersionChar && content[10] == '.')
return false;
const int maxCharsToCheck = 256;
int numCharsToCheck = Math.Min(content.Length, maxCharsToCheck);
int i = 0;

2
spine-unity/Assets/Spine/package.json
View File

@ -2,7 +2,7 @@
"name": "com.esotericsoftware.spine.spine-unity",
"displayName": "spine-unity Runtime",
"description": "This plugin provides the spine-unity runtime core.",
"version": "4.2.53",
"version": "4.2.54",
"unity": "2018.3",
"author": {
"name": "Esoteric Software",