Camera Component UI

fszewczyk · Jan 30, 2025 · 40f3858 · 40f3858
1 parent fe67b75
commit 40f3858
Show file tree

Hide file tree

Showing 8 changed files with 142 additions and 8 deletions.
diff --git a/src/Components/CameraComponent.hpp b/src/Components/CameraComponent.hpp
@@ -40,7 +40,7 @@ class CameraComponent {
     }
 
     glm::mat4 getProjectionMatrix() const {
-        return getProjectionMatrix(nearPlane, farPlane);
+        return getProjectionMatrix(projectionType, nearPlane, farPlane);
     }
 
     Ray getRayAt(const TransformComponent& transformComponent, float x, float y) const {
@@ -67,7 +67,7 @@ class CameraComponent {
     }
 
     std::vector<glm::vec3> getFrustumCornersWorldSpace(float localNearPlane, float localFarPlane, const TransformComponent& transformComponent) const {
-        glm::mat4 invViewProj = glm::inverse(getProjectionMatrix(localNearPlane, localFarPlane) * getViewMatrix(transformComponent));
+        glm::mat4 invViewProj = glm::inverse(getProjectionMatrix(ProjectionType::Perspective, localNearPlane, localFarPlane) * getViewMatrix(transformComponent));
 
         std::vector<glm::vec3> frustumCorners;
         for (int x = -1; x <= 1; x += 2) {
@@ -83,11 +83,11 @@ class CameraComponent {
     }
 
     private:
-        glm::mat4 getProjectionMatrix(float localNearPlane, float localFarPlane) const {
+        glm::mat4 getProjectionMatrix(ProjectionType projection, float localNearPlane, float localFarPlane) const {
             if (projectionType == ProjectionType::Perspective) {
                 return glm::perspective(glm::radians(fov), aspectRatio, localNearPlane, localFarPlane);
             } else {
-                float orthoSize = 10.0f;  // Can be configurable
+                float orthoSize = fov;  // Can be configurable
                 float halfWidth = orthoSize * aspectRatio * 0.5f;
                 float halfHeight = orthoSize * 0.5f;
                 return glm::ortho(-halfWidth, halfWidth, -halfHeight, halfHeight, localNearPlane, localFarPlane);

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
@@ -11,6 +11,7 @@ add_library(
 
     ${CMAKE_CURRENT_LIST_DIR}/Components/TransformComponentUI.cpp
     ${CMAKE_CURRENT_LIST_DIR}/Components/ModelComponentUI.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/Components/CameraComponentUI.cpp
     ${CMAKE_CURRENT_LIST_DIR}/Components/PointLightComponentUI.cpp
     ${CMAKE_CURRENT_LIST_DIR}/Components/SpotLightComponentUI.cpp
     ${CMAKE_CURRENT_LIST_DIR}/Components/DirectionalLightComponentUI.cpp

diff --git a/src/ui/Common/EnumSelector.hpp b/src/ui/Common/EnumSelector.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include <string>
+#include <functional>
+#include <map>
+
+#include <glm/glm.hpp>
+#include "imgui.h"
+
+namespace shkyera {
+
+template<typename EnumType>
+class EnumSelector {
+    public:
+        EnumSelector(const std::string& title, EnumType value, const std::map<EnumType, std::string>& options) :
+            _title(title),
+            _value(value),
+            _options(options)
+        {}
+
+        void setUpdateCallback(std::function<void(EnumType value)> callback)
+        {
+            _updateCallback = callback;
+        }
+
+        void draw()
+        {
+            EnumType oldValue = _value;
+            ImGui::PushItemWidth(50);
+            ImGui::TextUnformatted(_title.c_str());
+            ImGui::PopItemWidth();
+
+            ImGui::SameLine(120);
+            ImGui::PushItemWidth(190);
+
+            if(ImGui::BeginCombo((std::string("##" + _title + "EnumSelectorCombo").c_str()), _options.at(_value).c_str()))
+            {
+                for(const auto& [value, name] : _options)
+                {
+                    if (ImGui::Selectable(name.c_str()))
+                    {
+                        _value = value;
+                    }
+                }
+
+                ImGui::EndCombo();
+            }
+
+            ImGui::PopItemWidth();
+
+            if(oldValue != _value)
+            {
+                if(_updateCallback)
+                {
+                    _updateCallback(_value);
+                }
+            }
+        }
+
+    private:
+        std::string _title;
+        EnumType _value;
+        std::map<EnumType, std::string> _options;
+        std::function<void(EnumType value)> _updateCallback;
+};
+
+}
diff --git a/src/ui/Common/FloatSlider.cpp b/src/ui/Common/FloatSlider.cpp
@@ -5,9 +5,9 @@
 
 namespace shkyera {
 
-FloatSlider::FloatSlider(const std::string& title, float min, float max) : _title(title), _imguiIdentifier("##" + _title + "Slider"), _value((min + max) / 2), _minimum(min), _maximum(max) {}
+FloatSlider::FloatSlider(const std::string& title, float min, float max) : _title(title), _value((min + max) / 2), _minimum(min), _maximum(max) {}
 
-FloatSlider::FloatSlider(const std::string& title, float value, float min, float max) : _title(title), _imguiIdentifier("##" + _title + "Slider"), _value(value), _minimum(min), _maximum(max) {}
+FloatSlider::FloatSlider(const std::string& title, float value, float min, float max) : _title(title), _value(value), _minimum(min), _maximum(max) {}
 
 void FloatSlider::setUpdateCallback(std::function<void(float value)> callback) {
     _updateCallback = callback;
@@ -22,7 +22,7 @@ void FloatSlider::draw() {
 
     ImGui::SameLine(120);
     ImGui::PushItemWidth(190);
-    ImGui::SliderFloat(_imguiIdentifier.c_str(), &_value, _minimum, _maximum, "%.3f");
+    ImGui::SliderFloat((std::string("##") + _title + "Slider").c_str(), &_value, _minimum, _maximum, "%.3f");
     ImGui::PopItemWidth();
 
     if(oldValue != _value)

diff --git a/src/ui/Common/FloatSlider.hpp b/src/ui/Common/FloatSlider.hpp
@@ -19,7 +19,6 @@ class FloatSlider {
 
     private:
         std::string _title;
-        std::string _imguiIdentifier;
         float _value;
         float _minimum, _maximum;
         std::function<void(float value)> _updateCallback;

diff --git a/src/ui/Components/CameraComponentUI.cpp b/src/ui/Components/CameraComponentUI.cpp
@@ -0,0 +1,37 @@
+#include "imgui.h"
+
+#include <glm/glm.hpp>
+#include <AssetManager/Image.hpp>
+#include <UI/Components/CameraComponentUI.hpp>
+
+namespace shkyera {
+
+CameraComponentUI::CameraComponentUI(CameraComponent* cameraComponent) :
+    _cameraComponent(cameraComponent),
+    _fovSlider("Field of View", cameraComponent->fov, 5, 160),
+    _projectionSelector("Projection", cameraComponent->projectionType, { 
+      { CameraComponent::ProjectionType::Perspective, "Perspective" },
+      { CameraComponent::ProjectionType::Orthographic, "Orthographic" },
+    })
+{
+  _fovSlider.setUpdateCallback([this](float fov) {
+      _cameraComponent->fov = fov;
+  });
+  _projectionSelector.setUpdateCallback([this](const auto projection) {
+    _cameraComponent->projectionType = projection;
+  });
+}
+
+void CameraComponentUI::draw() {
+    ImGui::Image(_icon->getImguiTextureID(),
+               ImVec2(16, 16));
+    ImGui::SameLine();
+  if (ImGui::TreeNodeEx("Camera", ImGuiTreeNodeFlags_DefaultOpen)) {
+    _projectionSelector.draw();
+    _fovSlider.draw();
+
+    ImGui::TreePop();
+  }
+}
+
+}
diff --git a/src/ui/Components/CameraComponentUI.hpp b/src/ui/Components/CameraComponentUI.hpp
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <UI/ComponentUI.hpp>
+#include <UI/Common/FloatSlider.hpp>
+#include <UI/Common/EnumSelector.hpp>
+#include <Components/CameraComponent.hpp>
+
+namespace shkyera {
+
+class CameraComponentUI : public ComponentUI {
+    public:
+        CameraComponentUI(CameraComponent* cameraComponent);
+
+        void draw() override;
+
+    private:
+        FloatSlider _fovSlider;
+        EnumSelector<CameraComponent::ProjectionType> _projectionSelector;
+        CameraComponent* _cameraComponent;
+};
+
+}
diff --git a/src/ui/widgets/PropertiesWidget.cpp b/src/ui/widgets/PropertiesWidget.cpp
@@ -16,6 +16,7 @@
 #include <UI/Components/TransformComponentUI.hpp>
 #include <UI/Components/ModelComponentUI.hpp>
 #include <UI/Components/WireframeComponentUI.hpp>
+#include <UI/Components/CameraComponentUI.hpp>
 #include <UI/Components/AmbientLightComponentUI.hpp>
 #include <UI/Components/PointLightComponentUI.hpp>
 #include <UI/Components/SpotLightComponentUI.hpp>
@@ -89,6 +90,13 @@ void PropertiesWidget::setupComponentsUI() {
     _componentsUi.emplace_back(std::move(componentUi));
   }
 
+  if(_registry->hasComponent<CameraComponent>(*_selectedEntity)) {    
+    auto &component = _registry->getComponent<CameraComponent>(*_selectedEntity);
+    auto componentUi = std::make_unique<CameraComponentUI>(&component);
+
+    _componentsUi.emplace_back(std::move(componentUi));
+  }
+
   if(_registry->hasComponent<ModelComponent>(*_selectedEntity)) {    
     auto &component = _registry->getComponent<ModelComponent>(*_selectedEntity);
     auto componentUi = std::make_unique<ModelComponentUI>(_registry, &component);