UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-22 02:06:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

[cocos2dx] Didn't invoke GL program state setup in initialize and setTwoColorTint. See #989

Browse Source
This commit is contained in:
badlogic 2017-09-28 17:00:05 +02:00
parent 4b2fb3eedf
commit cdc335d41b
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -62,7 +62,7 @@
* Added support for clipping. * Added support for clipping.
* SkeletonRenderer now combines the displayed color of the Node (cascaded from all parents) with the skeleton color for tinting. * SkeletonRenderer now combines the displayed color of the Node (cascaded from all parents) with the skeleton color for tinting.
* Added support for vertex effects. See `RaptorExample.cpp`. * Added support for vertex effects. See `RaptorExample.cpp`.
* Added ETC1 support, thanks @halx99! * Added ETC1 alpha support, thanks @halx99! Does not work when two color tint is enabled.
### Cocos2d-Objc ### Cocos2d-Objc
* Fixed renderer to work with 3.6 changes * Fixed renderer to work with 3.6 changes

15
spine-cocos2dx/src/spine/SkeletonRenderer.cpp
View File

@ -68,10 +68,15 @@ void SkeletonRenderer::initialize () {
_blendFunc = BlendFunc::ALPHA_PREMULTIPLIED; _blendFunc = BlendFunc::ALPHA_PREMULTIPLIED;
setOpacityModifyRGB(true); setOpacityModifyRGB(true);
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP)); setupGLProgramState(false);
} }
void SkeletonRenderer::setupGLProgramState () { void SkeletonRenderer::setupGLProgramState (bool twoColorTintEnabled) {
if (twoColorTintEnabled) {
setGLProgramState(SkeletonTwoColorBatch::getInstance()->getTwoColorTintProgramState());
return;
}
Texture2D *texture = nullptr; Texture2D *texture = nullptr;
for (int i = 0, n = _skeleton->slotsCount; i < n; i++) { for (int i = 0, n = _skeleton->slotsCount; i < n; i++) {
spSlot* slot = _skeleton->drawOrder[i]; spSlot* slot = _skeleton->drawOrder[i];
@ -95,7 +100,6 @@ void SkeletonRenderer::setupGLProgramState () {
break; break;
} }
} }
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP, texture)); setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP, texture));
} }
@ -737,10 +741,7 @@ bool SkeletonRenderer::setAttachment (const std::string& slotName, const char* a
} }
void SkeletonRenderer::setTwoColorTint(bool enabled) { void SkeletonRenderer::setTwoColorTint(bool enabled) {
if (enabled) setupGLProgramState(enabled);
setGLProgramState(SkeletonTwoColorBatch::getInstance()->getTwoColorTintProgramState());
else
setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP));
} }
bool SkeletonRenderer::isTwoColorTint() { bool SkeletonRenderer::isTwoColorTint() {

3
spine-cocos2dx/src/spine/SkeletonRenderer.h
View File

@ -124,11 +124,12 @@ CC_CONSTRUCTOR_ACCESS:
void initWithBinaryFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1); void initWithBinaryFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1);
virtual void initialize (); virtual void initialize ();
void setupGLProgramState();
protected: protected:
void setSkeletonData (spSkeletonData* skeletonData, bool ownsSkeletonData); void setSkeletonData (spSkeletonData* skeletonData, bool ownsSkeletonData);
virtual AttachmentVertices* getAttachmentVertices (spRegionAttachment* attachment) const; virtual AttachmentVertices* getAttachmentVertices (spRegionAttachment* attachment) const;
virtual AttachmentVertices* getAttachmentVertices (spMeshAttachment* attachment) const; virtual AttachmentVertices* getAttachmentVertices (spMeshAttachment* attachment) const;
void setupGLProgramState(bool twoColorTintEnabled);
bool _ownsSkeletonData; bool _ownsSkeletonData;
spAtlas* _atlas; spAtlas* _atlas;