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

Merge pull request #217 from songmiao/626_v3 

change camera position
This commit is contained in:
XiaoYang 2015-01-16 09:51:29 +08:00
parent 772813e810 147506f662
commit 1eb4a06f14
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1051,7 +1051,7 @@ void CameraArcBallDemo::onEnter()
{ {
_camera=Camera::createPerspective(60, (GLfloat)s.width/s.height, 1, 1000); _camera=Camera::createPerspective(60, (GLfloat)s.width/s.height, 1, 1000);
_camera->setCameraFlag(CameraFlag::USER1); _camera->setCameraFlag(CameraFlag::USER1);
_camera->setPosition3D(Vec3(0, 100, 50)); _camera->setPosition3D(Vec3(0, 10, 50));
_camera->lookAt(Vec3(0, 0, 0), Vec3(0, 1, 0)); _camera->lookAt(Vec3(0, 0, 0), Vec3(0, 1, 0));
_camera->retain(); _camera->retain();
_layer3D->addChild(_camera); _layer3D->addChild(_camera);
@ -1175,7 +1175,7 @@ float CameraArcBallDemo::projectToSphere( float r, float x, float y )
void CameraArcBallDemo::updateCameraTransform() void CameraArcBallDemo::updateCameraTransform()
{ {
Mat4 trans, rot, center; Mat4 trans, rot, center;
Mat4::createTranslation(Vec3(0.0f, 0.0f, _distanceZ), &trans); Mat4::createTranslation(Vec3(0.0f, 10.0f, _distanceZ), &trans);
Mat4::createRotation(_rotationQuat, &rot); Mat4::createRotation(_rotationQuat, &rot);
Mat4::createTranslation(_center, &center); Mat4::createTranslation(_center, &center);
Mat4 result = center * rot * trans; Mat4 result = center * rot * trans;