feat(rendering): Add OrthographicCamera component

CHANGELOG.md

@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Generic Camera component to hold projection matrix (#1331, **@mkuritsu**).
 - Initial application debugging through Tesseratos (#1303, **@RiscadoA**).
 - Print stacktrace with *cpptrace* on calls to CUBOS_FAIL (#1172, **@RiscadoA**).
+- Orthographic Camera component (#1182, **@mkuritsu**).
 
 ### Changed
 
@@ -28,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Spot light angle mismatch between light and shadows (#1310, **@tomas7770**).
 - Spot shadows cause light range cutoff (#1312, **@tomas7770**).
+- Precision error in split screen size calculations (**@mkuritsu**).
 
 
 ## [v0.3.0] - 2024-08-02

engine/CMakeLists.txt

@@ -127,7 +127,8 @@ set(CUBOS_ENGINE_SOURCE
 	"src/render/depth/plugin.cpp"
 	"src/render/depth/depth.cpp"
 	"src/render/camera/plugin.cpp"
-	"src/render/camera/perspective_camera.cpp"
+	"src/render/camera/orthographic.cpp"
+	"src/render/camera/perspective.cpp"
 	"src/render/camera/draws_to.cpp"
 	"src/render/camera/camera.cpp"
 	"src/render/voxels/plugin.cpp"

engine/include/cubos/engine/render/camera/orthographic.hpp

@@ -0,0 +1,41 @@
+/// @file
+/// @brief Component @ref cubos::engine::OrthographicCamera
+/// @ingroup render-camera-plugin
+
+#pragma once
+
+#include <cubos/core/reflection/reflect.hpp>
+
+#include <cubos/engine/api.hpp>
+
+namespace cubos::engine
+{
+    /// @brief Component which defines parameters of a orthographic camera used to render the world.
+    /// @note Should be used with @ref LocalToWorld.
+    /// @ingroup render-camera-plugin
+    struct CUBOS_ENGINE_API OrthographicCamera
+    {
+        CUBOS_REFLECT;
+
+        /// @brief The axis that can be fixed for this projection.
+        enum class Axis
+        {
+            Horizontal,
+            Vertical
+        };
+
+        /// @brief The size of the fixed axis of the projection.
+        float size{50.0F};
+
+        /// @brief The axis to be fixed for the projection.
+        Axis axis{Axis::Vertical};
+
+        /// @brief Near clipping plane.
+        float zNear{0.1F};
+
+        /// @brief Far clipping plane.
+        float zFar{1000.0F};
+    };
+} // namespace cubos::engine
+
+CUBOS_REFLECT_EXTERNAL_DECL(CUBOS_ENGINE_API, cubos::engine::OrthographicCamera::Axis);

engine/samples/collisions/main.cpp

@@ -17,7 +17,7 @@
 #include <cubos/engine/physics/plugin.hpp>
 #include <cubos/engine/physics/solver/plugin.hpp>
 #include <cubos/engine/render/camera/draws_to.hpp>
-#include <cubos/engine/render/camera/perspective_camera.hpp>
+#include <cubos/engine/render/camera/perspective.hpp>
 #include <cubos/engine/render/defaults/plugin.hpp>
 #include <cubos/engine/render/defaults/target.hpp>
 #include <cubos/engine/render/tone_mapping/plugin.hpp>

engine/samples/complex_physics/main.cpp

@@ -11,7 +11,7 @@
 #include <cubos/engine/physics/plugins/gravity.hpp>
 #include <cubos/engine/physics/solver/plugin.hpp>
 #include <cubos/engine/render/camera/draws_to.hpp>
-#include <cubos/engine/render/camera/perspective_camera.hpp>
+#include <cubos/engine/render/camera/perspective.hpp>
 #include <cubos/engine/render/defaults/plugin.hpp>
 #include <cubos/engine/render/defaults/target.hpp>
 #include <cubos/engine/render/lights/directional.hpp>

engine/samples/gizmos/main.cpp

@@ -2,7 +2,7 @@
 #include <cubos/engine/gizmos/target.hpp>
 #include <cubos/engine/prelude.hpp>
 #include <cubos/engine/render/camera/draws_to.hpp>
-#include <cubos/engine/render/camera/perspective_camera.hpp>
+#include <cubos/engine/render/camera/perspective.hpp>
 #include <cubos/engine/render/camera/plugin.hpp>
 #include <cubos/engine/render/picker/picker.hpp>
 #include <cubos/engine/render/picker/plugin.hpp>

engine/samples/physics/main.cpp

@@ -5,7 +5,7 @@
 #include <cubos/engine/physics/plugins/gravity.hpp>
 #include <cubos/engine/physics/solver/plugin.hpp>
 #include <cubos/engine/render/camera/draws_to.hpp>
-#include <cubos/engine/render/camera/perspective_camera.hpp>
+#include <cubos/engine/render/camera/perspective.hpp>
 #include <cubos/engine/render/defaults/plugin.hpp>
 #include <cubos/engine/render/defaults/target.hpp>
 #include <cubos/engine/render/lights/directional.hpp>

engine/samples/render/main/assets/main.cubos

@@ -22,7 +22,9 @@
             }
         },
         "camera3": {
-            "cubos::engine::PerspectiveCamera": {},
+            "cubos::engine::OrthographicCamera": {
+                "size": 10
+            },
             "cubos::engine::DrawsTo@render-target": {},
             "cubos::engine::Position": {
                 "x": -3,
@@ -63,4 +65,4 @@
             }
         }
     }
-}
+}

engine/samples/voxels/main.cpp

@@ -1,6 +1,6 @@
 #include <cubos/engine/assets/plugin.hpp>
 #include <cubos/engine/render/camera/draws_to.hpp>
-#include <cubos/engine/render/camera/perspective_camera.hpp>
+#include <cubos/engine/render/camera/perspective.hpp>
 #include <cubos/engine/render/defaults/plugin.hpp>
 #include <cubos/engine/render/defaults/target.hpp>
 #include <cubos/engine/render/lights/directional.hpp>
@@ -69,4 +69,4 @@ int main(int argc, char** argv)
     /// [Spawn car system]
 
     cubos.run();
-}
+}

