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

Merge pull request #259 from lvlonggame/camera_culling_crash 

fix: Camera culling crash
This commit is contained in:
XiaoYang 2015-03-19 16:30:00 +08:00
parent 28e2b8719a 9e3ae9bfb5
commit dfe9e45d50
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
View File

@ -882,8 +882,9 @@ void CameraCullingDemo::update(float dt)
void CameraCullingDemo::reachEndCallBack() void CameraCullingDemo::reachEndCallBack()
{ {
_cameraFirst->stopActionByTag(100); _cameraFirst->stopActionByTag(100);
auto inverse = (MoveTo*)_moveAction->reverse(); auto inverse = MoveTo::create(4.f, Vec2(-_cameraFirst->getPositionX(), 0));
inverse->retain(); inverse->retain();
_moveAction->release(); _moveAction->release();
_moveAction = inverse; _moveAction = inverse;
auto rot = RotateBy::create(1.f, Vec3(0.f, 180.f, 0.f)); auto rot = RotateBy::create(1.f, Vec3(0.f, 180.f, 0.f));
@ -902,7 +903,7 @@ void CameraCullingDemo::switchViewCallback(Ref* sender)
_cameraFirst->setCameraFlag(CameraFlag::USER8); _cameraFirst->setCameraFlag(CameraFlag::USER8);
_cameraFirst->setPosition3D(Vec3(-100,0,0)); _cameraFirst->setPosition3D(Vec3(-100,0,0));
_cameraFirst->lookAt(Vec3(1000,0,0)); _cameraFirst->lookAt(Vec3(1000,0,0));
_moveAction = MoveTo::create(4.f, Vec2(100, 0)); _moveAction = MoveTo::create(4.f, Vec2(-_cameraFirst->getPositionX(), 0));
_moveAction->retain(); _moveAction->retain();
auto seq = Sequence::create(_moveAction, CallFunc::create(CC_CALLBACK_0(CameraCullingDemo::reachEndCallBack, this)), nullptr); auto seq = Sequence::create(_moveAction, CallFunc::create(CC_CALLBACK_0(CameraCullingDemo::reachEndCallBack, this)), nullptr);
seq->setTag(100); seq->setTag(100);