From e6b93fe5db1ac47185d3f2e81145d80fc776947e Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Sun, 30 Apr 2023 15:31:22 -0700
Subject: [PATCH] Grid Progress

---
 assets/games/liminal/VNTextbox.xml           | 16 +++++++----
 src/dawn/scene/components/ui/CMakeLists.txt  |  1 +
 src/dawn/scene/components/ui/UIComponent.cpp | 19 +++++++++++--
 src/dawn/scene/components/ui/UIGrid.cpp      | 30 ++++++++++++++++++++
 src/dawn/scene/components/ui/UIGrid.hpp      | 22 ++++++++++++++
 5 files changed, 80 insertions(+), 8 deletions(-)
 create mode 100644 src/dawn/scene/components/ui/UIGrid.cpp
 create mode 100644 src/dawn/scene/components/ui/UIGrid.hpp

diff --git a/assets/games/liminal/VNTextbox.xml b/assets/games/liminal/VNTextbox.xml
index 71b45190..54f244b0 100644
--- a/assets/games/liminal/VNTextbox.xml
+++ b/assets/games/liminal/VNTextbox.xml
@@ -1,12 +1,16 @@
 <prefab name="VNTextbox" type="">
   <asset type="truetype" name="font_main" />
-  <UIBorder ref="border" borderSize="16, 16" alignment="32, 32, 320, 320" />
+
+  <UIGrid columns="2" />
 
   <child>
-    <UILabel text="bruh" font="font_main" fontSize="32"
-      alignment="16, 16, -1, -1"
-      alignX="UI_COMPONENT_ALIGN_STRETCH"
-      alignY="UI_COMPONENT_ALIGN_STRETCH"
-    />
+    <UIBorder ref="border" borderSize="16, 16" alignment="32, 32, 320, 320" ref="border" />
+    <child>
+      <UILabel text="bruh" font="font_main" fontSize="32"
+        alignment="16, 16, -1, -1"
+        alignX="UI_COMPONENT_ALIGN_STRETCH"
+        alignY="UI_COMPONENT_ALIGN_STRETCH"
+      />
+    </child>
   </child>
 </prefab>
\ No newline at end of file
diff --git a/src/dawn/scene/components/ui/CMakeLists.txt b/src/dawn/scene/components/ui/CMakeLists.txt
index 2c0b9329..5cad0746 100644
--- a/src/dawn/scene/components/ui/CMakeLists.txt
+++ b/src/dawn/scene/components/ui/CMakeLists.txt
@@ -11,6 +11,7 @@ target_sources(${DAWN_TARGET_NAME}
     UILabel.cpp
     UIImage.cpp
     UIBorder.cpp
+    UIGrid.cpp
 )
 
 add_subdirectory(menu)
\ No newline at end of file
diff --git a/src/dawn/scene/components/ui/UIComponent.cpp b/src/dawn/scene/components/ui/UIComponent.cpp
index 8ac8a331..119d3147 100644
--- a/src/dawn/scene/components/ui/UIComponent.cpp
+++ b/src/dawn/scene/components/ui/UIComponent.cpp
@@ -4,6 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #include "UIComponent.hpp"
+#include "UIGrid.hpp"
 
 using namespace Dawn;
 
@@ -32,11 +33,22 @@ void UIComponent::updateAlignment() {
   auto dimensional = this->getParentDimensional();
   auto translate = this->transform->getLocalPosition();
 
+  float_t parentWidth, parentHeight, parentX, parentY;
+  auto dimensionalAsGrid = dynamic_cast<UIGrid*>(dimensional);
+  if(dimensionalAsGrid != nullptr) {
+    std::cout << "TEST" << std::endl;
+  } else {
+    parentWidth = dimensional->getWidth();
+    parentHeight = dimensional->getHeight();
+    parentX = 0;
+    parentY = 0;
+  }
+
   UIComponent::calculateDimensions(
     this->alignX,
     &translate.x,
     &this->width,
-    dimensional->getWidth(),
+    parentWidth,
     this->getContentWidth(),
     glm::vec2(align[0], align[2])
   );
@@ -44,10 +56,13 @@ void UIComponent::updateAlignment() {
     this->alignY,
     &translate.y,
     &this->height,
-    dimensional->getHeight(),
+    parentHeight,
     this->getContentHeight(),
     glm::vec2(align[1], align[3])
   );
+  
+  translate.x += parentX;
+  translate.y += parentY;
 
   this->transform->setLocalPosition(translate);
   this->alignmentNeedsUpdating = false;
diff --git a/src/dawn/scene/components/ui/UIGrid.cpp b/src/dawn/scene/components/ui/UIGrid.cpp
new file mode 100644
index 00000000..e814139d
--- /dev/null
+++ b/src/dawn/scene/components/ui/UIGrid.cpp
@@ -0,0 +1,30 @@
+// Copyright (c) 2023 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#include "UIGrid.hpp"
+
+using namespace Dawn;
+
+UIGrid::UIGrid(SceneItem *item) :
+  SceneItemComponent(item)
+{
+  
+}
+
+float_t UIGrid::getWidth() {
+  return 1;
+}
+
+float_t UIGrid::getHeight() {
+  return 1;
+}
+
+float_t UIGrid::getContentWidth() {
+  return 1;
+}
+
+float_t UIGrid::getContentHeight() {
+  return 1;
+}
\ No newline at end of file
diff --git a/src/dawn/scene/components/ui/UIGrid.hpp b/src/dawn/scene/components/ui/UIGrid.hpp
new file mode 100644
index 00000000..0508fce0
--- /dev/null
+++ b/src/dawn/scene/components/ui/UIGrid.hpp
@@ -0,0 +1,22 @@
+// Copyright (c) 2023 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#pragma once
+#include "scene/SceneItemComponent.hpp"
+#include "UICanvas.hpp"
+
+namespace Dawn {
+  class UIGrid :
+    public SceneItemComponent,
+    public UIComponentDimensional
+  {
+    public:
+      UIGrid(SceneItem *item);
+      float_t getWidth() override;
+      float_t getHeight() override;
+      float_t getContentWidth() override;
+      float_t getContentHeight() override;
+  };
+}
\ No newline at end of file