55 Commits

Author SHA1 Message Date
Jare Guo
041b6ddb00 [cocos2dx] allow load custom atlas texture in _spAtlasPage_createTexture for CocosCreator (#1018) 2017-10-13 09:50:03 +02:00
NathanSweet
c0fdc454a2 Fixed inconsistent newlines.
License header was followed by \n\n and files ended with \n. Changed to \r\n.
2016-10-15 23:45:16 +02:00
badlogic
5aa27771c3 [runtimes] Updated ALL sources to use latest Spine Runtimes License v2.5. Manually checked all the things... 2016-10-13 15:12:05 +02:00
badlogic
819bb4cf0c [cocos2d-x] Closes #650, don't deep copy data read from file on cocos2d-x 3.12+ 2016-08-05 10:09:07 +02:00
Ricardo Quesada
55c576e560 fix: applies PR #650 correctly
instead of passing and `int` to `takeData()` it passes a `ssize_t`
preventing a possible stackoverflow certain 64-bit platforms
2016-08-02 16:05:49 -07:00
badlogic
e3e122b3fc [cocos2d-x] Reverted takeBuffer PR so we are compatible with both 3.12 and < 3.12 cocos2d-x. 2016-08-01 11:43:22 +02:00
mogemimi
aca157afda [cocos2d-x] Add missing switch case 2016-07-29 07:10:15 +09:00
halx99
4f3a82834c #Use Data::takeBuffer replace deep copy data.
Avoid unnecessary memory alloc & copy
2016-07-28 11:21:34 +08:00
badlogic
8ec8212c5d [cocos2dx] Closes #610, closes #627 2016-07-18 16:03:15 +02:00
badlogic
1c192cc3fb [cocos2d-x] Closes #472, fail gracefully if file is not found 2016-07-18 15:08:45 +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
e68c830876 cocos2d-x support for: 2.2.4, 3.0, 3.1alpha1 2014-05-16 16:33:30 +02:00
NathanSweet
4defc3146a Return the texture while Spine is using it. 2014-05-16 12:10:27 +02:00
NathanSweet
df959cb646 Meshes, FFD and skinning for cocos2d-x. 2014-05-14 21:49:35 +02:00
NathanSweet
36809166a2 Make AnimationState TrackEntry create/dispose functions optional.
closes #218
2014-05-12 17:12:24 +02:00
NathanSweet
7199d22417 Better AnimationState listeners, including on a TrackEntry. 2014-05-11 21:00:50 +02:00
NathanSweet
5c6ebf2c63 cocos2d-x updated to 3.1alpha0.
No meshes yet.
2014-05-08 19:21:50 +02:00
NathanSweet
26e4fb0d74 License header update.
2 -> 2.1 (clearer how permission is granted, formatting).
2014-04-23 12:04:43 +02:00
NathanSweet
b0c96fd66b Typo 2014-01-11 21:20:46 +01:00
NathanSweet
d520addb9b Updated license to version 2.
Version 1 of the license didn't make sense: it required a Spine license to use the Spine Runtimes at all. This means if you used the Spine Runtimes in your application, anyone who purchased a copy of your application also needed a Spine license to use the runtimes. This was not the intent!

Version 2 of the license fixes this by allowing anyone to use the Spine Runtimes but only for internal use. When you purchase Spine, the Spine license (http://esotericsoftware.com/spine/files/license.txt) grants you the right to make and distribute derivative works of the Spine Runtimes. Now it makes sense: making and distributing applications with the Spine Runtimes requires a Spine license, but anyone can run that software without needing a Spine license.

With this fixed, I hope we never need to change the license again!
2014-01-11 21:07:28 +01:00
NathanSweet
2bff08de4b Prefixed all spine-c structs and functions with "sp".
Holy refuctoring! Sorry for the change, but some libraries were having naming conflicts. You can define SPINE_SHORT_NAMES before including spine-c headers if you want to use structs and functions without the "sp" prefix, as it was before.
2013-10-09 03:43:16 +02:00
NathanSweet
9a347d5eb8 Updated license.
Nailed it this time, quite sure!
2013-10-04 04:13:09 +02:00
NathanSweet
47ce2a40c1 Minor update to the license to include education. 2013-10-01 14:55:15 +02:00
NathanSweet
e4358cf904 Fixed ("fixed") Android rendering, #33. 2013-09-30 00:54:09 +02:00
NathanSweet
957f5a539e Renamed setListener to setAnimationListener. 2013-09-26 22:55:17 +02:00
NathanSweet
0cc7258580 spine-cocos2dx now compiles with latest spine-c. 2013-09-24 16:12:51 +02:00
NathanSweet
e2fccf72d6 License update.
Changed from New BSD to a custom license. The new license requires a Spine license to use the code. If you have a valid Spine license, you can do whatever you like with the code. This should not be a problem for anyone using the runtimes with Spine, nothing changes. If using the runtimes without a Spine license, you now need a Spine license. This is because the runtimes were created explicitly to be used with Spine.
2013-09-20 19:46:23 +02:00
NathanSweet
e6d7cf8b26 Add x and y to skeleton for positioning instead of using root bone. 2013-05-28 18:17:55 +02:00
NathanSweet
a4bd912dc1 Fixed premultiplied images (the default). 2013-05-12 14:22:12 +02:00
NathanSweet
cdadffc156 Removed spine namespace from spine-c.
Didn't make any sense for a C API and complicated integration with ObjC.
2013-05-08 20:09:10 +02:00
NathanSweet
80fdba02a1 Refactoring: RegionAttachment vertices, texture->rendererObject...
- Vertices are no longer stored on RegionAttachment. The vertices are temporary state, not part of RegionAttachment's persistent state like UVs and offset.
- AtlasPage and RegionAttachment "texture" field is renamed to "rendererObject". This is a better name as it may not be a texture.
- AtlasAttachmentLoader uses the AtlasRegion as the rendererObject. This enables a renderer to use region information if needed. The page rendererObject is still available.
- Better "enum" look up for AS3.
- Unity4 example doesn't use a compressed material.
2013-05-05 12:37:24 +02:00
NathanSweet
90180dafbb CCSkeletonAnimation separated from CCSkeleton.
Has convenience methods to apply multiple AnimationStates and queue animations.
2013-04-27 16:58:22 +02:00
NathanSweet
64a0a07373 Refactoring for non-Atlas RegionAttachments. Fixed whitespace stripped and rotated regions. 2013-04-24 16:54:13 +02:00
NathanSweet
f055dc8fd7 Removed convenience methods to make it clear that the spine-c API should be used.
Discussion here:
http://www.esotericsoftware.com/forum/viewtopic.php?f=3&t=536
2013-04-19 17:47:43 +02:00
NathanSweet
5a46f8c6b4 isComplete for AnimationState. 2013-04-19 09:14:29 +02:00
NathanSweet
7bd6f62a2b Added AnimationState clear.
id return value for factory methods.
2013-04-18 23:31:29 +02:00
NathanSweet
7193122908 Fixed cocos2d texture atlas usage.
Super cool API you got going there, cocos2d... :|
2013-04-18 19:08:34 +02:00
NathanSweet
2bc3f511a1 Refactoring to make extension easier.
Much less weird OOP needed. Rendering is separate from data objects. cocos2d-iphone and cocos2d-x support for multi page atlases.
2013-04-17 22:08:53 +02:00
NathanSweet
3defbc4132 boundingBox takes into account scale and position. #32 2013-04-17 10:03:58 +02:00
flamingo
817304cecc Update spine-cocos2dx.cpp
Fixed crash at bounding box function.
2013-04-14 14:25:08 +04:00
NathanSweet
e56050e3a7 Better class extension. 2013-04-11 06:06:23 +02:00
NathanSweet
4f971f30fb Initialize fields, issue #28. 2013-04-11 00:13:53 +02:00
NathanSweet
a624c637c7 Added updateQuad and boundingBox. 2013-04-08 19:02:58 +02:00
NathanSweet
5bab2830a9 Fixed texture atlas capacity expansion. 2013-04-08 04:26:15 +02:00
NathanSweet
a165849d6e Clean up. 2013-04-06 18:27:51 +02:00
NathanSweet
6780447b83 Fancier C++/ObjC APIs to avoid C API with simple usage.
NSString instead of cstr for ObjC.
2013-04-04 17:12:21 +02:00
NathanSweet
dd27ee184c Changed Spine export format.
There are no longer separate animation files, they are now inside the skeleton file. This means there is just one file to manage, which is cleaner. Now that animations are stored in SkeletonData, they can be looked up by name which leads to cleaner runtime APIs.

cocos2d and cocos2d-x runtimes got a cleaner ObjC/C++ API.
2013-04-04 04:00:45 +02:00
NathanSweet
a398fe6201 Atlas now prefixes images referenced in the atlas file with the directory containing the atlas file. 2013-04-03 03:37:52 +02:00
NathanSweet
0b75fc58d4 Fixed timeScale initial value. 2013-04-03 02:02:59 +02:00
NathanSweet
3c6954872a Adde animation state to example. 2013-04-02 19:10:48 +02:00