365 Commits

Author SHA1 Message Date
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
John
64aa883486 [Unity] Remove buggy fog from default shader. 2016-06-25 02:05:27 +08:00
Denis Novozhilov
290538752a [Unity] Fix SpriteAttacher for pivots outside sprite.
The case here is as follows:
 - create random unity sprite prefab
 - place sprite's pivot point outside of the sprite (say, pivot U is 2.53 and pivot V is -1.22)
 - try to attach this sprite via the SpriteAttacher script

Expected result here would be seeing the sprite sticking with it's pivot point to the placeholder.
Actual result here looks like the sprite's pivot point is somewhere in U: 1 and V: 0.

The bug is caused by Mathf.InverseLerp - it just cannot return values outside of [0; 1] range.

So the solution would be to make our own version of InverseLerp, which handles such situations correctly.
2016-06-25 00:10:08 +08:00
NathanSweet
e834982b49 Updated READMEs for v3.3 support. 2016-06-20 19:26:05 +02:00
John
21b8a03ccd [Unity] Update BoneFollower 2016-06-17 18:17:57 +08:00
pharan
16011c2eb1 [Unity] Update BoneFollower 2016-06-16 15:44:46 +08:00
John
c311a5aa2e [Unity] Fix SkeletonUtility debug bone scale. 2016-06-12 10:39:15 +08:00
John
5cceb22406 [unity/tk2d] Update editor code. Some cleanup and fixes. (#608)
* Initial cleanup and review.

* More cleanup and review.

* Removed missing atlas warnings for TK2D. Better button labels. Separated specialized/utility shaders.

* Clearer wording. More checks.

* Fix for Inspector reflowing between GUI events.

* Basic TK2D warning message.

* Fix play buttons. Removed useless reimport button for TK2D. Minor fixes.
2016-06-10 16:40:10 +08:00
John
f1406e2f85 Update spine-csharp to v3.2 (shearing) (#562)
* spine-csharp updated to 3.2.00.

* Some cleanup, catchup and fixes.

* Mix transform constraint scale and shear offsets.

* Update readmes.

* Clean up.

* Formatting.

* Fixed single bone IK with nonuniform scale. Improved two bone IK.
2016-06-01 02:25:30 +02:00
John
4b9d1b4f69 [Unity] Ragdoll fix (#596)
* Initial cleanup.
* More cleanup and debugging. Not fixed yet, but core task identified (probably).
* [Unity] Fixed Ragdoll2D and copied to 3D.
2016-06-01 00:05:08 +08:00
John
b6e502d653 [Unity] SkeletonDataAssetInspector minor fixes. 2016-05-31 19:33:02 +08:00
John
a2729ce3d0 Opt-in C# events for SkeletonAnimator. 2016-05-19 11:18:52 +08:00
John
dba0245753 Opt-in C# events for SkeletonAnimator. 2016-05-19 11:03:42 +08:00
John
0b00800e39 [Unity] Update basic json validity check. 2016-05-13 13:03:33 +08:00
John
e5b36f4180 [Unity] Update serialized custom materials
* SkeletonRendererCustomMaterials: correctly reapply changes when slot name changes (#554)
* Made sure private methods are private. Editor uses reflection.
* Also removed public properties.
2016-05-13 12:47:02 +08:00
pharan
4a36a95f06 [Unity] Remove dynamic meshes in prefabs by default. 2016-05-12 13:31:25 +08:00
John
f695cf19c2 [Unity] Fixed no renderables causing errors. 2016-05-09 03:18:07 +08:00
John
e493054028 [Unity] Cleanup SkeletonUtilityKinematicShadow. 2016-05-04 19:22:34 +08:00
John
4e730f0209 Spine.Unity namespace. 2016-05-03 21:37:15 +08:00
NathanSweet
8d7f761311 spine-libgdx updated to 3.2.00.
* Added transform constraint rotate, scale, and shear offsets and mixes.
* Added TransformConstraintTimeline.
* Added bone shearing.
* Added ShearTimeline.
* Changed Skeleton#updateCache.
* Changed JSON and binary formats. Some binary format fields and enums were rearranged for consistency -- sorry, but it's better for the long term. Docs for both are up to date.
http://esotericsoftware.com/spine-json-format
http://esotericsoftware.com/spine-binary-format
2016-04-26 22:51:04 +02:00
John
be4e99bd47 Link to new 2D Toolkit website. 2016-04-19 12:54:15 +08:00
pharan
f14e898d2d [Unity] Fix extra renderers check. 2016-04-19 05:45:10 +08:00
pharan
6316879c1c [Unity] Fix attachment match check. 2016-04-18 17:37:19 +08:00
John
8fb067a2d8 Update README.md 2016-04-18 07:00:07 +08:00
pharan
7a3c24b4fb [Unity] 3.1.05 compatibility and cleanup for SkeletonExtensions. 2016-04-14 03:40:50 +08:00
pharan
bf35d4979e [Unity] Workflow cleanup for serialized custom materials module. 2016-04-14 03:36:36 +08:00
Serhii Yolkin
a634d39765 Improved material overrides (#536)
* per-material material overrides, separate MonoBehaviour for setting overrides from inspector

* clean-up and fix SkeletonRendererMaterialOverride

* SkeletonRendererCustomMaterials: initialize SkeletonRenderer to ensure skeletonRenderer.skeleton != null

* rename SkeletonRendererCustomMaterials folder for consistency
2016-04-14 00:56:32 +08:00
John
5f6deea7a0 Replaced Begin-End with using scopes 2016-04-08 16:00:24 +08:00
John
1e45b87e51 BoneFollower inspector fixes. 2016-04-05 12:30:53 +08:00
NathanSweet
a60a0d1b78 Documentation. 2016-04-04 10:19:37 +02:00
NathanSweet
4f3ccc2c51 List the supported editor version on each runtime README.
closes #526
2016-04-03 19:10:47 +02:00
pharan
8896eef030 More resetter extension methods. 2016-03-26 10:09:40 +08:00
pharan
1589d147f9 Per-MeshRenderer Custom Material Override 2016-03-25 02:43:44 +08:00
pharan
ec268a50e0 Minor SkeletonExtensions update. 2016-03-24 03:46:48 +08:00
pharan
129a92afec Updated sample scenes. 2016-03-24 01:58:10 +08:00
pharan
cc95db8e6c All scripts now in Spine.Unity and Spine.Unity.Modules namespace 2016-03-24 01:53:22 +08:00
pharan
c0eb1a5237 SkeletonRenderer update. 2016-03-24 00:37:52 +08:00
pharan
aea0c1a923 HelpURL for main Component types. 2016-03-24 00:37:06 +08:00
pharan
fdf07aed92 Removed Mesh Generation Samples. 2016-03-24 00:36:08 +08:00
pharan
46ee116ee3 RenderSeparator update. 2016-03-24 00:35:19 +08:00
pharan
9254e18801 Spine.Unity and Spine.Unity.Editor namespace 2016-03-24 00:34:22 +08:00
pharan
80d8e9e276 Cleanup and improved inspector workflow. 2016-03-20 00:49:13 +08:00
pharan
9e8fdeef6c Spine.Unity namespace and some editor tweaks. 2016-03-19 16:54:43 +08:00
pharan
50a0960a7d Arrays Mesh Generators now share code. 2016-03-16 22:22:24 +08:00
pharan
bf4511c8de Merge remote-tracking branch 'esotericsoftware/master' into unity-skeletonrenderer 2016-03-16 02:48:15 +08:00
pharan
8e8b5e3904 Multiple submeshes per part. 2016-03-16 02:47:22 +08:00
John
143b750dc9 Exclude BuildTargetGroup.Unknown 2016-03-15 16:01:57 +08:00
pharan
345f45d8a5 Merge branch 'master' of https://github.com/EsotericSoftware/spine-runtimes 2016-03-15 12:09:34 +08:00
pharan
a734671090 Removed old raptor sample binary. 2016-03-15 12:05:34 +08:00
John
476ce5165d SkeletonDataAssetInspector null checks & helpbox. 2016-03-15 01:47:44 +08:00