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

Merge: f8e6c06286 cea283c489 

Merge pull request #11 from simdsoft/sync-v4

Sync v4
This commit is contained in:
halx99 2019-11-26 08:49:56 -08:00 committed by GitHub
parent 217962e748
commit d5af773970
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos/2d/CCActionGrid.cpp
View File

@ -130,6 +130,18 @@ Rect Grid3DAction::getGridRect() const
} }
// implementation of TiledGrid3DAction // implementation of TiledGrid3DAction
TiledGrid3DAction* TiledGrid3DAction::create(float duration, const Size &gridSize)
{
TiledGrid3DAction *ret = new (std::nothrow) TiledGrid3DAction();
if (ret && ret->initWithDuration(duration, gridSize))
{
ret->autorelease();
return ret;
}
delete ret;
return nullptr;
}
GridBase* TiledGrid3DAction::getGrid() GridBase* TiledGrid3DAction::getGrid()
{ {

14
tests/cpp-tests/Classes/TouchesTest/TouchesTest.cpp
View File

@ -83,20 +83,22 @@ PongLayer::PongLayer()
Vector<Paddle*> paddlesM(4); Vector<Paddle*> paddlesM(4);
float paddleStep =(VisibleRect::getVisibleRect().size.height - kStatusBarHeight - 30 - 3*paddleTexture->getPixelsHigh())/3 + paddleTexture->getPixelsHigh();
float nextPaddlePos = VisibleRect::bottom().y + 15;
Paddle* paddle = Paddle::createWithTexture(paddleTexture); Paddle* paddle = Paddle::createWithTexture(paddleTexture);
paddle->setPosition( Vec2(VisibleRect::center().x, VisibleRect::bottom().y + 15) ); paddle->setPosition( Vec2(VisibleRect::center().x, nextPaddlePos));
paddlesM.pushBack( paddle ); paddlesM.pushBack( paddle );
paddle = Paddle::createWithTexture( paddleTexture ); paddle = Paddle::createWithTexture( paddleTexture );
paddle->setPosition( Vec2(VisibleRect::center().x, VisibleRect::top().y - kStatusBarHeight - 15) ); paddle->setPosition( Vec2(VisibleRect::center().x, nextPaddlePos+=paddleStep) );
paddlesM.pushBack( paddle ); paddlesM.pushBack( paddle );
paddle = Paddle::createWithTexture( paddleTexture ); paddle = Paddle::createWithTexture( paddleTexture );
paddle->setPosition( Vec2(VisibleRect::center().x, VisibleRect::bottom().y + 100) ); paddle->setPosition( Vec2(VisibleRect::center().x, nextPaddlePos+=paddleStep) );
paddlesM.pushBack( paddle ); paddlesM.pushBack( paddle );
paddle = Paddle::createWithTexture( paddleTexture ); paddle = Paddle::createWithTexture( paddleTexture );
paddle->setPosition( Vec2(VisibleRect::center().x, VisibleRect::top().y - kStatusBarHeight - 100) ); paddle->setPosition( Vec2(VisibleRect::center().x, nextPaddlePos+=paddleStep) );
paddlesM.pushBack( paddle ); paddlesM.pushBack( paddle );
_paddles = paddlesM; _paddles = paddlesM;

2
tools/appveyor-scripts/build.ps1
View File

@ -102,6 +102,8 @@ If ($env:build_type -eq "android_cpp_tests") {
} elseif ($env:build_type -eq "windows32_cmake_test") { } elseif ($env:build_type -eq "windows32_cmake_test") {
Write-Host "Build tests project by cmake" Write-Host "Build tests project by cmake"
$ENV:PATH="$env:APPVEYOR_BUILD_FOLDER\tools\cocos2d-console\bin;$ENV:PATH"
& mkdir $env:APPVEYOR_BUILD_FOLDER\win32-build & mkdir $env:APPVEYOR_BUILD_FOLDER\win32-build
# if ($lastexitcode -ne 0) {throw} # mkdir return no-zero # if ($lastexitcode -ne 0) {throw} # mkdir return no-zero