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

Merge pull request #19 from vinova/master

Browse Source 
Use ccGLBlendFunc instead of glBlendFunc in CCSkeleton::draw()
This commit is contained in:
Nathan Sweet 2013-03-26 05:59:19 -07:00
commit e4e8089340
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -11,4 +11,5 @@ spine-cocos2dx/cocos2dx/
!spine-cocos2dx/cocos2dx/Place cocos2dx here.txt !spine-cocos2dx/cocos2dx/Place cocos2dx here.txt
*.swp *.swp
.DS_Store .DS_Store
xcuserdata xcuserdata
spine-cocos2dx/example/proj.ios/ExampleSpine.xcodeproj/project.xcworkspace/xcuserdata/*

BIN
spine-cocos2dx/example/proj.ios/ExampleSpine.xcodeproj/project.xcworkspace/xcuserdata/pancake.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

10
spine-cocos2dx/example/proj.ios/ExampleSpine.xcodeproj/project.xcworkspace/xcuserdata/pancake.xcuserdatad/WorkspaceSettings.xcsettings
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
<true/>
<key>SnapshotAutomaticallyBeforeSignificantChanges</key>
<false/>
</dict>
</plist>

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

@ -67,7 +67,7 @@ void CCSkeleton::update (float deltaTime) {
void CCSkeleton::draw () { void CCSkeleton::draw () {
CC_NODE_DRAW_SETUP(); CC_NODE_DRAW_SETUP();
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); ccGLBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
skeleton->draw(); skeleton->draw();
if (debug) { if (debug) {