From 3aeefb51b3a102d26632677a136152ddae2c887b Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Sun, 28 Jul 2013 14:33:02 +0800 Subject: [PATCH] Modify deprecated CCPhysicsDebugNode typedef and some test bug --- extensions/CCDeprecated-ext.h | 3 +++ samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.cpp | 2 +- samples/Cpp/TestCpp/Classes/EffectsTest/EffectsTest.cpp | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/extensions/CCDeprecated-ext.h b/extensions/CCDeprecated-ext.h index 30334a0916..39cc33ad07 100644 --- a/extensions/CCDeprecated-ext.h +++ b/extensions/CCDeprecated-ext.h @@ -83,6 +83,9 @@ CC_DEPRECATED_ATTRIBUTE typedef LabelTTFLoader CCLabelTTFLoader; #if CC_ENABLE_BOX2D_INTEGRATION || CC_ENABLE_CHIPMUNK_INTEGRATION CC_DEPRECATED_ATTRIBUTE typedef PhysicsSprite CCPhysicsSprite; +#endif + +#if CC_ENABLE_CHIPMUNK_INTEGRATION CC_DEPRECATED_ATTRIBUTE typedef PhysicsDebugNode CCPhysicsDebugNode; #endif diff --git a/samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.cpp b/samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.cpp index aa75313475..73c09022b0 100644 --- a/samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.cpp +++ b/samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.cpp @@ -141,7 +141,7 @@ void Box2DTestLayer::draw() Layer::draw(); #if CC_ENABLE_BOX2D_INTEGRATION - ccGLEnableVertexAttribs( VERTEX_ATTRIB_FLAG_POSITION ); + GL::enableVertexAttribs( cocos2d::GL::VERTEX_ATTRIB_FLAG_POSITION ); kmGLPushMatrix(); diff --git a/samples/Cpp/TestCpp/Classes/EffectsTest/EffectsTest.cpp b/samples/Cpp/TestCpp/Classes/EffectsTest/EffectsTest.cpp index 9603c0a0ae..655f063324 100644 --- a/samples/Cpp/TestCpp/Classes/EffectsTest/EffectsTest.cpp +++ b/samples/Cpp/TestCpp/Classes/EffectsTest/EffectsTest.cpp @@ -366,6 +366,12 @@ TextLayer::TextLayer(void) ActionInterval* sc2_back = sc2->reverse(); 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) ); }