up

Author: halx99

axmol/2d/NodeGrid.cpp

@@ -84,7 +84,7 @@ Camera* NodeGrid::getGridCamera()
 {
     if (!_gridCamera)
     {
-        _gridCamera = Camera::createOrthographicView(_director->getCanvasSize(), -1024, 1024);
+        _gridCamera = Camera::create(CameraMode::Ortho);
         AX_SAFE_RETAIN(_gridCamera);
     }
     else

axmol/2d/Transition.cpp

@@ -1126,7 +1126,7 @@ void TransitionCrossFade::onEnter()
     Vec2 size         = _director->getCanvasSize();
     LayerColor* layer = LayerColor::create(color);
 
-    auto camera = Camera::createOrthographicView(_director->getCanvasSize(), -1024, 1024);
+    auto camera = Camera::create(CameraMode::Ortho);
 
     // create the first render texture for inScene
     RenderTexture* inTexture =

axmol/2d/TransitionProgress.cpp

@@ -80,7 +80,7 @@ void TransitionProgress::onEnter()
     sprite->setAnchorPoint(Vec2(0.5f, 0.5f));
 
     // render outScene to its texturebuffer
-    auto camera = Camera::createOrthographicView(_director->getCanvasSize(), -1024, 1024);
+    auto camera = Camera::create(CameraMode::Ortho);
 
     {
         RefPtr<RenderTexturePass> pass(RenderTexturePass::obtain(texture), tlx::adopt_object);

axmol/base/Director.cpp

@@ -410,7 +410,7 @@ Camera* Director::getOverlayCamera()
 {
     if (!_overlayCamera)
     {
-        _overlayCamera = Camera::createOrthographicView(_canvasSizeInPoints, -1024.0f, 1024.0f);
+        _overlayCamera = Camera::create(CameraMode::Ortho);
         _overlayCamera->retain();
         _overlayCamera->setCameraFlag(CameraFlag::DEFAULT);
         _overlayCamera->setDepth(127);
@@ -423,7 +423,7 @@ Camera* Director::getOffscreenCamera()
 {
     if (!_offscreenCamera)
     {
-        _offscreenCamera = Camera::createOrthographicView(_canvasSizeInPoints, -1024.0f, 1024.0f);
+        _offscreenCamera = Camera::create(CameraMode::Ortho);
         _offscreenCamera->retain();
         _offscreenCamera->setCameraFlag(CameraFlag::DEFAULT);
         _offscreenCamera->setDepth(0);

axmol/base/Utils.cpp

@@ -159,7 +159,8 @@ void captureNode(Node* startNode, std::function<void(RefPtr<Image>)> imageCallba
 
         RefPtr<RenderTexturePass> rtxPass(RenderTexturePass::obtain(rtx), tlx::adopt_object);
 
-        Camera* camera = Camera::createOrthographicView(size, -1024.f, 1024.f);
+        auto camera = Camera::create();
+        camera->configureOrthographicView(size, -1024.f, 1024.f);
 
         rtxPass->begin(camera);
         rtxPass->clearAll();

axmol/scene/Camera.cpp

@@ -42,62 +42,44 @@ Viewport Camera::_defaultViewport;
 
 // start static methods
 
+Camera* Camera::create()
+{
+    auto ret = new Camera();
+    ret->autorelease();
+    return ret;
+}
+
 Camera* Camera::create(CameraMode mode)
 {
-    auto& size = Director::getInstance()->getCanvasSize();
+    auto& canvasSize = Director::getInstance()->getCanvasSize();
     switch (mode)
     {
     case CameraMode::Ortho:
     {
-        auto cam = Camera::createOrthographicView(size, -1024.0f, 1024.0f);
+        auto cam = Camera::create();
+        cam->configureOrthographicView(canvasSize, -1024.0f, 1024.0f);
         return cam;
     }
     case CameraMode::Perspective:
     {
-        auto cam = Camera::createPerspective(60.0f, size.width / size.height, 0.3f, 1000.0f);
+        auto cam = Camera::create();
+        cam->configurePerspective(60.0f, canvasSize.width / canvasSize.height, 0.3f, 1000.0f);
         cam->setPosition3D(Vec3(0.0f, 1.5f, 5.0f));
         cam->lookAt(Vec3(0, 0, 0));
         return cam;
     }
     case CameraMode::Classic:
     {
-        Camera* camera = new Camera();
-        camera->initClassic();
-        camera->autorelease();
-        return camera;
+        auto cam = Camera::create();
+        cam->configureClassicView(canvasSize);
+        cam->setDepth(0);
+        return cam;
     }
     }
     AXASSERT(false, "Invalid CameraMode");
     return nullptr;
 }
 
-Camera* Camera::createPerspective(float fieldOfView, float aspectRatio, float nearPlane, float farPlane)
-{
-    auto ret         = new Camera();
-    ret->_cameraMode = CameraMode::Perspective;
-    ret->configurePerspective(fieldOfView, aspectRatio, nearPlane, farPlane);
-    ret->autorelease();
-    return ret;
-}
-
-Camera* Camera::createOrthographic(float zoomX, float zoomY, float nearPlane, float farPlane)
-{
-    auto ret         = new Camera();
-    ret->_cameraMode = CameraMode::Ortho;
-    ret->configureOrthographic(zoomX, zoomY, nearPlane, farPlane);
-    ret->autorelease();
-    return ret;
-}
-
-Camera* Camera::createOrthographicView(const Vec2& size, float nearPlane, float farPlane)
-{
-    auto ret         = new Camera();
-    ret->_cameraMode = CameraMode::Ortho;
-    ret->configureOrthographicView(size, nearPlane, farPlane);
-    ret->autorelease();
-    return ret;
-}
-
 Camera* Camera::getDefaultCamera()
 {
     // camera nullptr scene init fix #690
@@ -128,15 +110,7 @@ void Camera::setDefaultViewport(const Viewport& vp)
 // end static methods
 
 Camera::Camera()
-    : _eyeZdistance(1)
-    , _zoomFactor(1)
-    , _nearPlane(-1024)
-    , _farPlane(1024)
-    , _zoomFactorNearPlane(10)
-    , _zoomFactorFarPlane(1024)
-{
-    // minggo comment
-    // _frustum.setClipZ(true);
+{
     _renderView = _director->getRenderView();
 }
 
@@ -244,19 +218,13 @@ void Camera::updateProjection()
 
 void Camera::configureClassicView(const Vec2& canvasSize)
 {
-    const float zeye = _director->getZEye();
+    const float zeye     = _director->getZEye();
+    const float farPlane = zeye + canvasSize.height * 0.5f;
 
-    _aspectRatio        = canvasSize.width / canvasSize.height;
-    _farPlane           = zeye + canvasSize.height * 0.5f;
-    _zoomFactorFarPlane = _farPlane;
+    configureClassic(canvasSize.width / canvasSize.height, 0.5f, farPlane);
 
-    updateProjection();
-
-    const Vec3 eye(canvasSize.width * 0.5f, canvasSize.height * 0.5f, zeye);
-    const Vec3 center(canvasSize.width * 0.5f, canvasSize.height * 0.5f, 0.0f);
-
-    setPosition3D(eye);
-    lookAt(center, Vec3::yAxis);
+    setPosition3D(Vec3(canvasSize.width * 0.5f, canvasSize.height * 0.5f, zeye));
+    lookAt(Vec3(canvasSize.width * 0.5f, canvasSize.height * 0.5f, 0.0f), Vec3::yAxis);
     _eyeZdistance = zeye;
 
     if (_zoomFactor != 1.0f)
@@ -285,42 +253,40 @@ void Camera::onCanvasSizeChanged(const Vec2& canvasSize)
     }
 }
 
-void Camera::initClassic()
-{
-    _cameraMode  = CameraMode::Classic;
-    _fieldOfView = 60.0F;
-    _nearPlane   = 0.5F;
-    configureClassicView(_director->getCanvasSize());
-    setDepth(0);
-}
-
-void Camera::updateTransform()
+void Camera::configureClassic(float aspectRatio, float nearPlane, float farPlane)
 {
+    _cameraMode          = CameraMode::Classic;
+    _fieldOfView         = 60.0F;
+    _aspectRatio         = aspectRatio;
+    _nearPlane           = nearPlane;
+    _farPlane            = farPlane;
+    _zoomFactorNearPlane = _nearPlane;
+    _zoomFactorFarPlane  = _farPlane;
     updateProjection();
 }
 
 bool Camera::configurePerspective(float fieldOfView, float aspectRatio, float nearPlane, float farPlane)
 {
+    _cameraMode  = CameraMode::Perspective;
     _fieldOfView = fieldOfView;
     _aspectRatio = aspectRatio;
     _nearPlane   = nearPlane;
     _farPlane    = farPlane;
 
-    if (_zoomFactorFarPlane == 1024)
-        _zoomFactorFarPlane = farPlane;
-    if (_zoomFactorNearPlane == 10)
-        _zoomFactorNearPlane = nearPlane;
+    _zoomFactorNearPlane = nearPlane;
+    _zoomFactorFarPlane  = farPlane;
 
     updateProjection();
     return true;
 }
 
 bool Camera::configureOrthographic(float zoomX, float zoomY, float nearPlane, float farPlane)
 {
-    _zoom[0]   = zoomX;
-    _zoom[1]   = zoomY;
-    _nearPlane = nearPlane;
-    _farPlane  = farPlane;
+    _cameraMode = CameraMode::Ortho;
+    _zoom[0]    = zoomX;
+    _zoom[1]    = zoomY;
+    _nearPlane  = nearPlane;
+    _farPlane   = farPlane;
 
     updateProjection();
     return true;