118 Commits

Author SHA1 Message Date
badlogic
0be704dc66 [cocos2d-objc] Added batcher, incomplete 2017-03-02 08:47:15 +01:00
badlogic
8c6a91c2a1 [cocos2dx] Batching of adjacent two color tinted skeletons. See README.md for rules on what does and doesn't break batching 2017-03-01 11:28:29 +01:00
badlogic
f93486e11b [cocos2dx] Fixed Windows build of example 2017-02-28 16:46:10 +01:00
badlogic
ca23700db0 [cocos2dx] Fixed formatting, removed printf... 2017-02-28 15:40:07 +01:00
badlogic
1be3c1a6b4 [c] Implemented two color tinting. We use our own batching/shader, see SkeletonTwoColorBatch. Currently, every two color tinted skeleton is its own batch. Enable two color tinting by SkeletonRenderer::setTwoColorTint(true) for a specific skeleton instance 2017-02-28 15:36:04 +01:00
badlogic
38c3687e85 [cocos2dx] Fixed mesh rendering 2017-02-20 10:22:51 +01:00
badlogic
aa33f980d2 [cocos2dx] First try at optimizing renderer by removing allocation. Meshes temporarily broken 2017-02-20 10:00:57 +01:00
badlogic
25fb5b1bff [cocos2dx] Ported to 3.6, no two color batching yet 2017-01-30 16:55:04 +01:00
badlogic
b9ee3bfc5d [cocos2dx] Add missing new AnimationState methods. Closes #807 2016-12-20 10:45:24 +01:00
NathanSweet
36000e3c55 Updated to v3.5 (merge dev branch).
# Conflicts:
#	spine-c/src/spine/AnimationState.c
2016-11-15 23:10:23 +01: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
25be5370b2 [cocos2d-x] Fixed up binary loader support 2016-10-03 14:18:57 +02:00
badlogic
89d9ee00dc [cocos2d-x] Cleaned up #716, added #712 manually to fix shared data rendering 2016-10-03 13:57:12 +02:00
Ricardo Quesada
efe0b55dbb Adds Binary support to cocos2d-x (#716)
- it simplifies the constructors/initializors
- the binary API is ::createWithBinaryFile()
- the JSON API is :: createWithJsonFile()
- the old API ::createWithDataFile() is deprecated and calls
createWithJsonFile()
2016-10-03 13:37:34 +02:00
Wilson E. Alvarez
3c12d54653 Fix mismatched memory deallocator in SkeletonRenderer.cpp (#702) 2016-09-23 12:57:53 +02:00
halx99
2f5e549475 Fix memory leak of c++ objects (#697)
We used C malloc/free which can't properly destruct C++ objects.
2016-09-13 11:28:17 +02:00
badlogic
48c5b06676 [cocos2dx] Closes #611, cocos2d-x v3 auto-batcher does it's work, makes SkeletonBatch a lot simpler 2016-09-11 13:26:51 +02:00
badlogic
93dd99a4a4 [cocos2dx] Closes #685, used FLT_MIN incorrectly in bounds calculation 2016-08-26 10:34:14 +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
c8b72e382f [cocos2d-x] Closes #580, temporary storage of color was wrong in SkeletonRenderer 2016-08-02 10:42:55 +02:00
badlogic
2a32c3e113 [cocos2d-x] Closes #612, added SkeletonBatch::destroyInstance for testing purposes 2016-08-01 12:16:43 +02: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
ffafd67873 [cocos2dx] Added SkeletonAnimation::findAnimation, closes #285 2016-07-18 17:01:47 +02:00
badlogic
103ba493d6 [cocos2dx] Closes #370, fix primitives deprecation in debug renderer 2016-07-18 16:50:02 +02:00
badlogic
db05421930 [cocos2dx] Closes #605, crash on iOS when system UI is triggered. 2016-07-18 16:19:55 +02:00
badlogic
8ec8212c5d [cocos2dx] Closes #610, closes #627 2016-07-18 16:03:15 +02:00
badlogic
6e09fb8512 [cocos2dx] Closes #378, bounding box will have zero width/height if all attachments are invisible 2016-07-18 15:23:38 +02:00
badlogic
1c192cc3fb [cocos2d-x] Closes #472, fail gracefully if file is not found 2016-07-18 15:08:45 +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
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
sbrednikhin
0dd179b4b4 vector and matrix names fixed
Vector -> Vec2
Matrix -> Mat4
according to cocos 2dx 3.1 alpha branch
2014-05-16 10:54:38 +03:00
NathanSweet
df312f4d24 Deleted forward declaration. 2014-05-15 19:50:00 +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
728cc12c3e Clean up. 2014-05-08 23:18:10 +02:00
NathanSweet
90ec4db279 C++11 AnimationState listener.
Because 2014.
2014-05-08 22:29: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
8a66c3cd0a Include algorithm for std::min/min. 2014-03-07 14:36:55 +01:00
NathanSweet
9780af9524 Fixed premultiplied alpha. 2014-02-01 01:27:58 +01: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
104b79379f Made getTextureAtlas virtual. 2013-12-05 18:50:31 +01:00