Merge pull request #113 from wj461/pivot

Add a pivot for GameObject

Author: ntut-rick

include/Core/Drawable.hpp

@@ -3,13 +3,6 @@
 
 #include "pch.hpp" // IWYU pragma: export
 
-#include <functional>
-
-#include "Core/Program.hpp"
-#include "Core/UniformBuffer.hpp"
-#include "Core/VertexArray.hpp"
-
-#include "Texture.hpp"
 #include "Util/Transform.hpp"
 
 namespace Core {
@@ -21,7 +14,7 @@ struct Matrices {
 class Drawable {
 public:
     virtual ~Drawable() = default;
-    virtual void Draw(const Util::Transform &transform, const float zIndex) = 0;
+    virtual void Draw(const Core::Matrices &data) = 0;
     virtual glm::vec2 GetSize() const = 0;
 };
 } // namespace Core

include/Util/Animation.hpp

@@ -110,7 +110,7 @@ class Animation : public Core::Drawable {
      * @param transform Transformation matrix for drawing.
      * @param zIndex Z-index for drawing.
      */
-    void Draw(const Util::Transform &transform, const float zIndex) override;
+    void Draw(const Core::Matrices &data) override;
 
     /**
      * @brief Start playing the animation.

include/Util/GameObject.hpp

@@ -1,10 +1,10 @@
 #ifndef UTIL_GAME_OBJECT_HPP
 #define UTIL_GAME_OBJECT_HPP
 
-#include <memory>
-#include <vector>
+#include "pch.hpp" // IWYU pragma: export
 
 #include "Core/Drawable.hpp"
+
 #include "Util/Transform.hpp"
 
 namespace Util {
@@ -36,13 +36,15 @@ class GameObject {
      * @param children The children of the game object.
      */
     GameObject(const std::shared_ptr<Core::Drawable> &drawable,
-               const float zIndex, const bool visible = true,
+               const float zIndex, const glm::vec2 &pivot = {0, 0},
+               const bool visible = true,
                const std::vector<std::shared_ptr<GameObject>> &children =
                    std::vector<std::shared_ptr<GameObject>>())
         : m_Drawable(drawable),
           m_Children(children),
           m_ZIndex(zIndex),
-          m_Visible(visible) {}
+          m_Visible(visible),
+          m_Pivot(pivot) {}
 
     /**
      * @brief Copy constructor.
@@ -98,6 +100,13 @@ class GameObject {
         return m_Children;
     }
 
+    /**
+     * @brief Set the pivot of the game object.
+     *
+     * @param pivot The pivot of the game object.
+     */
+    void SetPivot(const glm::vec2 &pivot) { m_Pivot = pivot; }
+
     /**
      * @brief Set the z-index of the game object.
      * z-index is used to determine the order in which game objects are drawn,
@@ -151,6 +160,7 @@ class GameObject {
 
     float m_ZIndex = 0;
     bool m_Visible = true;
+    glm::vec2 m_Pivot;
 };
 } // namespace Util
 #endif

include/Util/Image.hpp

@@ -6,7 +6,10 @@
 #include <glm/fwd.hpp>
 
 #include "Core/Drawable.hpp"
+#include "Core/Program.hpp"
 #include "Core/Texture.hpp"
+#include "Core/UniformBuffer.hpp"
+#include "Core/VertexArray.hpp"
 
 #include "Util/AssetStore.hpp"
 #include "Util/Transform.hpp"
@@ -56,7 +59,7 @@ class Image : public Core::Drawable {
      * @param transform The transform to apply to the image.
      * @param zIndex The z-index at which to draw the image.
      */
-    void Draw(const Util::Transform &transform, const float zIndex) override;
+    void Draw(const Core::Matrices &data) override;
 
 private:
     void InitProgram();

include/Util/Text.hpp

@@ -6,7 +6,10 @@
 #include <functional>
 
 #include "Core/Drawable.hpp"
+#include "Core/Program.hpp"
 #include "Core/Texture.hpp"
+#include "Core/UniformBuffer.hpp"
+#include "Core/VertexArray.hpp"
 
 #include "Util/Color.hpp"
 #include "Util/Transform.hpp"
@@ -53,7 +56,7 @@ class Text : public Core::Drawable {
      * @param transform The transform to apply to the text.
      * @param zIndex The z-index at which to draw the text.
      */
-    void Draw(const Transform &transform, const float zIndex) override;
+    void Draw(const Core::Matrices &data) override;
 
 private:
     void InitProgram();

src/Util/Animation.cpp

@@ -24,8 +24,8 @@ void Animation::SetCurrentFrame(std::size_t index) {
     }
 }
 
-void Animation::Draw(const Util::Transform &transform, const float zIndex) {
-    m_Frames[m_Index]->Draw(transform, zIndex);
+void Animation::Draw(const Core::Matrices &data) {
+    m_Frames[m_Index]->Draw(data);
     Update();
 }
 

src/Util/GameObject.cpp

@@ -1,4 +1,6 @@
 #include "Util/GameObject.hpp"
+#include "Util/Transform.hpp"
+#include "Util/TransformUtils.hpp"
 
 namespace Util {
 
@@ -7,7 +9,12 @@ void GameObject::Draw() {
         return;
     }
 
-    m_Drawable->Draw(m_Transform, m_ZIndex);
+    auto data = Util::ConvertToUniformBufferData(
+        m_Transform, m_Drawable->GetSize(), m_ZIndex);
+    data.m_Model = glm::translate(
+        data.m_Model, glm::vec3{m_Pivot / m_Drawable->GetSize(), 0} * -1.0F);
+
+    m_Drawable->Draw(data);
 }
 
 } // namespace Util

src/Util/Image.cpp

@@ -1,5 +1,6 @@
 #include "Util/Image.hpp"
 
+#include "Util/Logger.hpp"
 #include "pch.hpp"
 
 #include "Core/Texture.hpp"
@@ -9,6 +10,7 @@
 #include "Util/TransformUtils.hpp"
 
 #include "config.hpp"
+#include <glm/fwd.hpp>
 
 std::shared_ptr<SDL_Surface> LoadSurface(const std::string &filepath) {
     auto surface = std::shared_ptr<SDL_Surface>(IMG_Load(filepath.c_str()),
@@ -52,8 +54,7 @@ void Image::SetImage(const std::string &filepath) {
     m_Size = {surface->w, surface->h};
 }
 
-void Image::Draw(const Util::Transform &transform, const float zIndex) {
-    auto data = Util::ConvertToUniformBufferData(transform, m_Size, zIndex);
+void Image::Draw(const Core::Matrices &data) {
     s_UniformBuffer->SetData(0, data);
 
     m_Texture->Bind(UNIFORM_SURFACE_LOCATION);

src/Util/Text.cpp

@@ -44,8 +44,7 @@ Text::Text(const std::string &font, int fontSize, const std::string &text,
     m_Size = {surface->pitch / surface->format->BytesPerPixel, surface->h};
 }
 
-void Text::Draw(const Util::Transform &transform, const float zIndex) {
-    auto data = Util::ConvertToUniformBufferData(transform, m_Size, zIndex);
+void Text::Draw(const Core::Matrices &data) {
     s_UniformBuffer->SetData(0, data);
 
     m_Texture->Bind(UNIFORM_SURFACE_LOCATION);

src/Util/TransformUtils.cpp

@@ -1,6 +1,7 @@
 #include "Util/TransformUtils.hpp"
 
 #include "config.hpp"
+#include <glm/gtx/matrix_transform_2d.hpp>
 
 namespace Util {
 Core::Matrices ConvertToUniformBufferData(const Util::Transform &transform,