UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-05 02:06:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0' into ts-modules

Browse Source
This commit is contained in:
Mario Zechner 2021-08-24 16:02:05 +02:00
commit 4e4f73cc58
4 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spine-cocos2dx/example/proj.ios_mac/spine-cocos2d-x.xcodeproj/project.pbxproj
View File

@ -1068,6 +1068,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
COMPRESS_PNG_FILES = NO; COMPRESS_PNG_FILES = NO;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=*]" = arm64;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
@ -1080,7 +1081,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = "$(inherited)"; HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = ios/Info.plist; INFOPLIST_FILE = ios/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 6.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(_COCOS_LIB_IOS_BEGIN)", "$(_COCOS_LIB_IOS_BEGIN)",
@ -1089,7 +1090,7 @@
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(_COCOS_HEADER_IOS_BEGIN) $(_COCOS_HEADER_IOS_END)"; USER_HEADER_SEARCH_PATHS = "$(_COCOS_HEADER_IOS_BEGIN) $(_COCOS_HEADER_IOS_END)";
VALID_ARCHS = "arm64 armv7"; VALID_ARCHS = "$(ARCHS_STANDARD)";
}; };
name = Debug; name = Debug;
}; };
@ -1110,7 +1111,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = "$(inherited)"; HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = ios/Info.plist; INFOPLIST_FILE = ios/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 6.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(_COCOS_LIB_IOS_BEGIN)", "$(_COCOS_LIB_IOS_BEGIN)",
@ -1119,7 +1120,7 @@
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(_COCOS_HEADER_IOS_BEGIN) $(_COCOS_HEADER_IOS_END)"; USER_HEADER_SEARCH_PATHS = "$(_COCOS_HEADER_IOS_BEGIN) $(_COCOS_HEADER_IOS_END)";
VALID_ARCHS = "arm64 armv7"; VALID_ARCHS = "$(ARCHS_STANDARD)";
}; };
name = Release; name = Release;
}; };

8
spine-csharp/src/AnimationState.cs
View File

