UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-06 07:14:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
NathanSweet 2013-03-28 04:22:55 +01:00
commit 3e9385271b
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -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

6
spine-cocos2dx/example/Classes/ExampleLayer.cpp
View File

@ -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));

4
spine-cocos2dx/src/spine-cocos2dx/CCSkeleton.cpp
View File

@ -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();