1064 Commits

Author SHA1 Message Date
Ricardo Quesada
de3de39f57 Sample works with the new v3.2 API
Updates API in samples

Adds iOS and Mac projects. Convient Xcode project to test
the sample really easy.
2014-07-31 12:53:37 -07:00
NathanSweet
a29c942f66 Minor license update for clarity. 2014-07-31 02:00:38 +02:00
Nathan Sweet
357185a9a6 Merge pull request #260 from ricardoquesada/cocos2dx_v32_api_fixes
Fixes for the cocos2d-x v3.2 API
2014-07-31 00:40:28 +02:00
Ricardo Quesada
05c2315008 Fixes for the cocos2d-x v3.2 API 2014-07-30 15:33:52 -07:00
Nathan Sweet
50da55bcde Merge pull request #257 from jvasti/master
Cocos2d-iphone v.3.1 support
2014-07-30 15:22:39 +02:00
NathanSweet
a35223328e Use lastTime for AttachmentTimeline.
closes #221
2014-07-30 00:56:09 +02:00
Nathan Sweet
623e0a7c96 Merge pull request #256 from ricardoquesada/cocos2dx_v32
Cocos2dx v32
2014-07-29 17:44:43 +02:00
NathanSweet
b1d77cc2c4 Fixed curves.
I shan't be trusted with math.
2014-07-29 00:08:53 +02:00
jvasti
23af9ad659 Cocos2d-iphone v.3.1 support
PolygonBatch has been removed since Cocos2d-iphone has automatic
batching. CCDrawingPrimitives calls have been changed to CCDrawNode
calls and the rendering of triangles have been ported to CCRenderer.
Xcode projects have been updated with the necessary GLKit dependancy
2014-07-28 17:49:26 +03:00
NathanSweet
b9139fc5d4 Calculate curves ahead of time.
More memory (15 versus 6 floats per key) but faster curve look ups.
2014-07-28 00:37:35 +02:00
NathanSweet
21c036d67a Docs. 2014-07-27 00:13:23 +02:00
NathanSweet
95dd47c790 Docs. 2014-07-26 22:02:00 +02:00
NathanSweet
79a5bf4493 Docs. 2014-07-26 21:58:43 +02:00
NathanSweet
619856a16d Docs. 2014-07-26 21:58:07 +02:00
NathanSweet
2bf851f349 Docs. 2014-07-26 01:02:16 +02:00
NathanSweet
176cc05fc6 Docs. 2014-07-26 01:00:29 +02:00
NathanSweet
4e5818a9dc Updated examples. 2014-07-26 00:50:26 +02:00
NathanSweet
e30a267c19 spine-unity, made compatible with Unity 4.3.4. 2014-07-26 00:45:40 +02:00
Nathan Sweet
a64d74b728 Merge pull request #254 from Fenrisul/master
SpineUnity Import process enhancements
2014-07-26 00:11:26 +02:00
NathanSweet
c9b51bac8b Use and restore existing blend mode.
#236
2014-07-25 23:08:05 +02:00
NathanSweet
6d398233d7 spine-starling, use Vector of Dictionarys to avoid allocation to look up skin attachments.
#236
2014-07-25 23:04:32 +02:00
NathanSweet
dee15d16b3 Clean up. 2014-07-25 22:33:10 +02:00
Nathan Sweet
0a640b4432 Merge pull request #240 from matulkum/master
enable SkeletonJson to load Objects (not just Strings)
2014-07-25 22:31:10 +02:00
NathanSweet
bdace991a8 Removed unused local. 2014-07-25 22:09:50 +02:00
NathanSweet
b0da7d0e52 Fixed reading inherit scale and rotation. 2014-07-25 20:31:22 +02:00
Ricardo Quesada
61222e3a28 Updates README with v3.2 information 2014-07-25 11:04:15 -07:00
NathanSweet
4eb73738c2 Fixed spine-starling meshes with a Starling atlas. Better examples. 2014-07-25 19:39:45 +02:00
Fenrisul
8a68f5a75a Spine Editor Utility Drag and Drop importer 2014-07-25 10:38:52 -07:00
Fenrisul
a7bf0ca963 Set loop mode on dragon example 2014-07-25 10:37:32 -07:00
Ricardo Quesada
c8bc2bc378 Supports cocos2d-x v3.2
- Changes `draw()` with the new v3.2 API: `bool transformUpdated` -> `uint32_t transformFlags`
- cocos2d-ified the API:
  - `const char*` -> `const std::string&`
  - constructors and destructors are `protected` (not `public`)
  - using `_` prefix for ivars
