412 Commits

Author SHA1 Message Date
NathanSweet
c59a58ae5b Comment 2016-08-21 08:23:55 +02:00
NathanSweet
8f4ad90a17 AnimationState, allow delay to postpone the current track entry.
#621
2016-08-20 18:52:13 +02:00
NathanSweet
23f16c016c AnimationState, don't mix from an animation that was never applied. 2016-08-20 17:59:55 +02:00
NathanSweet
a39c970a6a AnimationState, javadoc, cleanup, tests.
#621
2016-08-20 15:47:13 +02:00
NathanSweet
0a8896a3e2 More AnimationState refactoring.
- Added `animationStart` so a portion of an animation can be looped.
- Changed timing fields to: trackTime, trackLast, trackEnd, animationStart, animationEnd, animationLast
- Removed default *Threshold fields. People can just set it on the track entry if they don't like the defaults.
- Removed `loopCount` from complete event. People can calculate it based on track time.

#621
closes #535
closes #593
2016-08-20 11:51:56 +02:00
NathanSweet
966c03e68f AnimationState refactoring.
- Renamed `previous` to `mixingFrom` for clarity.
- Added `trackEntry` method to fully initialize TrackEntry.
- Moved `mixDuration` initialization to happen when TrackEntry is initialized. This allows mix times to be specified (or changed) through the TrackEntry, without using AnimationStateData.
- Made EventQueue static to ease porting.
- Javadocs.

