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

Merge pull request #11361 from WenhaiLin/v3-autotest 

Remove unneeded code.
This commit is contained in:
minggo 2015-04-09 16:29:56 +08:00
parent 238d677db0 f502c5900b
commit 4e4b8bcea0
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cpp-tests/Classes/TextInputTest/TextInputTest.cpp
View File

@ -151,14 +151,6 @@ void TextFieldTTFDefaultTest::onEnter()
// add TextFieldTTF // add TextFieldTTF
auto s = Director::getInstance()->getWinSize(); auto s = Director::getInstance()->getWinSize();
std::string strSubtitle = subtitle();
TTFConfig ttfConfig;
ttfConfig.fontFilePath = FONT_NAME;
ttfConfig.fontSize = 16;
auto subTitle = Label::createWithTTF(ttfConfig, strSubtitle.c_str());
addChild(subTitle, 9999);
subTitle->setPosition(VisibleRect::center().x, VisibleRect::top().y - 60);
auto pTextField = TextFieldTTF::textFieldWithPlaceHolder("<click here for input>", auto pTextField = TextFieldTTF::textFieldWithPlaceHolder("<click here for input>",
FONT_NAME, FONT_NAME,
FONT_SIZE); FONT_SIZE);

14
tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp
View File

@ -18,19 +18,7 @@ void TextureAtlasEncryptionDemo::onEnter()
TestCase::onEnter(); TestCase::onEnter();
auto s = Director::getInstance()->getWinSize(); auto s = Director::getInstance()->getWinSize();
auto label = Label::createWithTTF(title().c_str(), "fonts/arial.ttf", 28);
label->setPosition( Vec2(s.width/2, s.height * 0.75f) );
this->addChild(label, 1);
std::string strSubtitle = subtitle();
if(strSubtitle.empty() == false)
{
auto subLabel = Label::createWithTTF(strSubtitle.c_str(), "fonts/Thonburi.ttf", 16);
subLabel->setPosition( Vec2(s.width/2, s.height-80) );
this->addChild(subLabel, 1);
}
// Load the non-encrypted atlas // Load the non-encrypted atlas
SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/nonencryptedAtlas.plist", "Images/nonencryptedAtlas.pvr.ccz"); SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/nonencryptedAtlas.plist", "Images/nonencryptedAtlas.pvr.ccz");