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

fix PhysicsContactTest (#20171) 

modify the item relative position to avoid inappropriate operation.
This commit is contained in:
coulsonwang 2019-10-08 15:07:46 +08:00 committed by minggo
parent 49a3b5b228
commit ab04e037b7
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/cpp-tests/Classes/BaseTest.h
View File

@ -91,6 +91,9 @@ public:
void setTestCaseName(const std::string& name) { _testCaseName = name; } void setTestCaseName(const std::string& name) { _testCaseName = name; }
std::string getTestCaseName() const { return _testCaseName; } std::string getTestCaseName() const { return _testCaseName; }
const cocos2d::Label* getSubtitleLable() const { return _subtitleLabel; }
const cocos2d::MenuItemImage* getRestartTestItem() const { return _restartTestItem; }
virtual void onEnter() override; virtual void onEnter() override;
CC_CONSTRUCTOR_ACCESS: CC_CONSTRUCTOR_ACCESS:
virtual bool init() override; virtual bool init() override;

28
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
View File

@ -1298,14 +1298,16 @@ void PhysicsContactTest::onEnter()
decrease1->setTag(1); decrease1->setTag(1);
increase1->setTag(1); increase1->setTag(1);
float prevMenuPos = getSubtitleLable()->getPosition().y - getSubtitleLable()->getContentSize().height;
float menuStep = (getSubtitleLable()->getPosition().y -getRestartTestItem()->getPosition().y)*0.25f;
auto menu1 = Menu::create(decrease1, increase1, nullptr); auto menu1 = Menu::create(decrease1, increase1, nullptr);
menu1->alignItemsHorizontally(); menu1->alignItemsHorizontally();
menu1->setPosition(Vec2(s.width / 2, s.height - 50)); menu1->setPosition(Vec2(s.width / 2, prevMenuPos));
addChild(menu1, 1); addChild(menu1, 1);
auto label = Label::createWithTTF("yellow box", "fonts/arial.ttf", 32); auto label = Label::createWithTTF("yellow box", "fonts/arial.ttf", 32);
addChild(label, 1); addChild(label, 1);
label->setPosition(Vec2(s.width / 2 - 150, s.height - 50)); label->setPosition(Vec2(s.width / 2 - 150, prevMenuPos));
auto decrease2 = MenuItemFont::create(" - ", CC_CALLBACK_1(PhysicsContactTest::onDecrease, this)); auto decrease2 = MenuItemFont::create(" - ", CC_CALLBACK_1(PhysicsContactTest::onDecrease, this));
decrease2->setColor(Color3B(0, 200, 20)); decrease2->setColor(Color3B(0, 200, 20));
@ -1316,12 +1318,12 @@ void PhysicsContactTest::onEnter()
auto menu2 = Menu::create(decrease2, increase2, nullptr); auto menu2 = Menu::create(decrease2, increase2, nullptr);
menu2->alignItemsHorizontally(); menu2->alignItemsHorizontally();
menu2->setPosition(Vec2(s.width / 2, s.height - 90)); menu2->setPosition(Vec2(s.width / 2, prevMenuPos -= menuStep));
addChild(menu2, 1); addChild(menu2, 1);
label = Label::createWithTTF("blue box", "fonts/arial.ttf", 32); label = Label::createWithTTF("blue box", "fonts/arial.ttf", 32);
addChild(label, 1); addChild(label, 1);
label->setPosition(Vec2(s.width / 2 - 150, s.height - 90)); label->setPosition(Vec2(s.width / 2 - 150, prevMenuPos));
auto decrease3 = MenuItemFont::create(" - ", CC_CALLBACK_1(PhysicsContactTest::onDecrease, this)); auto decrease3 = MenuItemFont::create(" - ", CC_CALLBACK_1(PhysicsContactTest::onDecrease, this));
decrease3->setColor(Color3B(0, 200, 20)); decrease3->setColor(Color3B(0, 200, 20));
@ -1332,12 +1334,12 @@ void PhysicsContactTest::onEnter()
auto menu3 = Menu::create(decrease3, increase3, nullptr); auto menu3 = Menu::create(decrease3, increase3, nullptr);
menu3->alignItemsHorizontally(); menu3->alignItemsHorizontally();
menu3->setPosition(Vec2(s.width / 2, s.height - 130)); menu3->setPosition(Vec2(s.width / 2, prevMenuPos -= menuStep));
addChild(menu3, 1); addChild(menu3, 1);
label = Label::createWithTTF("yellow triangle", "fonts/arial.ttf", 32); label = Label::createWithTTF("yellow triangle", "fonts/arial.ttf", 32);
addChild(label, 1); addChild(label, 1);
label->setPosition(Vec2(s.width / 2 - 150, s.height - 130)); label->setPosition(Vec2(s.width / 2 - 150, prevMenuPos));
auto decrease4 = MenuItemFont::create(" - ", CC_CALLBACK_1(PhysicsContactTest::onDecrease, this)); auto decrease4 = MenuItemFont::create(" - ", CC_CALLBACK_1(PhysicsContactTest::onDecrease, this));
decrease4->setColor(Color3B(0, 200, 20)); decrease4->setColor(Color3B(0, 200, 20));
@ -1348,12 +1350,12 @@ void PhysicsContactTest::onEnter()
auto menu4 = Menu::create(decrease4, increase4, nullptr); auto menu4 = Menu::create(decrease4, increase4, nullptr);
menu4->alignItemsHorizontally(); menu4->alignItemsHorizontally();
menu4->setPosition(Vec2(s.width / 2, s.height - 170)); menu4->setPosition(Vec2(s.width / 2, prevMenuPos -= menuStep));
addChild(menu4, 1); addChild(menu4, 1);
label = Label::createWithTTF("blue triangle", "fonts/arial.ttf", 32); label = Label::createWithTTF("blue triangle", "fonts/arial.ttf", 32);
addChild(label, 1); addChild(label, 1);
label->setPosition(Vec2(s.width / 2 - 150, s.height - 170)); label->setPosition(Vec2(s.width / 2 - 150, prevMenuPos));
resetTest(); resetTest();
} }
@ -1414,28 +1416,30 @@ void PhysicsContactTest::resetTest()
this->addChild(root); this->addChild(root);
auto s = VisibleRect::getVisibleRect().size; auto s = VisibleRect::getVisibleRect().size;
float prevMenuPos = getSubtitleLable()->getPosition().y - getSubtitleLable()->getContentSize().height;
float menuStep = (getSubtitleLable()->getPosition().y - getRestartTestItem()->getPosition().y)*0.25f;
std::string strNum; std::string strNum;
char buffer[10]; char buffer[10];
sprintf(buffer, "%d", _yellowBoxNum); sprintf(buffer, "%d", _yellowBoxNum);
auto label = Label::createWithTTF(buffer, "fonts/arial.ttf", 32); auto label = Label::createWithTTF(buffer, "fonts/arial.ttf", 32);
root->addChild(label, 1); root->addChild(label, 1);
label->setPosition(Vec2(s.width / 2, s.height - 50)); label->setPosition(Vec2(s.width / 2, prevMenuPos));
sprintf(buffer, "%d", _blueBoxNum); sprintf(buffer, "%d", _blueBoxNum);
label = Label::createWithTTF(buffer, "fonts/arial.ttf", 32); label = Label::createWithTTF(buffer, "fonts/arial.ttf", 32);
root->addChild(label, 1); root->addChild(label, 1);
label->setPosition(Vec2(s.width / 2, s.height - 90)); label->setPosition(Vec2(s.width / 2, prevMenuPos-=menuStep));
sprintf(buffer, "%d", _yellowTriangleNum); sprintf(buffer, "%d", _yellowTriangleNum);
label = Label::createWithTTF(buffer, "fonts/arial.ttf", 32); label = Label::createWithTTF(buffer, "fonts/arial.ttf", 32);
root->addChild(label, 1); root->addChild(label, 1);
label->setPosition(Vec2(s.width / 2, s.height - 130)); label->setPosition(Vec2(s.width / 2, prevMenuPos-=menuStep));
sprintf(buffer, "%d", _blueTriangleNum); sprintf(buffer, "%d", _blueTriangleNum);
label = Label::createWithTTF(buffer, "fonts/arial.ttf", 32); label = Label::createWithTTF(buffer, "fonts/arial.ttf", 32);
root->addChild(label, 1); root->addChild(label, 1);
label->setPosition(Vec2(s.width / 2, s.height - 170)); label->setPosition(Vec2(s.width / 2, prevMenuPos-=menuStep));
auto wall = Node::create(); auto wall = Node::create();
wall->addComponent(PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size, PhysicsMaterial(0.1f, 1, 0.0f))); wall->addComponent(PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size, PhysicsMaterial(0.1f, 1, 0.0f)));