@ -87,6 +87,10 @@ namespace Spine {
internal void OnEvent (TrackEntry entry, Event e) { if (Event != null) Event(entry, e); } internal void OnEvent (TrackEntry entry, Event e) { if (Event != null) Event(entry, e); }
public delegate void TrackEntryDelegate (TrackEntry trackEntry); public delegate void TrackEntryDelegate (TrackEntry trackEntry);
/// <summary>See <see href="http://esotericsoftware.com/spine-api-reference#AnimationStateListener-Methods">
/// API Reference documentation pages here</see> for details. Usage in C# and spine-unity is explained
/// <see href="http://esotericsoftware.com/spine-unity#Processing-AnimationState-Events">here</see>
/// on the spine-unity documentation pages.</summary>
public event TrackEntryDelegate Start, Interrupt, End, Dispose, Complete; public event TrackEntryDelegate Start, Interrupt, End, Dispose, Complete;
public delegate void TrackEntryEventDelegate (TrackEntry trackEntry, Event e); public delegate void TrackEntryEventDelegate (TrackEntry trackEntry, Event e);
@ -960,6 +964,10 @@ namespace Spine {
internal TrackEntry previous, next, mixingFrom, mixingTo; internal TrackEntry previous, next, mixingFrom, mixingTo;
// difference to libgdx reference: delegates are used for event callbacks instead of 'AnimationStateListener listener'. // difference to libgdx reference: delegates are used for event callbacks instead of 'AnimationStateListener listener'.
/// <summary>See <see href="http://esotericsoftware.com/spine-api-reference#AnimationStateListener-Methods">
/// API Reference documentation pages here</see> for details. Usage in C# and spine-unity is explained
/// <see href="http://esotericsoftware.com/spine-unity#Processing-AnimationState-Events">here</see>
/// on the spine-unity documentation pages.</summary>
public event AnimationState.TrackEntryDelegate Start, Interrupt, End, Dispose, Complete; public event AnimationState.TrackEntryDelegate Start, Interrupt, End, Dispose, Complete;
public event AnimationState.TrackEntryEventDelegate Event; public event AnimationState.TrackEntryEventDelegate Event;
internal void OnStart () { if (Start != null) Start(this); } internal void OnStart () { if (Start != null) Start(this); }

25
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
View File

@ -1329,28 +1329,37 @@ public class AnimationState {
* See TrackEntry {@link TrackEntry#setListener(AnimationStateListener)} and AnimationState * See TrackEntry {@link TrackEntry#setListener(AnimationStateListener)} and AnimationState
* {@link AnimationState#addListener(AnimationStateListener)}. */ * {@link AnimationState#addListener(AnimationStateListener)}. */
static public interface AnimationStateListener { static public interface AnimationStateListener {
/** Invoked when this entry has been set as the current entry. */ /** Invoked when this entry has been set as the current entry. {@link #end(TrackEntry)} will occur when this entry will no
* longer be applied. */
public void start (TrackEntry entry); public void start (TrackEntry entry);
/** Invoked when another entry has replaced this entry as the current entry. This entry may continue being applied for /** Invoked when another entry has replaced this entry as the current entry. This entry may continue being applied for
* mixing. */ * mixing. */
public void interrupt (TrackEntry entry); public void interrupt (TrackEntry entry);
/** Invoked when this entry is no longer the current entry and will never be applied again. */ /** Invoked when this entry will never be applied again. This only occurs if this entry has previously been set as the
* current entry ({@link #start(TrackEntry)} was invoked). */
public void end (TrackEntry entry); public void end (TrackEntry entry);
/** Invoked when this entry will be disposed. This may occur without the entry ever being set as the current entry. /** Invoked when this entry will be disposed. This may occur without the entry ever being set as the current entry.
* <p>
* References to the entry should not be kept after <code>dispose</code> is called, as it may be destroyed or reused. */ * References to the entry should not be kept after <code>dispose</code> is called, as it may be destroyed or reused. */
public void dispose (TrackEntry entry); public void dispose (TrackEntry entry);
/** Invoked every time this entry's animation completes a loop. Because this event is trigged in /** Invoked every time this entry's animation completes a loop. This may occur during mixing (after
* {@link AnimationState#apply(Skeleton)}, any animations set in response to the event won't be applied until the next time * {@link #interrupt(TrackEntry)}).
* the AnimationState is applied. */ * <p>
* If this entry's {@link TrackEntry#getMixingTo()} is not null, this entry is mixing out (it is not the current entry).
* <p>
* Because this event is triggered at the end of {@link AnimationState#apply(Skeleton)}, any animations set in response to
* the event won't be applied until the next time the AnimationState is applied. */
public void complete (TrackEntry entry); public void complete (TrackEntry entry);
/** Invoked when this entry's animation triggers an event. Because this event is trigged in /** Invoked when this entry's animation triggers an event. This may occur during mixing (after
* {@link AnimationState#apply(Skeleton)}, any animations set in response to the event won't be applied until the next time * {@link #interrupt(TrackEntry)}), see {@link TrackEntry#eventThreshold}.
* the AnimationState is applied. */ * <p>
* Because this event is triggered at the end of {@link AnimationState#apply(Skeleton)}, any animations set in response to
* the event won't be applied until the next time the AnimationState is applied. */
public void event (TrackEntry entry, Event event); public void event (TrackEntry entry, Event event);
} }

2
spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/JsonRollback.java
View File

@ -197,7 +197,7 @@ public class JsonRollback {
} }
if (name.equals("rgba")) if (name.equals("rgba"))
map.parent.name = "color"; map.parent.name = "color";
else if (name.equals("rgba")) // else if (name.equals("rgba2")) //
map.parent.name = "twoColor"; map.parent.name = "twoColor";
} }
} }