mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-26 22:49:01 +08:00
Merge branch '4.1' into 4.2-beta
This commit is contained in:
commit
651611b573
@ -183,6 +183,11 @@ class Atlas {
|
|||||||
for (final image in atlasPages) {
|
for (final image in atlasPages) {
|
||||||
image.dispose();
|
image.dispose();
|
||||||
}
|
}
|
||||||
|
for (final map in atlasPagePaints) {
|
||||||
|
map.values.forEach((element) {
|
||||||
|
element.shader?.dispose();
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1863,6 +1863,12 @@ spine_blend_mode spine_slot_data_get_blend_mode(spine_slot_data slot) {
|
|||||||
return (spine_blend_mode) _slot->getBlendMode();
|
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
|
// Slot
|
||||||
void spine_slot_set_to_setup_pose(spine_slot slot) {
|
void spine_slot_set_to_setup_pose(spine_slot slot) {
|
||||||
if (slot == nullptr) return;
|
if (slot == nullptr) return;
|
||||||
|
|||||||
@ -163,6 +163,12 @@ namespace Spine.Unity {
|
|||||||
|
|
||||||
public static bool IsJsonFile (TextAsset file) {
|
public static bool IsJsonFile (TextAsset file) {
|
||||||
byte[] content = file.bytes;
|
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;
|
const int maxCharsToCheck = 256;
|
||||||
int numCharsToCheck = Math.Min(content.Length, maxCharsToCheck);
|
int numCharsToCheck = Math.Min(content.Length, maxCharsToCheck);
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
"name": "com.esotericsoftware.spine.spine-unity",
|
"name": "com.esotericsoftware.spine.spine-unity",
|
||||||
"displayName": "spine-unity Runtime",
|
"displayName": "spine-unity Runtime",
|
||||||
"description": "This plugin provides the spine-unity runtime core.",
|
"description": "This plugin provides the spine-unity runtime core.",
|
||||||
"version": "4.2.53",
|
"version": "4.2.54",
|
||||||
"unity": "2018.3",
|
"unity": "2018.3",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Esoteric Software",
|
"name": "Esoteric Software",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user