149 Commits

Author SHA1 Message Date
sp-stefano-lanza
7183e3b0bd Feature/new skeleton culling (#1196)
* Fix culling of skeleton and clean up code

* Optionally draw the bounding rectangle of skeletons

* Add Visual Studio compiler support

* Fix indentation

* Fix indentation

* Fix indentation

* Revert some indentation changes
2018-10-16 15:46:49 +02:00
badlogic
a6dcbc61e3 [cocos2dx] Fix for tint black in 3.7 branch. 2018-08-13 16:47:36 +02:00
badlogic
bd778ba417 Merge branch '3.6' into 3.7-beta 2018-08-13 16:36:38 +02:00
badlogic
ce536558e5 [cocos2dx] Tint black did not work, didn't multiple dark color with skeleton/attachment color. Closes #1158. 2018-08-13 16:34:06 +02:00
badlogic
d3e37284fc Merge branch '3.6' into 3.7-beta 2018-08-10 11:14:01 +02:00
badlogic
a578be88e0 [cocos2dx][c] Fixed call to spVertexAttachment_computeWorldVertices, as well as count calcalculation. 2018-08-10 11:11:15 +02:00
badlogic
4005ff2ad4 Merge branch '3.6' into 3.7-beta 2018-08-09 15:02:55 +02:00
badlogic
9a428a02b8 [c] Fixes #1148, revert changes to spVertexAttachment_computeWorldVertices. Vertex size must be a multiple of 4, which explains why #1148 failed. 2018-08-09 14:59:09 +02:00
badlogic
6e83e6aed1 [c][cpp][sfml][cocos2d-x] Skip rendering of skeleton/slot/attachment early if alpha is 0. See #1145 2018-07-18 12:04:11 +02:00
badlogic
7647c345e3 [cocos2dx] Initializing skeleton setup poses and world transform on construction to avoid flicked in first frame. Closes #1098 2018-04-12 10:42:34 +02:00
badlogic
eecde9e871 [cocos2d-x] Closes #1075, added SkeletonRenderer:setSlotsRange and SkeletonRenderer::createWithSkeleton. Allows rendering parts of a single skeleton, mixed with other nodes. See SkeletonRendererSeparator.cpp for an example. 2018-02-06 15:16:23 +01:00
badlogic
999e836ba0 [cocos2dx] Closes #1062, proper handling of batch boundaries. 2018-01-12 13:44:58 +01:00
Greg Rynkowski
97dd5ab8df Fix typo in the SkeletonAnimation::createWithFile (#1045) 2017-12-07 15:47:32 +01:00
badlogic
f40efe6066 Revert "fix warnings (#1034)"
This reverts commit 5948e5a62f0d9fb5a526c200dc70a81d286b1e38.
2017-12-06 15:35:02 +01:00
minggo
5948e5a62f fix warnings (#1034) 2017-11-21 11:17:39 +01:00
Jare Guo
041b6ddb00 [cocos2dx] allow load custom atlas texture in _spAtlasPage_createTexture for CocosCreator (#1018) 2017-10-13 09:50:03 +02:00
badlogic
8650c668e9 [cocos2dx] Removed hard coded scratch buffer size, replaced with dynamic allocation. Also made it a global scratch buffer, instead of a per instance buffer. Saves 4kb per SkeletonRenderer instance. Closes #1015. 2017-10-10 15:37:27 +02:00
badlogic
f9245031a6 [cocos2d-x] Ported new tint black shader. See #1003. 2017-09-30 09:43:19 +02:00
badlogic
cdc335d41b [cocos2dx] Didn't invoke GL program state setup in initialize and setTwoColorTint. See #989 2017-09-28 17:00:05 +02:00
badlogic
c1538b113b [cocos2d-x] Added ETC1 support, thanks @halx99. Closes #989 2017-09-25 11:44:28 +02:00
badlogic
083e696220 [cocos2d-x] Closes #984. 2017-09-11 15:24:56 +02:00
zzya
5947520c9b fix clipping issue (#966)
* modify for clip

* fix clipping issue
2017-08-15 20:27:26 +02:00
badlogic
f7bb981852 [cocos2d-x] Call Node::update in SkeletonRenderer. Closes #960 2017-08-03 11:22:47 +02:00
zzya
687d774082 modify for clip (#955) 2017-07-28 11:58:10 +02:00
badlogic
6e7c6ebc07 [cocos2d-x] Not submitting geometry when final opacity of attachment is 0 2017-07-17 14:26:06 +02:00
badlogic
7488383b15 [cocos2dx] Added support for vertex effects. See #898 2017-06-26 15:00:59 +02:00
badlogic
1af2089157 [cocos2dx] Fixed tinting and cascaded colors. Closes #902, closes #901 2017-05-17 11:03:34 +02:00
badlogic
676b740269 [c] Added stride to spSkeletonClipping_clipTriangles. [cocos2dx] Added clipping. 2017-04-30 19:13:11 +02:00
badlogic
d52ac2afd4 [c][sfml] Added clipping. [cocos2dx] Added stub for clipping and assets. [c] Fixed handling of indices short -> unsigned short 2017-04-28 14:31:18 +02:00
badlogic
26c1bfe8b4 [cocos2dx] Fixed #877, support for ETC1. Note that ETC1 is not supported when two color tinting is enabled! 2017-04-18 10:31:57 +02:00
badlogic
137f95a20f [cocos2dx] Added debug meshes rendering. 2017-04-18 10:26:25 +02:00
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