#621
2016-08-19 19:14:17 +02:00
NathanSweet
4912ea8975 Fixed start event not being triggered when addAnimation is used on an empty track.
closes #634
2016-08-19 11:32:29 +02:00
NathanSweet
6aca4bd141 Updated AnimationState tests. 2016-08-19 11:21:56 +02:00
NathanSweet
b454d69b45 Fixed lastTime being > time for non-looping animations. 2016-08-19 11:21:44 +02:00
NathanSweet
5191cf4f5f Wait until end of current loop when queuing an animation.
closes #626
2016-08-19 11:20:32 +02:00
NathanSweet
296d019bac Formatting. 2016-08-19 08:47:43 +02:00
NathanSweet
e4e312626b Better scale sign computation. 2016-08-18 21:59:30 +02:00
NathanSweet
5edeeb6035 When mixing scale, the sign of the last applied scale is used to avoid mixing across zero.
#621
2016-08-18 16:51:50 +02:00
NathanSweet
127c0fbbf5 AnimationState, added draw order threshold. 2016-08-18 15:17:13 +02:00
NathanSweet
c278cf77fb Added event toasts to Skeleton Viewer. 2016-08-18 15:16:59 +02:00
NathanSweet
cc4f19da98 AnimationState, added attachment threshold. Defaults changed to NOT apply attachment timelines or fire events for an animation being mixed out.
#621
2016-08-18 14:46:15 +02:00
NathanSweet
b020bc0d44 Added event threshold setting to AnimationState.
#621
2016-08-18 14:05:24 +02:00
NathanSweet
6cc91d579c Fixed world scale. 2016-08-18 11:01:57 +02:00
NathanSweet
c5d3d84f71 Better disable inherit rotation.
But not good, flips with negative scale.
2016-08-15 16:19:33 +02:00
NathanSweet
3160077207 Fixed Skeleton copy constructor.
It wasn't copying each bone's children.
2016-08-14 08:09:58 +02:00
NathanSweet
5a7cbf0a41 Removed world sign.
Doesn't make sense to compute a value that the runtime no longer uses and is unlikely for application code to need. If application code does need it, it's trivial to walk up the bone hierarchy and calculate it.
2016-08-13 20:08:07 +02:00
NathanSweet
5a45d3df30 Fixed IK constraint child bone using uninitialized world transform to calculate applied transform. 2016-08-13 19:57:23 +02:00
NathanSweet
217aa60c4f Finished "applied transform" for arbitrary constraint order. 2016-08-13 08:38:41 +02:00
NathanSweet
438f0028b2 Experimental disable inherit rotation. 2016-08-12 07:40:59 +02:00
NathanSweet
1459abcb06 Constraint order WIP. 2016-08-09 21:24:54 +02:00
NathanSweet
2dee5d6103 [libgdx] New math for disable inherit scale.
More stable (fixes rotation with negative scale) but slightly different behavior: scaling parent bones can cause the rotation to change on a bone with disable inherit scale. This seems like sane behavior though, so likely worth the change. More here:
http://esotericsoftware.com/forum/Disabling-inherit-scale-breaks-rotation-v3-4-0-1-6757
2016-08-05 01:42:24 +02:00
NathanSweet
81a4e3ea1d [libgdx] SkeletonRendererDebug draws direction for zero length bones. 2016-08-05 01:35:52 +02:00
NathanSweet
bc629cec11 [libgdx] Removed Slot#attachmentName.
Decided lazy attachment look up was premature optimization.
2016-08-05 01:35:18 +02:00
NathanSweet
be01e0aae3 Merge branch 'master' into dev
# Conflicts:
#	spine-libgdx/spine-libgdx-tests/assets/spineboy/spineboy.json
#	spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java
2016-08-05 01:22:08 +02:00
NathanSweet
e16df6cbd4 Examples updated to 3.4.00. 2016-07-13 14:26:04 +02:00
NathanSweet
00f75cf3fa [libgdx] Updated examples. 2016-07-06 16:39:04 +02:00
NathanSweet
14db99eea8 Updated examples. 2016-07-06 16:38:24 +02:00
NathanSweet
9a310a9d24 [libgdx] Removed path/tank/test skeletons. 2016-07-06 15:54:59 +02:00
NathanSweet
4f05341f4c [libgdx] Can resurrect later. 2016-07-06 12:06:29 +02:00
Mario Zechner
eb540387e6 [c][sfml][cocos2d-x][cocos2d-objc] Updated to 3.3.07 (#629) 2016-07-05 19:53:24 +02:00
NathanSweet
fca7c478e2 [spine-libgdx] Fixed Skeleton copy constructor. 2016-07-04 02:13:45 +02:00
Pavel Platto
70b3e0f86f [csharp][libgdx] fix iterating bones in VertexAttachment.ComputeWorldVertices.
Postincrement affects its variable only when entire expression is evaluated.
2016-07-01 11:21:14 +02:00
John
1c19365325 [csharp][monogame][unity][xna] Updated to 3.3.x (#623)
* [spine-csharp] Ported 3.3 changes of Animation and inner classes. Added MathUtils.Clamp

* [spine-csharp] Ported 3.3 changes of AnimationStateData. Updated .gitignore to exclude .meta files from spine-csharp

* [spine-csharp] Ported 3.3 changes of Bone

* [spine-csharp] Ported 3.3 changes of BoneData

* [spine-csharp] Ported 3.3 changes of Event

* [spine-csharp] Ported 3.3 changes to IKConstraint. Also got rid of the hideous labeled break. Replaced with while and sprinkled continues and break :D

* [spine-csharp] Mario is not good with labeled breaks. Fixed with goto

* [spine-csharp] Ported more 3.3 changes, only SkeletonJson and SkeletonBinary left. Unity runtime also needs updating with new changes

* [spine-csharp] fixed compilation errors initially not reported by Mono CS

* Minor clean up.

Every space has its place.™

* Match csharp 3.3 refactorings.

* [Unity] Minor cleanup in SkeletonBaker.

* Better exception messages.

* Removed extra usings. Matched whitespace style.

* Fixed Bone.cs method PascalCase and xml documentation.

* Fixed Exception ctor arguments.

* Fixed single bone IK mixing.

Matched libgdx commit:
e0ee18a088

* [spine-csharp] Port of 3.3 changes to SkeletonJson, incomplete

* [Unity] Ragdoll: account for shear and new constraints.

* [spine-csharp] Ported 3.3 changes to SkeletonJson

* [spine-csharp] Ported 3.3 changes to SkeletonBinary. Time for testing and debugging

* [spine-csharp] Fixed up XNA runtime

* Added simple example data in new exports/ folder

* [spine-csharp] Fixed bug in Slot construtor, wasn't assigning index. Fixed bug in CurveTimeline, argument guard was wrong. Fixed bugs in SkeletonJson, indexing to get duration of a timeline was wrong. Added simple example to spine-xna for easier debugging

* [spine-csharp] Fixed porting bug in ColorTimeline#apply, indexing was wrong

* [spine-csharp] Fixed SkeletonJson#ReadVertices, calling resize on temp lists was wrong. Updated goblin sample in spine-xna, fixed mesh attachment rendering in spine-xna.

* [spine-xna] Added binary exports, modified XNA game

* [spine-xna] Added tank example

* Some cleanup. Relabeled generic todos.

* Prevent SpineEditorUtilities from orphaning failed instantiations.

* Ignore PathAttachment when checking for required atlas regions.

* [spine-csharp] the great spaces to tabs battle

* [spine-csharp] Fixed inherit deform.

* [spine-csharp] Match Skeleton.java properties and stuff.

* [spine-csharp] Fixed enums, all upper cased now, using Enum.ParseType in case-insensitive mode

* [csharp] Ported 206e7f983c4df4d27fee6cac05d152eb2295c8b0 to csharp runtime. Fixes attachment keys on different tracks

* [csharp] Updated README.md

* [xna] [monogame] [unity] Updated README.md

* Revert "[csharp] Ported 206e7f983c4df4d27fee6cac05d152eb2295c8b0 to csharp runtime. Fixes attachment keys on different tracks"

This reverts commit 175216868dd00b4ae31cc717022242308c150f6a.

* [csharp] Fix to AttachmentTimeline#apply, fix for the fix for the fix for the revert for the fix

* [csharp] Matched and fixed more comments, summaries, exception messages and formatting.

* [csharp] Fix deformed weighted vertices condition + match libgdx closer.

* [csharp] Use internal ExposedList array for critical methods.

* [csharp] SkeletonJson and SkeletonBinary minor formatting and fixes.

* [unity] Match changes and fixes in spine-csharp 3.3 + better editor messages.

* [unity] Updated sample scenes and files.

* [csharp] Some formatting got left behind.

* [unity] New readme links + Removed redundant info.

* [exports] Remove dummy project.
2016-06-30 04:29:33 +08:00
NathanSweet
20460fbdaa [libgdx] Fixed incorrectly scaling transform constraint offsets. 2016-06-29 02:14:44 +02:00
NathanSweet
4c82899115 [libgdx] Removed deferred attachment lookup.
3rd try is a charm. Don't code tired!
2016-06-28 17:37:43 +02:00
NathanSweet
5c363f0cc1 [libgdx] Removed deferred attachment lookup. 2016-06-28 17:29:38 +02:00
NathanSweet
5951e9f6b2 [libgdx] Removed deferred attachment lookup. 2016-06-28 17:28:16 +02:00
NathanSweet
206e7f983c Fixed attachment keys on different tracks.
badlogic/spine-internal#49

(cherry picked from commit 6cccbf61f3bd9f125958fac6eb120b839ae82738)
2016-06-26 20:31:23 +02:00
NathanSweet
6cccbf61f3 Fixed attachment keys on different tracks.
badlogic/spine-internal#49
2016-06-26 19:19:12 +02:00
NathanSweet
873e638b6e Ensure end events are called by clearTrack. 2016-06-26 19:08:02 +02:00
NathanSweet
0855ecd27c Allow setAnimation from within AnimationStateListener methods. 2016-06-26 18:08:25 +02:00
NathanSweet
1971306213 Update spineboy example. 2016-06-26 18:07:08 +02:00
NathanSweet
eb805cc562 Merge branch 'master' into dev 2016-06-26 15:28:33 +02:00
NathanSweet
83061d4d30 Method is package private for editor access. 2016-06-26 15:28:28 +02:00
NathanSweet
9171f79cc2 Fixes for AnimationState event order. 2016-06-26 15:27:46 +02:00