From 28829213c9a310d9dd7719746f2b97bed252fe4a Mon Sep 17 00:00:00 2001
From: maverickdgg <danielcyc38@gmail.com>
Date: Mon, 9 Jan 2023 10:53:56 +0800
Subject: [PATCH] merge

---
 Assets/Scenes/UI_Test.shade.shmeta                 |  4 ++--
 SHADE_Engine/src/Serialization/SHSerialization.cpp |  2 +-
 SHADE_Engine/src/UI/SHUISystem.cpp                 | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Assets/Scenes/UI_Test.shade.shmeta b/Assets/Scenes/UI_Test.shade.shmeta
index ad821810..f32277e0 100644
--- a/Assets/Scenes/UI_Test.shade.shmeta
+++ b/Assets/Scenes/UI_Test.shade.shmeta
@@ -1,3 +1,3 @@
-Name: UI Test
-ID: 88543249
+Name: UI_Test
+ID: 97161771
 Type: 5
diff --git a/SHADE_Engine/src/Serialization/SHSerialization.cpp b/SHADE_Engine/src/Serialization/SHSerialization.cpp
index e92a4d5f..a055d91c 100644
--- a/SHADE_Engine/src/Serialization/SHSerialization.cpp
+++ b/SHADE_Engine/src/Serialization/SHSerialization.cpp
@@ -350,7 +350,7 @@ namespace SHADE
     SHSerializationHelper::InitializeComponentFromNode<SHCanvasComponent>(componentsNode, eid);
     SHSerializationHelper::InitializeComponentFromNode<SHButtonComponent>(componentsNode, eid);
     SHSerializationHelper::InitializeComponentFromNode<SHToggleButtonComponent>(componentsNode, eid);
-    SHSerializationHelper::ConvertNodeToComponent<SHTextRenderableComponent>(componentsNode, eid);
+    //SHSerializationHelper::ConvertNodeToComponent<SHTextRenderableComponent>(componentsNode, eid);
     SHSerializationHelper::InitializeComponentFromNode<SHTextRenderableComponent>(componentsNode, eid);
     SHSerializationHelper::InitializeComponentFromNode<SHLightComponent>(componentsNode, eid);
   }
diff --git a/SHADE_Engine/src/UI/SHUISystem.cpp b/SHADE_Engine/src/UI/SHUISystem.cpp
index 95663bc0..4d175e5f 100644
--- a/SHADE_Engine/src/UI/SHUISystem.cpp
+++ b/SHADE_Engine/src/UI/SHUISystem.cpp
@@ -161,9 +161,9 @@ namespace SHADE
     windowSize = SHEditorWindowManager::GetEditorWindow<SHEditorViewport>()->windowSize;
     mousePos = SHEditorWindowManager::GetEditorWindow<SHEditorViewport>()->viewportMousePos;
     //mousePos.y = windowSize.y - mousePos.y;
-    SHLOG_INFO("mouse pos: {}, {}", mousePos.x, mousePos.y)
-    mousePos /= windowSize;
-    SHLOG_INFO("mouse pos normalized: {}, {}", mousePos.x, mousePos.y)
+    //SHLOG_INFO("mouse pos: {}, {}", mousePos.x, mousePos.y)
+    //mousePos /= windowSize;
+    //SHLOG_INFO("mouse pos normalized: {}, {}", mousePos.x, mousePos.y)
 #endif 
     
     SHVec2 camSize{ cameraSystem->GetCameraWidthHeight(0)};
@@ -172,8 +172,8 @@ namespace SHADE
     topExtent = CanvasToScreenPoint(topExtent);
     btmExtent = CanvasToScreenPoint(btmExtent);
     //SHLOG_INFO("TopExtent: {}, {}      Btm Extent: {}, {}", topExtent.x, topExtent.y, btmExtent.x, btmExtent.y)
-    topExtent /= camSize;
-    btmExtent /= camSize;
+    //topExtent /= camSize;
+    //btmExtent /= camSize;
 
     comp.isClicked = false;
     if (mousePos.x >= topExtent.x && mousePos.x <= btmExtent.x