1032 Commits

Author SHA1 Message Date
NathanSweet
b0da7d0e52 Fixed reading inherit scale and rotation. 2014-07-25 20:31:22 +02:00
NathanSweet
4eb73738c2 Fixed spine-starling meshes with a Starling atlas. Better examples. 2014-07-25 19:39:45 +02: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
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
NathanSweet
88f805a74e Update to latest libgdx. 2014-06-11 14:09:39 +02:00
NathanSweet
9f87b95a67 Debug mark for skeleton position. 2014-06-09 20:20:18 +02:00
NathanSweet
da9de71fad Fixed array expansion. 2014-06-04 12:09:20 +02:00
NathanSweet
68da7f72de Scale UVs since Starling mangles textures to POT size. 2014-06-04 02:42:16 +02:00
NathanSweet
e648aa66ae Changed cocos2d-based runtimes to not apply contentScale.
http://esotericsoftware.com/forum/viewtopic.php?f=7&t=2771
2014-06-04 01:59:00 +02:00
NathanSweet
556afc3514 Fixed examples resizing. 2014-06-04 01:58:35 +02:00
NathanSweet
7f6abc8c00 Fixed mixing from uninitialized slot vertices.
http://esotericsoftware.com/forum/viewtopic.php?f=9&t=2775
2014-06-03 18:37:42 +02:00
NathanSweet
6b9d514ca7 Meshes, FFD and skinning for spine-starling. 2014-06-02 15:33:22 +02:00
NathanSweet
fb28ee1b49 Triangles int -> uint. 2014-06-02 12:12:39 +02:00
NathanSweet
968f408445 Reload button and default mix time. 2014-05-29 21:33:06 +02:00
Nathan Sweet
147c9bd763 Merge pull request #227 from pharan/bonecomponent
Fixed BoneComponent Z-positioning.
2014-05-29 21:14:43 +02:00
NathanSweet
634e7a3469 Fixed switch warning. 2014-05-29 20:36:58 +02:00
NathanSweet
6e162a2fe7 Updated to 3.1 final. 2014-05-29 20:34:40 +02:00
NathanSweet
8736bd6bcb Fixed pooling polygon FloatArrays. 2014-05-29 19:53:58 +02:00
NathanSweet
292cd144fe Missing text file. 2014-05-29 19:39:20 +02:00
NathanSweet
37c27ca3f9 Don't clear VAO on each PolygonBatch flush. 2014-05-29 19:34:09 +02:00
NathanSweet
be09165723 Fixed path lookup.
closes #229
2014-05-29 10:13:48 +02:00
NathanSweet
8b0aeaf9c5 spine-csharp should not be committed under spine-tk2d! 2014-05-25 20:10:48 +02:00
NathanSweet
ab15078b3e Fixes. 2014-05-25 08:55:14 +02:00
NathanSweet
8887677cd7 Missig function. 2014-05-23 16:21:41 +02:00
NathanSweet
81ae526a7b Meshes, FFD and skinning for spine-lua. 2014-05-23 12:37:55 +02:00
NathanSweet
c1a9b502bd Tabs, never spaces. 2014-05-23 11:37:20 +02:00
Nathan Sweet
5c5505dfcb Merge pull request #228 from moberghammer/master
AttachmentLoader fixes
2014-05-23 11:37:00 +02:00
Carsten Moberg Hammer
48398b4a6b AttachmentLoader fixes 2014-05-23 11:31:30 +02:00
NathanSweet
cf41610f8a Minor fixes. 2014-05-23 10:46:26 +02:00
pharan
e120ed382c Fixed BoneComponent Z-positioning.
New checkboxes to customize its behavior.
SkeletonRenderer property to safely reattach to a different SkeletonRenderer.
2014-05-23 14:26:07 +08:00
NathanSweet
f71fb43552 Various fixes. 2014-05-22 15:20:11 +02:00
NathanSweet
9a7673c68a Support TK2D PNG atlases. 2014-05-22 15:15:18 +02:00
NathanSweet
765452ce84 Meshes, FFD and skinning for spine-js. 2014-05-22 15:06:27 +02:00
NathanSweet
d043d8204c boundingBox -> getBoundingBox. 2014-05-22 14:15:28 +02:00
NathanSweet
99df3bf619 Updated boundingBox. 2014-05-22 11:37:21 +02:00