Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3305 from samuele3hu/DrawNode 

Modify deprecated CCPhysicsDebugNode typedef and some test bug
This commit is contained in:
James Chen 2013-07-27 23:53:36 -07:00
parent 25268bf604 cc95fcaa69
commit b2b93bef0a
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/CCDeprecated-ext.h
View File

@ -83,6 +83,9 @@ CC_DEPRECATED_ATTRIBUTE typedef LabelTTFLoader CCLabelTTFLoader;
#if CC_ENABLE_BOX2D_INTEGRATION || CC_ENABLE_CHIPMUNK_INTEGRATION #if CC_ENABLE_BOX2D_INTEGRATION || CC_ENABLE_CHIPMUNK_INTEGRATION
CC_DEPRECATED_ATTRIBUTE typedef PhysicsSprite CCPhysicsSprite; CC_DEPRECATED_ATTRIBUTE typedef PhysicsSprite CCPhysicsSprite;
#endif
#if CC_ENABLE_CHIPMUNK_INTEGRATION
CC_DEPRECATED_ATTRIBUTE typedef PhysicsDebugNode CCPhysicsDebugNode; CC_DEPRECATED_ATTRIBUTE typedef PhysicsDebugNode CCPhysicsDebugNode;
#endif #endif

2
samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.cpp
View File

@ -141,7 +141,7 @@ void Box2DTestLayer::draw()
Layer::draw(); Layer::draw();
#if CC_ENABLE_BOX2D_INTEGRATION #if CC_ENABLE_BOX2D_INTEGRATION
ccGLEnableVertexAttribs( VERTEX_ATTRIB_FLAG_POSITION ); GL::enableVertexAttribs( cocos2d::GL::VERTEX_ATTRIB_FLAG_POSITION );
kmGLPushMatrix(); kmGLPushMatrix();

6
samples/Cpp/TestCpp/Classes/EffectsTest/EffectsTest.cpp
View File

@ -366,6 +366,12 @@ TextLayer::TextLayer(void)
ActionInterval* sc2_back = sc2->reverse(); ActionInterval* sc2_back = sc2->reverse();
tamara->runAction( RepeatForever::create(Sequence::create(sc2, sc2_back, NULL)) ); tamara->runAction( RepeatForever::create(Sequence::create(sc2, sc2_back, NULL)) );
LabelTTF* label = LabelTTF::create((effectsList[actionIdx]).c_str(), "Marker Felt", 32);
label->setPosition( Point(VisibleRect::center().x,VisibleRect::top().y-80) );
addChild(label);
label->setTag( kTagLabel );
schedule( schedule_selector(TextLayer::checkAnim) ); schedule( schedule_selector(TextLayer::checkAnim) );
} }