UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6' into 3.7-beta

Browse Source
This commit is contained in:
badlogic 2017-10-12 14:37:33 +02:00
commit 86fadc695c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -53,6 +53,7 @@
* Added `spVertexEffect` and corresponding implementations `spJitterVertexEffect` and `spSwirlVertexEffect`. Create/dispose through the corresponding `spXXXVertexEffect_create()/dispose()` functions. Set on framework/engine specific renderer. See changes for spine-c based frameworks/engines below. * Added `spVertexEffect` and corresponding implementations `spJitterVertexEffect` and `spSwirlVertexEffect`. Create/dispose through the corresponding `spXXXVertexEffect_create()/dispose()` functions. Set on framework/engine specific renderer. See changes for spine-c based frameworks/engines below.
* Functions in `extension.h` are not prefixed with `_sp` instead of just `_` to avoid interference with other libraries. * Functions in `extension.h` are not prefixed with `_sp` instead of just `_` to avoid interference with other libraries.
* Introduced `SP_API` macro. Every spine-c function is prefixed with this macro. By default, it is an empty string. Can be used to markup spine-c functions with e.g. ``__declspec` when compiling to a dll or linking to that dll. * Introduced `SP_API` macro. Every spine-c function is prefixed with this macro. By default, it is an empty string. Can be used to markup spine-c functions with e.g. ``__declspec` when compiling to a dll or linking to that dll.
* Added `void* userData` to `spAnimationState` to be consumed in callbacks.
### Cocos2d-X ### Cocos2d-X
* Fixed renderer to work with 3.6 changes * Fixed renderer to work with 3.6 changes

7
spine-c/spine-c/include/spine/AnimationState.h
View File

@ -84,7 +84,8 @@ struct spTrackEntry {
timelineData(0), timelineData(0),
timelineDipMix(0), timelineDipMix(0),
timelinesRotation(0), timelinesRotation(0),
timelinesRotationCount(0) { timelinesRotationCount(0),
rendererObject(0), userData(0) {
} }
#endif #endif
}; };
@ -102,6 +103,7 @@ struct spAnimationState {
spTrackEntryArray* mixingTo; spTrackEntryArray* mixingTo;
void* rendererObject; void* rendererObject;
void* userData;
#ifdef __cplusplus #ifdef __cplusplus
spAnimationState() : spAnimationState() :
@ -111,7 +113,8 @@ struct spAnimationState {
listener(0), listener(0),
timeScale(0), timeScale(0),
mixingTo(0), mixingTo(0),
rendererObject(0) { rendererObject(0),
userData(0) {
} }
#endif #endif
}; };