2014-07-25 10:16:11 -07:00
Ricardo Quesada
234e8cf5f2 Adds runtime for cocos2d-x v3.2
Copies v3.1
2014-07-25 09:46:24 -07:00
Fenrisul
dc150f6547 Updated examples 2014-07-25 08:18:45 -07:00
NathanSweet
e6ba25c59b Fixed enableErrorChecking. 2014-07-25 16:40:40 +02:00
NathanSweet
ff926a2b8e Default mesh rendering to true.
Less confusing for noobs.
2014-07-25 16:39:04 +02:00
NathanSweet
6d7beac3aa Added support for smoothing other than bilinear. 2014-07-25 16:34:39 +02:00
NathanSweet
669b0ac155 Added attachments property. 2014-07-24 22:06:59 +02:00
NathanSweet
8e149b3e16 Merge remote-tracking branch 'origin/master' 2014-07-24 12:48:35 +02:00
NathanSweet
749145301f Fixed incorret scaling. 2014-07-24 12:48:27 +02:00
Nathan Sweet
0d10ea46a0 Merge pull request #244 from taril42/master
Json parser optimizations for spine-c.
2014-07-24 02:54:39 +02:00
NathanSweet
8a46d48e80 IK is complete for spine-libgdx when exporting from Spine 1.9.06+. 2014-07-23 22:33:45 +02:00
Fenrisul
7f700eeb93 SpineUnity Import process enhancements
scaled down examples to match standard Unity practices
added spineboy movement example
2014-07-23 03:34:18 -07:00
NathanSweet
148715426f Fixed single bone IK when rotation inheritance is off. 2014-07-23 00:23:37 +02:00
NathanSweet
cd146f24a8 Merge remote-tracking branch 'origin/master' 2014-07-22 23:44:34 +02:00
NathanSweet
62560444cf Single bone IK. 2014-07-22 23:44:23 +02:00
Nathan Sweet
0b1d9448eb Merge pull request #251 from Furkanzmc/master
Static Cast RGBA Values to Avoid Compiler Warnings
2014-07-22 09:19:45 +02:00
Nathan Sweet
f035c0d119 Merge pull request #253 from Fenrisul/master
Added basic skeleton extension methods for Slot, Attachments, and Bone t...
2014-07-22 09:19:18 +02:00
Fenrisul
599a3fa835 Added basic skeleton extension methods for Slot, Attachments, and Bone to better integrate with Unity Color and Vector classes 2014-07-21 20:48:18 -07:00
NathanSweet
6444e8e934 IK constraints for spine-libgdx.
Note Spine doesn't yet export IK data, so spine-libgdx doesn't yet load it. Soon!
2014-07-22 00:21:27 +02:00
Furkan Üzümcü
cbb775af97 Static cast rgba value
Add static_cast to the rgba valuse to cast them to sf::Uint8, so that
compiler warnings can be avoided.
2014-07-17 03:45:31 +03:00
Leander Hasty
1135bf8a3c Json parser optimizations for spine-c.
Various optimizations for Json.c and Json.h.

parse_value uses a switch on starting character and avoids three strncmp
calls in many cases.

parse_number dispatches to strtod (C89) or strtof (C99), which is a
slightly more permissive superset of JSON's RFC4627 number parsing, but
is also quite a bit faster.   More explicit error handling added here
too.

(The parse_value and parse_number changes alone made for a ~1.5x speedup
on our tiny ARM926 platform using uclibc 0.9.30 and gcc 4.3.3.)

Use _stricmp or strcasecmp in Json_strcasecmp.  This one has a tricky
#include issue; it's in <strings.h> in some systems and <string.h> in
others.  Defining _DEFAULT_SOURCE and/or _BSD_SOURCE pulls it into
<string.h> in all of the systems we could find.  This is a noticeable
win, but less than parse_value or parse_number.

Elide NULL checks in almost all functions, insert one during
Json_create.  Everywhere else, the code already explicitly checks and
returns.  skip() keeps a NULL check but pushes it outside the loop, so
we only check it on entry to the method.

Also elide some redundant starting character checks for parse_object
('{') and parse_array ('[') since they're only called from parse_value
and we know the character is correct.  There's an opportunity to do this
also for parse_string, but it's a bit more complicated as it's called
from parse_object as well as parse_value.

For all these elided checks, allow them to reappear if SPINE_JSON_DEBUG
is defined and nonzero.

Spine doesn't use the "prev" field ever, so drop it entirely from the
Json structure unless someone defines SPINE_JSON_HAVE_PREV non-zero.

Pull some of the assignments out of conditionals to placate some of the
higher-warning-level compilers.

A few TODO comments left near some of the other speedup opportunities,
as well as one existing place that might need additional error handling.

(Tested on various x86 and ARM gcc versions, Xcode 5.x series, Visual
Studio 2010 SP1, ARMCC 5.04, and MWCCARM 4.0.  Holler if this should be
decomposed into a patch series, if there are any suggestions or idiom
changes, or a different submission method we should be using.)
2014-06-20 11:46:40 -04:00