add scale to camera

yknishidate · Sep 8, 2024 · 468cbdc · 468cbdc
1 parent e0a56ff
commit 468cbdc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/include/reactive/Scene/Camera.hpp b/include/reactive/Scene/Camera.hpp
@@ -85,6 +85,8 @@ class Camera {
         }
     }
 
+    void setScale(float _scale) { scale = _scale; }
+
 protected:
     Type type = Type::Orbital;
 
@@ -95,6 +97,7 @@ class Camera {
     float zNear = 0.1f;
     float zFar = 1000.0f;
     float fovY = glm::radians(45.0f);
+    float scale = 1.0f;
 
     std::variant<FirstPersonParams, OrbitalParams> params = OrbitalParams{};
 };

diff --git a/src/Scene/Camera.cpp b/src/Scene/Camera.cpp
@@ -69,7 +69,7 @@ auto Camera::getView() const -> glm::mat4 {
 }
 
 auto Camera::getProj() const -> glm::mat4 {
-    return glm::perspective(fovY, aspect, zNear, zFar);
+    return glm::perspective(fovY, aspect, zNear * scale, zFar * scale);
 }
 
 auto Camera::getInvView() const -> glm::mat4 {
@@ -83,12 +83,14 @@ auto Camera::getInvProj() const -> glm::mat4 {
 auto Camera::getPosition() const -> glm::vec3 {
     if (type == Type::FirstPerson) {
         auto& _params = std::get<FirstPersonParams>(params);
-        return _params.position;
+        return _params.position * scale;
     } else {
         auto& _params = std::get<OrbitalParams>(params);
         glm::mat4 rotX = glm::rotate(eulerRotation.x, glm::vec3(1, 0, 0));
         glm::mat4 rotY = glm::rotate(eulerRotation.y, glm::vec3(0, 1, 0));
-        return _params.target + glm::vec3{rotY * rotX * glm::vec4{0, 0, _params.distance, 1}};
+        glm::vec3 position =
+            _params.target + glm::vec3{rotY * rotX * glm::vec4{0, 0, _params.distance, 1}};
+        return position * scale;
     }
 }