engine/src/render/camera/orthographic.cpp

@@ -0,0 +1,28 @@
+#include <cubos/core/ecs/reflection.hpp>
+#include <cubos/core/reflection/external/primitives.hpp>
+#include <cubos/core/reflection/traits/enum.hpp>
+#include <cubos/core/reflection/type.hpp>
+
+#include <cubos/engine/render/camera/orthographic.hpp>
+
+using cubos::core::reflection::EnumTrait;
+using cubos::core::reflection::Type;
+using cubos::engine::OrthographicCamera;
+
+CUBOS_REFLECT_EXTERNAL_IMPL(OrthographicCamera::Axis)
+{
+    return Type::create("cubos::engine::CameraAxis")
+        .with(EnumTrait{}
+                  .withVariant<OrthographicCamera::Axis::Vertical>("Vertical")
+                  .withVariant<OrthographicCamera::Axis::Horizontal>("Horizontal"));
+}
+
+CUBOS_REFLECT_IMPL(OrthographicCamera)
+{
+    return core::ecs::TypeBuilder<OrthographicCamera>("cubos::engine::OrthographicCamera")
+        .withField("size", &OrthographicCamera::size)
+        .withField("axis", &OrthographicCamera::axis)
+        .withField("zNear", &OrthographicCamera::zNear)
+        .withField("zFar", &OrthographicCamera::zFar)
+        .build();
+}

engine/src/render/camera/perspective_camera.cpp → engine/src/render/camera/perspective.cpp

@@ -1,7 +1,7 @@
 #include <cubos/core/ecs/reflection.hpp>
 #include <cubos/core/reflection/external/primitives.hpp>
 
