5000 Commits

Author SHA1 Message Date
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
Mario Zechner
1b9705388f Merge pull request #618 from Shiu/patch-1
Update README.md
2016-06-22 21:14:52 +02:00
Søren Nielsen
59f472de3c Update README.md 2016-06-22 21:14:31 +02:00
badlogic
6e71449974 Fixed merge conflicts 2016-06-22 15:33:35 +02:00
John
b9bd66b36b Updated spine-c, spine-sfml, spine-cocos2d-objc and spine-cocos2dx to 3.2.01
- Updated spine-c to 3.2.01, adding shearing and transform constraints plus various bug fixes
- Introduced CMake based system to generated IDE projects for spine-sfml, and download dependencies for all other runtimes
- Updated all spine-c based runtime READMEs with new usage and example instructions
- Moved spine-cocos2d-iphone v2 and spine-cocos2dx v2 to separate branches. These will no longer be updated
- Renamed spine-cocos2d-iphone to spine-cocos2d-iphone

Removed cocos2d-ios v2 Spine runtime. See branch cocos2d-ios-v2 for legacy apps

Moved cocos2d-ios v3 Spine runtime to top-level sphine-cocos2d-iphone directory

Added Visual Studio support to CMake build

Added Linux support for spine-sfml. Do apt-get install sfml-dev as a prerequisit, makes everyone's life easier

Refactored Mac OS X framework detection and linking, added SFML_STATIC define for Win32 build

Removed spine-cocos2dx v2 runtime. See cocos2dx-v2 branch on Github

Moved spine-cocos2dx v3 runtime to root of spine-cocos2dx

spine-c, spine-cocos2d-iphone, spine-cocos2dx, spine-sfml updated to 3.2.00

* Added CMake build for spine-c and spine-sfml
* Removed spine-cocos2dx v2 and spine-cocos2d-iphone v2. See the cocos2dx-v2 and cocos2d-ios-v2 branches if you need these runtimes still
* Added transform constraint rotate, scale, and shear offsets and mixes
* Added spTransformConstraintTimeline
* Added bone shearing
* Added spShearTimeline
* Changed spSkeleton_updateCache
* Changed JSON format, see http://esotericsoftware.com/spine-json-format

Ported 1be89d1c5766fedb91f080a23bffaef6609b86c3 to spine-c

Cleaned up spine-c, removed IDE specific files and unnecessary data/ folder. Use CMake to import into your most beloved IDE

Added spine-cocos2d-iphone to CMake, only downloads cocos2d-objc dependency. Use Xcode project in spine-cocos2d-iphone/ to run examples

Added -std=c98 -pedantic -Wall to spine-c CMake file, fixed up all warnings, fixed up .gitignore

Fixed warnings, replaced calls to stdlib cos/sin/atan2 with macros

New cocos2dx example project, for Windows, Linux and Mac OS X. Doesn't work on Windows/Linux yet

Fixed spine-cocos2dx Visual Studio projects

Reworked cocos2dx dependency resolution

Fixed up src/header paths in CMake files. Dependencies are only downloaded if you build a specific runtime example

Updated spine-sfml README with instructions for Windows

Updated spine-sfml README with instructions for Linux and Mac OS X

Fixed README formatting

More formatting, sorry, can't preview markdown...

More README changes

Renamed spine-cocos2d-iphone to spine-cocos2d-objc, fixed up Xcode project and README

Updated spine-cocos2d-objc README

Added context when exceptions are thrown during attachment and animation parsing.

Added JsonRollback, a tool for converting newer JSON so it can be loaded by an older Spine version.

[Unity] Update BoneFollower

Added coverting linkedmesh to weightedlinkedmesh.

[LUA] AnimationState trackCount bugfixes (#466)

* resolved conflict

* made trackCount keep count, not maximum track index.

Prettier with varargs.

Updated .gitignore to exclude cocos2dx dependencies

Fixed up READMEs of spine-c based runtimes with proper version info. Fixed cocos2d-x CMake build to delete outdated Spine runtime shipped by cocos2d-x
2016-06-22 15:23:31 +02:00
NathanSweet
71b3484062 Clean up. 2016-06-22 12:55:36 +02:00
NathanSweet
e834982b49 Updated READMEs for v3.3 support. 2016-06-20 19:26:05 +02:00
NathanSweet
d506478479 Method is package private for editor access. 2016-06-20 19:25:46 +02:00
NathanSweet
eded12cd52 Removed hardcoded paths.
Oops, sorry!
2016-06-20 19:25:29 +02:00
NathanSweet
9a469c0460 Prettier with varargs. 2016-06-18 21:57:26 +02:00
NathanSweet
9ff1d11e1b Merge remote-tracking branch 'origin/master' 2016-06-18 19:16:15 +02:00
NathanSweet
f961c127f6 Added coverting linkedmesh to weightedlinkedmesh. 2016-06-18 19:16:02 +02:00
Matthew
db2190e7db [LUA] AnimationState trackCount bugfixes (#466)
* resolved conflict

* made trackCount keep count, not maximum track index.
2016-06-17 20:11:41 +02:00
NathanSweet
8239b2f905 Merge remote-tracking branch 'origin/master' 2016-06-17 12:24:42 +02:00
NathanSweet
2f846cfba5 Added JsonRollback, a tool for converting newer JSON so it can be loaded by an older Spine version. 2016-06-17 12:24:38 +02:00
NathanSweet
b41d85a692 Added context when exceptions are thrown during attachment and animation parsing. 2016-06-17 12:21:32 +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
NathanSweet
db1afae89a Merge remote-tracking branch 'origin/dev' 2016-06-15 20:18:29 +02:00
John
c311a5aa2e [Unity] Fix SkeletonUtility debug bone scale. 2016-06-12 10:39:15 +08:00
NathanSweet
534ffc8d1d Back to constant speed.
It's better.
2016-06-12 03:55:59 +02:00
NathanSweet
021dfe288b Renamed constant speed to accurate. 2016-06-11 05:04:43 +02:00
mogemimi
fc8505ff81 Fix -Wshadow warning when compiling with Clang (#607) 2016-06-10 23:41:23 +02:00
NathanSweet
d5228d2549 Fixed having > 8 linked meshes. 2016-06-10 20:12:20 +02: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
NathanSweet
ae4ac8210f Check default skin, fixed crash. 2016-06-10 04:14:19 +02:00
NathanSweet
92d7ef32f4 Multiple constrained bones for transform constraints. 2016-06-10 03:21:54 +02:00
NathanSweet
8b3b0169ad Added Slot#getIndex. 2016-06-10 00:27:56 +02:00
NathanSweet
52545f262b Fixed update order for path weights.
Not super happy with having to do this, but it seems necessary.

badlogic/spine-internal#72
2016-06-10 00:27:46 +02:00
NathanSweet
8d19504bd7 Fixed binary path loading. 2016-06-09 19:31:05 +02:00