make sample more sane

Author: NOOBDY

CMakeLists.txt

@@ -44,7 +44,6 @@ set(SRC_FILES
     ${SRC_DIR}/Util/GameObject.cpp
 
     ${SRC_DIR}/App.cpp
-    ${SRC_DIR}/Triangle.cpp
     ${SRC_DIR}/Giraffe.cpp
 )
 set(INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
@@ -75,7 +74,6 @@ set(INCLUDE_FILES
     ${INCLUDE_DIR}Util/GameObject.hpp
 
     ${INCLUDE_DIR}/App.hpp
-    ${INCLUDE_DIR}/Triangle.hpp
     ${INCLUDE_DIR}/Giraffe.hpp
     ${INCLUDE_DIR}/config.hpp
 )

include/App.hpp

@@ -4,7 +4,6 @@
 #include "pch.hpp" // IWYU pragma: export
 
 #include "Giraffe.hpp"
-#include "Triangle.hpp"
 
 class App {
 public:
@@ -23,8 +22,7 @@ class App {
 private:
     State m_CurrentState = State::START;
 
-    Triangle m_Triangle;
-    std::shared_ptr<Giraffe> m_Giraffe= std::make_shared<Giraffe>();
+    std::shared_ptr<Giraffe> m_Giraffe = std::make_shared<Giraffe>();
 };
 
 #endif

include/Triangle.hpp

@@ -1,20 +1,27 @@
 #include "Giraffe.hpp"
+
+#include <cmath>
+
 #include "Util/GameObject.hpp"
 #include "Util/Image.hpp"
+#include "Util/Logger.hpp"
 #include "Util/Text.hpp"
 #include "Util/Time.hpp"
 #include "Util/Transform.hpp"
+
 #include "config.hpp"
 
 void GiraffeText::Update(const Util::Transform &transform) {
     auto &pos = m_Transform.translation;
     auto &scale = m_Transform.scale;
     auto &rotation = m_Transform.rotation;
 
-    pos += transform.translation;
-    rotation += transform.rotation;
+    pos = transform.translation;
+    // rotation = std::fmod(rotation + 50.0F, 360.0F);
     scale = transform.scale;
 
+    LOG_DEBUG("{} {}", scale.x, scale.y);
+
     m_Drawable->Draw(m_Transform, m_ZIndex);
 }
 
@@ -31,10 +38,12 @@ void Giraffe::Update(const Util::Transform &transform) {
     auto &scale = m_Transform.scale;
     auto &rotation = m_Transform.rotation;
 
-    if (pos.y > WINDOW_HEIGHT || pos.y + WINDOW_HEIGHT < 0) {
+    if (pos.y >= static_cast<float>(WINDOW_HEIGHT) / 2 ||
+        pos.y + static_cast<float>(WINDOW_HEIGHT) / 2 <= 0) {
         dir.y *= -1;
     }
-    if (pos.x > WINDOW_WIDTH || pos.x + WINDOW_WIDTH < 0) {
+    if (pos.x >= static_cast<float>(WINDOW_WIDTH) / 2 ||
+        pos.x + static_cast<float>(WINDOW_WIDTH) / 2 <= 0) {
         dir.x *= -1;
     }
 
@@ -44,13 +53,12 @@ void Giraffe::Update(const Util::Transform &transform) {
         glm::vec2(1, 1) * (std::sin(rotation / 2) + 1.0F) * 100.0F};
 
     pos += deltaTransform.translation;
-    rotation += deltaTransform.rotation;
-    scale = deltaTransform.scale;
-
+    rotation = std::fmod(rotation + deltaTransform.rotation, 360.0F);
+    // scale = deltaTransform.scale;
 
     m_Drawable->Draw(m_Transform, m_ZIndex);
     for (auto &child : m_Children) {
-        child->Update(deltaTransform);
+        child->Update(m_Transform);
     }
 
     // LOG_DEBUG("GIRA: x: {}, y: {}", pos.x, pos.y);