-#include <cubos/engine/render/camera/perspective_camera.hpp>
+#include <cubos/engine/render/camera/perspective.hpp>
 
 CUBOS_REFLECT_IMPL(cubos::engine::PerspectiveCamera)
 {

engine/src/render/camera/plugin.cpp

@@ -2,7 +2,8 @@
 
 #include <cubos/engine/render/camera/camera.hpp>
 #include <cubos/engine/render/camera/draws_to.hpp>
-#include <cubos/engine/render/camera/perspective_camera.hpp>
+#include <cubos/engine/render/camera/orthographic.hpp>
+#include <cubos/engine/render/camera/perspective.hpp>
 #include <cubos/engine/render/camera/plugin.hpp>
 #include <cubos/engine/render/target/plugin.hpp>
 #include <cubos/engine/render/target/target.hpp>
@@ -13,8 +14,9 @@
 {
     cubos.depends(renderTargetPlugin);
 
-    cubos.component<PerspectiveCamera>();
     cubos.component<Camera>();
+    cubos.component<PerspectiveCamera>();
+    cubos.component<OrthographicCamera>();
 
     cubos.relation<DrawsTo>();
 
@@ -28,6 +30,16 @@
             }
         });
 
+    cubos.observer("add Camera on add OrthographicCamera")
+        .onAdd<OrthographicCamera>()
+        .without<Camera>()
+        .call([](Commands cmds, Query<Entity> query) {
+            for (auto [ent] : query)
+            {
+                cmds.add(ent, Camera{});
+            }
+        });
+
     cubos.system("update Camera projection by PerspectiveCamera")
         .call([](Query<Camera&, const PerspectiveCamera&, const DrawsTo&, const RenderTarget&> query) {
             for (auto [camera, perspective, drawsTo, target] : query)
@@ -41,4 +53,23 @@
                 }
             }
         });
+
+    cubos.system("update Camera projection by OrthographicCamera")
+        .call([](Query<Camera&, const OrthographicCamera&, const DrawsTo&, const RenderTarget&> query) {
+            for (auto [camera, ortho, drawsTo, target] : query)
+            {
+                float aspect = (static_cast<float>(target.size.x) * drawsTo.viewportSize.x) /
+                               (static_cast<float>(target.size.y) * drawsTo.viewportSize.y);
+                if (ortho.axis == OrthographicCamera::Axis::Vertical)
+                {
+                    camera.projection = glm::ortho(-ortho.size * aspect, ortho.size * aspect, -ortho.size, ortho.size,
+                                                   ortho.zNear, ortho.zFar);
+                }
+                else
+                {
+                    camera.projection = glm::ortho(-ortho.size, ortho.size, -ortho.size / aspect, ortho.size / aspect,
+                                                   ortho.zNear, ortho.zFar);
+                }
+            }
+        });
 }

engine/src/render/split_screen/plugin.cpp

@@ -35,12 +35,12 @@
         // Split along the largest axis.
         if (size.x > size.y)
         {
-            splitSize = {size.x / 2, size.y};
+            splitSize = {(size.x + 1) / 2, size.y};
             splitOffset = {size.x / 2, 0};
         }
         else
         {
-            splitSize = {size.x, size.y / 2};
+            splitSize = {size.x, (size.y + 1) / 2};
             splitOffset = {0, size.y / 2};
         }
 

tools/tesseratos/src/tesseratos/debug_camera/plugin.cpp

@@ -8,7 +8,7 @@
 #include <cubos/engine/input/plugin.hpp>
 #include <cubos/engine/render/camera/camera.hpp>
 #include <cubos/engine/render/camera/draws_to.hpp>
-#include <cubos/engine/render/camera/perspective_camera.hpp>
+#include <cubos/engine/render/camera/perspective.hpp>
 #include <cubos/engine/render/camera/plugin.hpp>
 #include <cubos/engine/render/target/plugin.hpp>
 #include <cubos/engine/render/target/target.hpp>