From 0ba62c3854c70086b67ad180866cb401d5991c23 Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 24 May 2012 10:48:39 +0800 Subject: [PATCH] issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp --- HelloLua/Resources/fonts/arial.ttf.REMOVED.git-id | 1 - .../HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- HelloWorld/Resources/fonts/arial.ttf.REMOVED.git-id | 1 - .../HelloWorld.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- cocos2dx/CCDirector.cpp | 6 +++--- .../proj.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 HelloLua/Resources/fonts/arial.ttf.REMOVED.git-id delete mode 100644 HelloWorld/Resources/fonts/arial.ttf.REMOVED.git-id diff --git a/HelloLua/Resources/fonts/arial.ttf.REMOVED.git-id b/HelloLua/Resources/fonts/arial.ttf.REMOVED.git-id deleted file mode 100644 index 0e6ab72e71..0000000000 --- a/HelloLua/Resources/fonts/arial.ttf.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -abc899cd55086105f439df7a6d01db84168aebb5 \ No newline at end of file diff --git a/HelloLua/proj.ios/HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id b/HelloLua/proj.ios/HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id index 1174ac380c..223eface31 100644 --- a/HelloLua/proj.ios/HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/HelloLua/proj.ios/HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -3ffb5ef04b897f971e1e9c941002d06e5a91da50 \ No newline at end of file +6463956a32bf45c476904160aa23da947b30e0c1 \ No newline at end of file diff --git a/HelloWorld/Resources/fonts/arial.ttf.REMOVED.git-id b/HelloWorld/Resources/fonts/arial.ttf.REMOVED.git-id deleted file mode 100644 index 0e6ab72e71..0000000000 --- a/HelloWorld/Resources/fonts/arial.ttf.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -abc899cd55086105f439df7a6d01db84168aebb5 \ No newline at end of file diff --git a/HelloWorld/proj.ios/HelloWorld.xcodeproj/project.pbxproj.REMOVED.git-id b/HelloWorld/proj.ios/HelloWorld.xcodeproj/project.pbxproj.REMOVED.git-id index c5a97e0ad1..d3943efca6 100644 --- a/HelloWorld/proj.ios/HelloWorld.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/HelloWorld/proj.ios/HelloWorld.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -92dc1f3cb8db6691dae94a502b38db89e5293d2d \ No newline at end of file +4573789c928b734a05fb2766677b230a8a497ee5 \ No newline at end of file diff --git a/cocos2dx/CCDirector.cpp b/cocos2dx/CCDirector.cpp index 5064dd90d7..2a87d6580a 100644 --- a/cocos2dx/CCDirector.cpp +++ b/cocos2dx/CCDirector.cpp @@ -718,9 +718,9 @@ void CCDirector::createStatsLabel() CC_SAFE_RELEASE_NULL(m_pSPFLabel); CC_SAFE_RELEASE_NULL(m_pDrawsLabel); - m_pFPSLabel = CCLabelBMFont::labelWithString("00.0", "fonts/fps_images.fnt"); - m_pSPFLabel = CCLabelBMFont::labelWithString("0.000", "fonts/fps_images.fnt"); - m_pDrawsLabel = CCLabelBMFont::labelWithString("000", "fonts/fps_images.fnt"); + m_pFPSLabel = CCLabelBMFont::labelWithString("00.0", "fps_images.fnt"); + m_pSPFLabel = CCLabelBMFont::labelWithString("0.000", "fps_images.fnt"); + m_pDrawsLabel = CCLabelBMFont::labelWithString("000", "fps_images.fnt"); m_pFPSLabel->retain(); m_pSPFLabel->retain(); diff --git a/tests/proj.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id b/tests/proj.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id index 3dc0968707..2334c5166d 100644 --- a/tests/proj.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/tests/proj.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -9189dbb79a9d878a265d10ad5834bcae8a1ce1b5 \ No newline at end of file +0db65c0bf802f20d588ccc6b3b7204dd1941abc9 \ No newline at end of file