UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-22 18:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0' into 4.1-beta

Browse Source
This commit is contained in:
badlogic 2022-05-02 18:20:30 +02:00
commit df62c399df
2 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,15 @@ void USpineSkeletonRendererComponent::Flush(int &Idx, TArray<FVector> &Vertices,
if (Vertices.Num() == 0) return; if (Vertices.Num() == 0) return;
SetMaterial(Idx, Material); SetMaterial(Idx, Material);
CreateMeshSection(Idx, Vertices, Indices, Normals, Uvs, Colors, TArray<FProcMeshTangent>(), bCreateCollision); bool bShouldCreateCollision = false;
if (bCreateCollision) {
UWorld* world = GetWorld();
if (world && world->IsGameWorld()) {
bShouldCreateCollision = true;
}
}
CreateMeshSection(Idx, Vertices, Indices, Normals, Uvs, Colors, TArray<FProcMeshTangent>(), bShouldCreateCollision);
Vertices.SetNum(0); Vertices.SetNum(0);
Indices.SetNum(0); Indices.SetNum(0);

39
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs
View File

@ -67,6 +67,9 @@ namespace Spine.Unity.Editor {
/// </summary> /// </summary>
public static class SkeletonBaker { public static class SkeletonBaker {
const string SpineEventStringId = "SpineEvent";
const float EventTimeEqualityEpsilon = 0.01f;
#region SkeletonMecanim's Mecanim Clips #region SkeletonMecanim's Mecanim Clips
#if SPINE_SKELETONMECANIM #if SPINE_SKELETONMECANIM
public static void UpdateMecanimClips (SkeletonDataAsset skeletonDataAsset) { public static void UpdateMecanimClips (SkeletonDataAsset skeletonDataAsset) {
@ -145,11 +148,14 @@ namespace Spine.Unity.Editor {
settings.stopTime = animations.Duration; settings.stopTime = animations.Duration;
SetAnimationSettings(clip, settings); SetAnimationSettings(clip, settings);
AnimationUtility.SetAnimationEvents(clip, new AnimationEvent[0]); var previousAnimationEvents = AnimationUtility.GetAnimationEvents(clip);
var animationEvents = new List<AnimationEvent>();
foreach (Timeline t in animations.Timelines) { foreach (Timeline t in animations.Timelines) {
if (t is EventTimeline) if (t is EventTimeline)
ParseEventTimeline((EventTimeline)t, clip, SendMessageOptions.DontRequireReceiver); ParseEventTimeline(ref animationEvents, (EventTimeline)t, SendMessageOptions.DontRequireReceiver);
} }
AddPreviousUserEvents(ref animationEvents, previousAnimationEvents);
AnimationUtility.SetAnimationEvents(clip, animationEvents.ToArray());
EditorUtility.SetDirty(clip); EditorUtility.SetDirty(clip);
unityAnimationClipTable.Remove(animationName); unityAnimationClipTable.Remove(animationName);
@ -1495,10 +1501,17 @@ namespace Spine.Unity.Editor {
} }
static void ParseEventTimeline (EventTimeline timeline, AnimationClip clip, SendMessageOptions eventOptions) { static void ParseEventTimeline (EventTimeline timeline, AnimationClip clip, SendMessageOptions eventOptions) {
var animationEvents = new List<AnimationEvent>();
ParseEventTimeline(ref animationEvents, timeline, eventOptions);
AnimationUtility.SetAnimationEvents(clip, animationEvents.ToArray());
}
static void ParseEventTimeline (ref List<AnimationEvent> animationEvents,
EventTimeline timeline, SendMessageOptions eventOptions) {
float[] frames = timeline.Frames; float[] frames = timeline.Frames;
var events = timeline.Events; var events = timeline.Events;
var animEvents = new List<AnimationEvent>();
for (int i = 0, n = frames.Length; i < n; i++) { for (int i = 0, n = frames.Length; i < n; i++) {
var spineEvent = events[i]; var spineEvent = events[i];
string eventName = spineEvent.Data.Name; string eventName = spineEvent.Data.Name;
@ -1509,7 +1522,8 @@ namespace Spine.Unity.Editor {
var unityAnimationEvent = new AnimationEvent { var unityAnimationEvent = new AnimationEvent {
time = frames[i], time = frames[i],
functionName = eventName, functionName = eventName,
messageOptions = eventOptions messageOptions = eventOptions,
stringParameter = SpineEventStringId
}; };
if (!string.IsNullOrEmpty(spineEvent.String)) { if (!string.IsNullOrEmpty(spineEvent.String)) {
@ -1520,10 +1534,23 @@ namespace Spine.Unity.Editor {
unityAnimationEvent.floatParameter = spineEvent.Float; unityAnimationEvent.floatParameter = spineEvent.Float;
} // else, paramless function/Action. } // else, paramless function/Action.
animEvents.Add(unityAnimationEvent); animationEvents.Add(unityAnimationEvent);
}
} }
AnimationUtility.SetAnimationEvents(clip, animEvents.ToArray()); static void AddPreviousUserEvents (ref List<AnimationEvent> allEvents, AnimationEvent[] previousEvents) {
foreach (AnimationEvent previousEvent in previousEvents) {
if (previousEvent.stringParameter == SpineEventStringId)
continue;
var identicalEvent = allEvents.Find(newEvent => {
return newEvent.functionName == previousEvent.functionName &&
Mathf.Abs(newEvent.time - previousEvent.time) < EventTimeEqualityEpsilon;
});
if (identicalEvent != null)
continue;
allEvents.Add(previousEvent);
}
} }
static void ParseAttachmentTimeline (Skeleton skeleton, AttachmentTimeline timeline, Dictionary<int, List<string>> slotLookup, AnimationClip clip) { static void ParseAttachmentTimeline (Skeleton skeleton, AttachmentTimeline timeline, Dictionary<int, List<string>> slotLookup, AnimationClip clip) {