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

Merge pull request #3724 from samuele3hu/developTest 

[ci skip]Modify Accelerometer Test sample because of  the modification of nativeactivity.cpp
This commit is contained in:
minggo 2013-09-20 07:12:15 -07:00
parent 480164abfc a6d498e068
commit 348386990b
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
samples/Lua/TestLua/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua
View File

@ -23,30 +23,33 @@ local function AccelerometerMainLayer()
return return
end end
local director = cc.Director:getInstance()
local szBall = ball:getContentSize() local szBall = ball:getContentSize()
local ptNowX,ptNowY = ball:getPosition() local ptNowX,ptNowY = ball:getPosition()
local ptTemp = director:convertToUI(cc.p(ptNowX,ptNowY))
ptNowX = ptNowX - x ptTemp.x = ptTemp.x + x * 9.81
ptNowY = ptNowY - y ptTemp.y = ptTemp.y - y * 9.81
local ptNext = director:convertToGL(cc.p(ptTemp.x,ptTemp.y))
local minX = math.floor(VisibleRect:left().x + szBall.width / 2.0) local minX = math.floor(VisibleRect:left().x + szBall.width / 2.0)
local maxX = math.floor(VisibleRect:right().x - szBall.width / 2.0) local maxX = math.floor(VisibleRect:right().x - szBall.width / 2.0)
if ptNowX < minX then if ptNext.x < minX then
ptNowX = minX ptNext.x = minX
elseif ptNowX > maxX then elseif ptNext.x > maxX then
ptNowX = maxX ptNext.x = maxX
end end
local minY = math.floor(VisibleRect:bottom().y + szBall.height / 2.0) local minY = math.floor(VisibleRect:bottom().y + szBall.height / 2.0)
local maxY = math.floor(VisibleRect:top().y - szBall.height / 2.0) local maxY = math.floor(VisibleRect:top().y - szBall.height / 2.0)
if ptNowY < minY then if ptNext.y < minY then
ptNowY = minY ptNext.y = minY
elseif ptNowY > maxY then elseif ptNext.y > maxY then
ptNowY = maxY ptNext.y = maxY
end end
ball:setPosition(cc.p(ptNowX, ptNowY )) ball:setPosition(cc.p(ptNext.x , ptNext.y))
end end
layer:registerScriptAccelerateHandler(didAccelerate) layer:registerScriptAccelerateHandler(didAccelerate)