diff --git a/engine/src/editor/viewport/cameracontroller.cpp b/engine/src/editor/viewport/cameracontroller.cpp index 98b5f5698..dadf18952 100644 --- a/engine/src/editor/viewport/cameracontroller.cpp +++ b/engine/src/editor/viewport/cameracontroller.cpp @@ -293,18 +293,19 @@ void CameraController::doRotation(const Vector3 &vector) { void CameraController::cameraZoom(float delta) { if(m_activeCamera) { + float scale = delta * 0.01f; + if(m_activeCamera->orthographic()) { - float scale = m_activeCamera->orthoSize() * 0.001f; - m_activeCamera->setOrthoSize(CLAMP(m_activeCamera->orthoSize() - delta, m_zoomLimit.x, m_zoomLimit.y)); + scale = CLAMP(m_activeCamera->orthoSize() - scale, m_zoomLimit.x, m_zoomLimit.y); + + m_activeCamera->setOrthoSize(scale); } else { - float scale = delta * 0.01f; float focal = CLAMP(m_activeCamera->focal() - scale, m_zoomLimit.x, m_zoomLimit.y); - if(focal > 0.0f) { - m_activeCamera->setFocal(focal); - Transform *t = m_activeCamera->transform(); - t->setPosition(t->position() - t->quaternion() * Vector3(0.0f, 0.0f, scale)); - } + m_activeCamera->setFocal(focal); + + Transform *t = m_activeCamera->transform(); + t->setPosition(t->position() - t->quaternion() * Vector3(0.0f, 0.0f, scale)); } } } diff --git a/modules/editor/particletools/particletools.cpp b/modules/editor/particletools/particletools.cpp index 4bed561a3..b3b6d59ca 100644 --- a/modules/editor/particletools/particletools.cpp +++ b/modules/editor/particletools/particletools.cpp @@ -18,7 +18,6 @@ static const char *meta = \ " \"description\": \"Particle Tools plugin\"," " \"author\": \"Evgeniy Prikazchikov\"," " \"objects\": {" -" \"EffectConverter\": \"converter\"," " \"EffectBuilder\": \"converter\"," " \"ParticleEdit\": \"editor\"" " }"