diff --git a/.gitignore b/.gitignore index b85e16252..5d2622ea4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +spine-c/Debug/* spine-cpp/Debug/* spine-sfml/Debug/* spine-libgdx/bin/* @@ -11,5 +12,4 @@ spine-cocos2dx/cocos2dx/ !spine-cocos2dx/cocos2dx/Place cocos2dx here.txt *.swp .DS_Store -xcuserdata -spine-cocos2dx/example/proj.ios/ExampleSpine.xcodeproj/project.xcworkspace/xcuserdata/* +xcuserdata \ No newline at end of file diff --git a/spine-cocos2dx/example/Classes/ExampleLayer.cpp b/spine-cocos2dx/example/Classes/ExampleLayer.cpp index 000b7b291..eef36b07b 100644 --- a/spine-cocos2dx/example/Classes/ExampleLayer.cpp +++ b/spine-cocos2dx/example/Classes/ExampleLayer.cpp @@ -24,6 +24,12 @@ bool ExampleLayer::init () { CCSkeleton* skeletonNode = CCSkeleton::create(skeletonData); skeletonNode->state->setAnimation(animation, true); skeletonNode->debug = true; + + CCAction* fade = CCRepeatForever::create(CCSequence::create(CCFadeOut::create(1), + CCFadeIn::create(1), + CCDelayTime::create(5), + NULL)); + skeletonNode->runAction(fade); CCSize windowSize = CCDirector::sharedDirector()->getWinSize(); skeletonNode->setPosition(ccp(windowSize.width / 2, 20)); diff --git a/spine-cocos2dx/src/spine-cocos2dx/CCSkeleton.cpp b/spine-cocos2dx/src/spine-cocos2dx/CCSkeleton.cpp index 2cdb938df..2ac3a8f6c 100644 --- a/spine-cocos2dx/src/spine-cocos2dx/CCSkeleton.cpp +++ b/spine-cocos2dx/src/spine-cocos2dx/CCSkeleton.cpp @@ -49,8 +49,8 @@ CCSkeleton::CCSkeleton (SkeletonData *skeletonData, AnimationStateData *stateDat skeleton = new Skeleton(skeletonData); state = new AnimationState(stateData); - blendFunc.src = CC_BLEND_SRC; - blendFunc.dst = CC_BLEND_DST; + blendFunc.src = GL_SRC_ALPHA; + blendFunc.dst = GL_ONE_MINUS_SRC_ALPHA; setShaderProgram(CCShaderCache::sharedShaderCache()->programForKey(kCCShader_PositionTextureColor)); scheduleUpdate();