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

[lua-tests] Fixes PhysicsDemoBug5482 crashes. (#16979) 

Fixed http://punchbox.info:3000/issues/26011
This commit is contained in:
James Chen 2016-12-09 14:12:57 +08:00 committed by minggo
parent fb3055e98c
commit 951b5174db
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1684,6 +1684,15 @@ void PhysicsDemoBug5482::onExit()
void PhysicsDemoBug5482::changeBodyCallback(Ref* /*sender*/)
{
Sprite* node = _bodyInA ? _nodeB : _nodeA;
if (_bodyInA)
{
_button->setString("Set Body To A");
}
else
{
_button->setString("Set Body To B");
}
if (_body->getOwner())
{
_body->getOwner()->removeComponent(_body);

16
tests/lua-tests/src/PhysicsTest/PhysicsTest.lua
View File

@ -1513,7 +1513,7 @@ local function PhysicsDemoBug5482()
-- wall
local wall = cc.Node:create()
wall:setPhysicsBody(cc.PhysicsBody:createEdgeBox(cc.size(VisibleRect:getVisibleRect().width,
wall:addComponent(cc.PhysicsBody:createEdgeBox(cc.size(VisibleRect:getVisibleRect().width,
VisibleRect:getVisibleRect().height),
cc.PhysicsMaterial(0.1, 1.0, 0.0)))
wall:setPosition(VisibleRect:center());
@ -1521,33 +1521,39 @@ local function PhysicsDemoBug5482()
local _nodeA = cc.Sprite:create("Images/YellowSquare.png")
_nodeA:setPosition(cc.p(VisibleRect:center().x-150,100))
_nodeA:setPhysicsBody(nil)
layer:addChild(_nodeA)
local _nodeB = cc.Sprite:create("Images/YellowSquare.png")
_nodeB:setPosition(cc.p(VisibleRect:center().x+150,100))
_nodeB:setPhysicsBody(nil)
layer:addChild(_nodeB)
local _body = cc.PhysicsBody:createBox(_nodeA:getContentSize())
_body:setTag(DRAG_BODYS_TAG)
_body:retain()
local _button = nil
local function changeBodyCallback(sender)
local node = nil
if _bodyInA then
node = _nodeB
_button:setString("Set Body To A")
cclog("_nodeB")
else
node = _nodeA
_button:setString("Set Body To B")
cclog("_nodeA")
end
node:setPhysicsBody(_body)
local owner = _body:getOwner()
if owner ~= nil then
owner:removeComponent(_body)
end
node:addComponent(_body)
_bodyInA = not _bodyInA
end
cc.MenuItemFont:setFontSize(18)
local _button = cc.MenuItemFont:create("Set Body To A");
_button = cc.MenuItemFont:create("Set Body To A");
_button:registerScriptTapHandler(changeBodyCallback)
local menu = cc.Menu:create(_button)