2279 Commits

Author SHA1 Message Date
NathanSweet
42da9a7ea6 Merge remote-tracking branch 'origin/master' 2016-07-06 16:45:45 +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
badlogic
44be67970d [c] Guarded macros against expressions of death 2016-07-06 12:24:48 +02:00
NathanSweet
005861c242 [c] Fixed unused warning. 2016-07-06 12:16:29 +02:00
badlogic
a86681a909 Merge branch 'master' of https://github.com/esotericsoftware/spine-runtimes 2016-07-06 12:17:12 +02:00
badlogic
ef3041a84b [c] Fixed SIN_DEG/COS_DEG 2016-07-06 12:17:03 +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
John
c7b6966055 [spine-unity] Better BoneFollower editor warnings. 2016-07-05 16:12:21 +08:00
pharan
94df4cb5be [spine-unity] Fix SkeletonDataAsset inspector error on recompile. 2016-07-05 15:22:11 +08:00
John
ccb9303681 [spine-unity] Fixed linked weighted meshes. 2016-07-05 06:11:20 +08:00
John
bde07221b3 [spine-unity] Fix SkeletonGhostRenderer namespace. 2016-07-05 05:15:17 +08:00
pharan
ebd8831a17 [spine-unity] 3.3 changes to TK2D code + better default scale. 2016-07-04 13:58:34 +08:00
NathanSweet
fca7c478e2 [spine-libgdx] Fixed Skeleton copy constructor. 2016-07-04 02:13:45 +02:00
NathanSweet
0a08704ee8 [spine-csharp] Removed whitespace. 2016-07-04 02:13:23 +02:00
NathanSweet
5c9b1f30eb [spine-csharp] Minor clean up. 2016-07-04 00:51:44 +02:00
NathanSweet
50433bb4a0 [spine-csharp] Minor clean up. 2016-07-04 00:42:40 +02:00
John
f1730b2b38 [csharp] Fixed missing paren. 2016-07-01 23:44:39 +08:00
NathanSweet
9f15d1be4a Merge remote-tracking branch 'origin/master' 2016-07-01 17:19:30 +02:00
NathanSweet
3bb34eb9f9 Updated examples with binary data and PMA and non-PMA atlases. 2016-07-01 17:19:18 +02:00
Mario Zechner
eaccc10035 Merge pull request #625 from Hinidu/fix-bone-iter
[csharp][libgdx] fix iterating bones in VertexAttachment.ComputeWorldVertices.
2016-07-01 11:47:59 +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
badlogic
4e49723cd4 [spine-csharp] Fixed ColorTimeline parsing 2016-07-01 09:55:31 +02:00
NathanSweet
a39df63fd0 Updated a few example projects to 3.3.07. 2016-06-30 23:49:26 +02:00
NathanSweet
1b16e521ca [csharp, monogame, xna] Updated copyright info. 2016-06-30 23:49:09 +02:00
NathanSweet
1c717e2d44 Added example projects and exports. 2016-06-30 15:43:15 +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
NathanSweet
ac00899175 Merge remote-tracking branch 'origin/master' 2016-06-25 22:13:36 +02:00
NathanSweet
e0ee18a088 Fixed single bone IK mixing. 2016-06-25 22:13:31 +02: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
a9a771ba1c Removed old attachment types. 2016-06-24 14:50:22 +02:00
NathanSweet
ebab0c6ca7 Merge remote-tracking branch 'origin/master' 2016-06-23 22:56:43 +02:00
NathanSweet
39da610005 Used constants. 2016-06-23 22:54:33 +02:00
Vlad Shcherban
559fcbfcb9 * [Lua] Adding Spine atlas parser
* [Corona] Adding ability to load atlas files
* [Corona] Added example of using atlas

# Documentation:

## Lua runtime: `spine.Atlas.parse`

`Atlas.lua` introduces `spine.Atlas.parse(atlasPath, baseDir)` funciton. This function can be use across Lua runtimes to implement their their own image sheet bindings. It will return Array of `Page`s or `nil` if error.

### `Page` properties:
* `name` - filename of the page (`"raptor.png"`)
* `size` - dimmensions of original image (`[1022,1022]`)
* `format` - texture format (`"RGBA8888"`)
* `filter` - filter for texture scalin up and down (`["Linear","Linear"]`)
* `wrap` - wrap modes (`"none"`)
* `regions` - Array of `Region`s on this page

### `Region` properties:
* `name` - region name (`"torso"`)
* `rotate` - is image rotated in texture (`true`)
* `xy` - image frame position on texture (`[610,647]`)
* `size` - image frame size on texture (`[54,91]`)
* `splits` - (optional)
* `pad` - (optional)
* `orig` - original image size (`[54,91]`)
* `offset` - offset if image was trimmed (`[0,0]`)
* `index` - `-1`

## Corona runtime: `spine.GetAtlasSprites`

`spine.lua` introduces `spine.GetAtlasSprites(atlasName, baseDir)`, which returns `Sprites` table. This funciton would parse atlas, locate atlas textures, load them to Corona's image sheets and create convinience bindings and functions. User can use convenience functions, or write own wrappers.

### `Sprites` table
#### Convenience functions:
* `ATLAS_HELPER_createImage` - can be assigned to `skeleton.createImage`
* `ATLAS_HELPER_createMesh` - can be assigned to `skeleton.createMesh`
* `ATLAS_HELPER_setupSkeleton` - use this on skeleton to assing both creation functions (`sprites.setupSkeleton(skeleton)`)

### Region name bindings:
All other elements of `Sprites` table would contain binding `sprites["region_name"] = sheetReference`, where each `sheetReference` contains following elements:

* `frame` - number of frame in image sheet (`42`)
* `region` - reference to `Region` table
* `page` -  reference to `Page` table. `Page` table would also get new property - `sheet`, reference to Corona's image sheet where sprites can be accessed.

As result, to create image for `attachment` code would look something like `display.newImage( sprites[attachment.name].page.sheet, sprites[attachment.name].frame )`. For more rubust example see `ATLAS_HELPER_createImage` in `spine-corona/spine.lua`.

# Known Issues:

* Corona would not work with padded/cropped atlases.
* Possible (but unprobable) name collision with region names and `ATLAS_HELPER_*` functions.
2016-06-23 11:07:12 -04:00
Mario Zechner
a98f76f13f Update README.md 2016-06-22 21:20:14 +02:00