Assets/Editor/Editor.SHConfig

@@ -1,4 +1,4 @@
 Start Maximized: true
-Working Scene ID: 86098106
+Working Scene ID: 97158628
 Window Size: {x: 1920, y: 1013}
 Style: 0

Assets/Scenes/MainMenu.shade

@@ -6,6 +6,7 @@
     Canvas Component:
       Canvas Width: 1920
       Canvas Height: 1080
+      Scale by canvas width: false
       IsActive: true
   Scripts: ~
 - EID: 1
@@ -24,6 +25,8 @@
       IsActive: true
     UI Component:
       Canvas ID: 0
+      Hovered: false
+      Clicked: false
       IsActive: true
   Scripts: ~
 - EID: 5
@@ -47,6 +50,8 @@
       IsActive: true
     UI Component:
       Canvas ID: 0
+      Hovered: false
+      Clicked: false
       IsActive: true
   Scripts:
     - Type: ChangeSceneButton
@@ -73,6 +78,8 @@
       IsActive: true
     UI Component:
       Canvas ID: 0
+      Hovered: false
+      Clicked: false
       IsActive: true
   Scripts:
     - Type: QuitButton
@@ -106,11 +113,12 @@
       Pitch: 0
       Yaw: 0
       Roll: 0
-      Width: 1920
+      Width: 1319
-      Height: 1080
+      Height: 622
       Near: 0.00999999978
       Far: 10000
       Perspective: true
+      FOV: 90
       IsActive: true
   Scripts: ~
 - EID: 4

SHADE_Engine/src/Events/SHEventDefines.h

@@ -26,4 +26,7 @@ constexpr SHEventIdentifier SH_GRAPHICS_LIGHT_ENABLE_SHADOW_EVENT { 17 };
 constexpr SHEventIdentifier SH_BUTTON_CLICK_EVENT                 { 18 };
 constexpr SHEventIdentifier SH_PHYSICS_COLLIDER_DRAW_EVENT        { 19 };
 constexpr SHEventIdentifier SH_WINDOW_RESIZE_EVENT                { 20 };
+constexpr SHEventIdentifier SH_BUTTON_RELEASE_EVENT               { 21 };
+constexpr SHEventIdentifier SH_BUTTON_HOVER_ENTER_EVENT           { 22 };
+constexpr SHEventIdentifier SH_BUTTON_HOVER_EXIT_EVENT            { 23 };
 

SHADE_Engine/src/UI/SHButtonComponent.cpp

@@ -6,8 +6,7 @@
 namespace SHADE
 {
   SHButtonComponent::SHButtonComponent()
-    :size(1.0f),  isHovered(false), isClicked(false),
+    : defaultTexture(0), hoveredTexture(0), clickedTexture(0), currentTexture(0)
-    defaultTexture(0), hoveredTexture(0), clickedTexture(0), currentTexture(0)
   {
   }
 
@@ -41,6 +40,9 @@ namespace SHADE
     clickedTexture = texture;
   }
 
+
+
+
 }
 
 

SHADE_Engine/src/UI/SHButtonComponent.h

@@ -17,8 +17,6 @@ namespace SHADE
     SHButtonComponent();
     virtual ~SHButtonComponent() = default;
 
-    SHVec2 size;
-
     AssetID GetClickedTexture() const noexcept;
     AssetID GetDefaultTexture() const noexcept;
     AssetID GetHoveredTexture() const noexcept;
@@ -32,11 +30,7 @@ namespace SHADE
 
     friend class SHUISystem;
   private:
-    //Set to true when mouse is hovering over the button.
+
-    bool isHovered;
-    //This is set to true when the mouse clicks down, and set back to false when mouse releases.
-    //The event for the button click will be broadcasted when mouse release.
-    bool isClicked;
     AssetID defaultTexture;
     AssetID hoveredTexture;
     AssetID clickedTexture;

SHADE_Engine/src/UI/SHCanvasComponent.cpp

@@ -6,7 +6,7 @@ namespace SHADE
 {
 
   SHCanvasComponent::SHCanvasComponent()
-    :width(1),height(1), dirtyMatrix(false), canvasMatrix()
+    :width(1), height(1), dirtyMatrix(false), canvasMatrix(), scaleByCanvasWidth(false)
   {
 
   }
@@ -27,6 +27,8 @@ namespace SHADE
     height = val;
   }
 
+  
+
 
   SHCanvasComponent::CanvasSizeType SHCanvasComponent::GetCanvasWidth() const noexcept
   {
@@ -43,6 +45,8 @@ namespace SHADE
     return canvasMatrix;
   }
 
+
+
 }
 
 
@@ -54,6 +58,7 @@ RTTR_REGISTRATION
   registration::class_<SHCanvasComponent>("Canvas Component")
     .property("Canvas Width", &SHCanvasComponent::GetCanvasWidth, &SHCanvasComponent::SetCanvasWidth)
     .property("Canvas Height", &SHCanvasComponent::GetCanvasHeight, &SHCanvasComponent::SetCanvasHeight)
+    .property("Scale by canvas width", &SHCanvasComponent::scaleByCanvasWidth)
     ;
 
 

SHADE_Engine/src/UI/SHCanvasComponent.h

@@ -21,21 +21,24 @@ namespace SHADE
 
     SHCanvasComponent();
     ~SHCanvasComponent() = default;
+    bool scaleByCanvasWidth;
 
     void SetCanvasSize(CanvasSizeType width, CanvasSizeType height) noexcept;
     void SetCanvasWidth(CanvasSizeType width) noexcept;
     void SetCanvasHeight(CanvasSizeType height) noexcept;
 
+
     CanvasSizeType GetCanvasWidth() const noexcept;
     CanvasSizeType GetCanvasHeight() const noexcept;
     SHMatrix const& GetMatrix() const noexcept;
 
+
   private:
     CanvasSizeType width;
     CanvasSizeType height;
     bool dirtyMatrix;
     SHMatrix canvasMatrix;
-   
+
 
     RTTR_ENABLE()
   };

SHADE_Engine/src/UI/SHToggleButtonComponent.cpp

@@ -5,8 +5,7 @@
 namespace SHADE
 {
   SHToggleButtonComponent::SHToggleButtonComponent()
-    :size(1.0f), isHovered(false), isClicked(false), value(false),
+    :value(false), defaultTexture(0), toggledTexture(0), currentTexture(0)
-    defaultTexture(0), toggledTexture(0), currentTexture(0)
   {
   }
 

SHADE_Engine/src/UI/SHToggleButtonComponent.h

@@ -17,8 +17,6 @@ namespace SHADE
     SHToggleButtonComponent();
     virtual ~SHToggleButtonComponent() = default;
 
-    SHVec2 size;
-
     AssetID GetToggledTexture() const noexcept;
     AssetID GetDefaultTexture() const noexcept;
     bool GetValue() const noexcept;
@@ -33,11 +31,7 @@ namespace SHADE
     friend class SHUISystem;
   private:
 
-    //Set to true when mouse is hovering over the button.
+
-    bool isHovered;
-    //This is set to true when the mouse clicks down, and set back to false when mouse releases.
-    //The event for the button click will be broadcasted when mouse release.
-    bool isClicked;
     bool value;
     AssetID defaultTexture;
     AssetID toggledTexture;

SHADE_Engine/src/UI/SHUIComponent.cpp

@@ -7,6 +7,7 @@ namespace SHADE
 {
 
   SHUIComponent::SHUIComponent()
+    :size(1.0f), isHovered(false), isClicked(false)
   {
 
   }
@@ -27,6 +28,20 @@ namespace SHADE
     (void)id;
   }
 
+  bool SHUIComponent::GetIsHovered() const noexcept
+  {
+    return isHovered;
+  }
+
+  bool SHUIComponent::GetIsClicked() const noexcept
+  {
+    return isClicked;
+  }
+
+  void SHUIComponent::SetEmptyHoveredClick(bool value) noexcept
+  {
+    (void)value;
+  }
 }
 
 
@@ -37,6 +52,8 @@ RTTR_REGISTRATION
 
   registration::class_<SHUIComponent>("UI Component")
     .property("Canvas ID", &SHUIComponent::GetCanvasID, &SHUIComponent::SetCanvasID)
+    .property("Hovered", &SHUIComponent::GetIsHovered, &SHUIComponent::SetEmptyHoveredClick)
+    .property("Clicked", &SHUIComponent::GetIsClicked, &SHUIComponent::SetEmptyHoveredClick)
     ;
 
 

SHADE_Engine/src/UI/SHUIComponent.h

@@ -5,6 +5,7 @@
 #include "SH_API.h"
 #include "ECS_Base/Components/SHComponent.h"
 #include "Math/SHMatrix.h"
+#include "Math/Vector/SHVec2.h"
 
 
 namespace SHADE
@@ -17,14 +18,29 @@ namespace SHADE
     SHUIComponent();
     ~SHUIComponent() = default;
 
+
+    SHVec2 size;
+
+
     SHMatrix const& GetMatrix() const noexcept;
     EntityID GetCanvasID() const noexcept;
     void SetCanvasID(EntityID id) noexcept;
 
+    bool GetIsHovered() const noexcept;
+    bool GetIsClicked() const noexcept;
+
+    void SetEmptyHoveredClick(bool value)noexcept;
+
+
   private:
     SHMatrix localToCanvasMatrix;
     EntityID canvasID;
 
+    //Set to true when mouse is hovering over the button. Only set if there is a Button/Slider/ToggleButton comp.
+    bool isHovered;
+    //This is set to true when the mouse clicks down, and set back to false when mouse releases. Only set if there is a Button/Slider/ToggleButton comp.
+    bool isClicked;
+
 
     RTTR_ENABLE()
   };

SHADE_Engine/src/UI/SHUISystem.cpp

@@ -131,8 +131,17 @@ namespace SHADE
     auto cameraSystem = SHSystemManager::GetSystem<SHCameraSystem>();
     SHVec2 camSize = cameraSystem->GetCameraWidthHeight(0);
     comp.canvasMatrix = SHMatrix::Identity;
-    comp.canvasMatrix(0, 0) = camSize.x * 0.5f / (comp.GetCanvasWidth() * 0.5f);
+    float scale = camSize.y / comp.GetCanvasHeight();
-    comp.canvasMatrix(1, 1) = camSize.y * 0.5f / (comp.GetCanvasHeight() * 0.5f);
+    if (comp.scaleByCanvasWidth)
+    {
+      scale = camSize.x / comp.GetCanvasWidth();
+    }
+    
+    comp.canvasMatrix(0, 0) = scale;
+    comp.canvasMatrix(1, 1) = scale;
+
+    //comp.canvasMatrix(0, 0) = camSize.x * 0.5f / (comp.GetCanvasWidth() * 0.5f);
+    //comp.canvasMatrix(1, 1) = camSize.y * 0.5f / (comp.GetCanvasHeight() * 0.5f);
   }
 
   void SHUISystem::UpdateCanvasMatrixRoutine::Execute(double dt) noexcept
@@ -146,25 +155,15 @@ namespace SHADE
     }
   }
 
-
+  bool SHUISystem::CheckButtonHoveredOrClicked(SHUIComponent& comp) noexcept
-  void SHUISystem::UpdateButtonComponent(SHButtonComponent& comp) noexcept
   {
-    if (!SHComponentManager::HasComponent<SHUIComponent>(comp.GetEID()))
+    SHVec4 topExtent4 = SHMatrix::Translate(-comp.size.x * 0.5f, comp.size.y * 0.5f, 0.0f) * comp.GetMatrix() * SHVec4(0.0f, 0.0f, 0.0f, 1.0f);
-    {
+    SHVec4 btmExtent4 = SHMatrix::Translate(comp.size.x * 0.5f, -comp.size.y * 0.5f, 0.0f) * comp.GetMatrix() * SHVec4(0.0f, 0.0f, 0.0f, 1.0f);
-      return;
-    }
-    auto cameraSystem = SHSystemManager::GetSystem<SHCameraSystem>();
-    auto uiComp = SHComponentManager::GetComponent<SHUIComponent>(comp.GetEID());
-    //auto canvasComp = SHComponentManager::GetComponent_s<SHCanvasComponent>(uiComp->canvasID);
 
-    SHVec4 topExtent4 =  SHMatrix::Translate(-comp.size.x * 0.5f, comp.size.y * 0.5f, 0.0f)  * uiComp->GetMatrix()  * SHVec4(0.0f, 0.0f, 0.0f, 1.0f);
-    SHVec4 btmExtent4 =  SHMatrix::Translate(comp.size.x * 0.5f, -comp.size.y * 0.5f, 0.0f)  * uiComp->GetMatrix()  * SHVec4(0.0f,0.0f, 0.0f,1.0f);
-    
 
     SHVec2 topExtent{ topExtent4.x,topExtent4.y };
     SHVec2 btmExtent{ btmExtent4.x,btmExtent4.y };
-    
+    auto cameraSystem = SHSystemManager::GetSystem<SHCameraSystem>();
-    
     SHVec2 mousePos;
     SHVec2 windowSize;
 #ifdef SHEDITOR
@@ -175,7 +174,7 @@ namespace SHADE
     mousePos /= windowSize;
     //SHLOG_INFO("mouse pos normalized: {}, {}", mousePos.x, mousePos.y)
 
-    
+
 
 #else
 
@@ -187,12 +186,12 @@ namespace SHADE
     windowSize = { static_cast<float>(ws.first), static_cast<float>(ws.second) };
     mousePos /= windowSize;
 #endif 
-    
+
-    SHVec2 camSize{ cameraSystem->GetCameraWidthHeight(0)};
+    SHVec2 camSize{ cameraSystem->GetCameraWidthHeight(0) };
     //SHLOG_INFO("TopExtent: {}, {}", topExtent.x, topExtent.y)
 
-    topExtent = CanvasToScreenPoint(topExtent,true);
+    topExtent = CanvasToScreenPoint(topExtent, true);
-    btmExtent = CanvasToScreenPoint(btmExtent,true);
+    btmExtent = CanvasToScreenPoint(btmExtent, true);
     //SHLOG_INFO("TopExtent: {}, {}      Btm Extent: {}, {}", topExtent.x, topExtent.y, btmExtent.x, btmExtent.y)
 
 
@@ -200,26 +199,48 @@ namespace SHADE
     if (mousePos.x >= topExtent.x && mousePos.x <= btmExtent.x
       && mousePos.y >= topExtent.y && mousePos.y <= btmExtent.y)
     {
+      if (comp.isHovered == false)
+      {
+        SHButtonClickEvent clickEvent;
+        clickEvent.EID = comp.GetEID();
+        SHEventManager::BroadcastEvent(clickEvent, SH_BUTTON_HOVER_ENTER_EVENT);
+      }
       comp.isHovered = true;
-      #ifdef SHEDITOR
+
-        //if (SHSystemManager::GetSystem<SHEditor>()->editorState == SHEditor::State::PLAY)
+
-        {
+
-          if (SHInputManager::GetKeyDown(SHInputManager::SH_KEYCODE::LMB))
+#ifdef SHEDITOR
-          {
+      //if (SHSystemManager::GetSystem<SHEditor>()->editorState == SHEditor::State::PLAY)
-            comp.isClicked = true;
+      {
-          }
-        }
-      #else
         if (SHInputManager::GetKeyDown(SHInputManager::SH_KEYCODE::LMB))
         {
           comp.isClicked = true;
+          SHButtonClickEvent clickEvent;
+          clickEvent.EID = comp.GetEID();
+          SHEventManager::BroadcastEvent(clickEvent, SH_BUTTON_CLICK_EVENT);
         }
-      #endif
+      }
+#else
+      if (SHInputManager::GetKeyDown(SHInputManager::SH_KEYCODE::LMB))
+      {
+        comp.isClicked = true;
+        SHButtonClickEvent clickEvent;
+        clickEvent.EID = comp.GetEID();
+        SHEventManager::BroadcastEvent(clickEvent, SH_BUTTON_CLICK_EVENT);
+      }
+#endif
 
       //SHLOG_INFO("HOVERED")
     }
     else
     {
+      if (comp.isHovered == true)
+      {
+        SHButtonClickEvent clickEvent;
+        clickEvent.EID = comp.GetEID();
+        SHEventManager::BroadcastEvent(clickEvent, SH_BUTTON_HOVER_EXIT_EVENT);
+      }
+
       comp.isHovered = false;
       //SHLOG_INFO("NOT HOVERED")
     }
@@ -228,8 +249,30 @@ namespace SHADE
       comp.isClicked = false;
       SHButtonClickEvent clickEvent;
       clickEvent.EID = comp.GetEID();
-      SHEventManager::BroadcastEvent(clickEvent, SH_BUTTON_CLICK_EVENT);
+      SHEventManager::BroadcastEvent(clickEvent, SH_BUTTON_RELEASE_EVENT);
+
+      return true;
     }
+
+
+    return false;
+
+  }
+
+
+  void SHUISystem::UpdateButtonComponent(SHButtonComponent& comp) noexcept
+  {
+    if (!SHComponentManager::HasComponent<SHUIComponent>(comp.GetEID()))
+    {
+      return;
+    }
+    auto cameraSystem = SHSystemManager::GetSystem<SHCameraSystem>();
+    auto uiComp = SHComponentManager::GetComponent<SHUIComponent>(comp.GetEID());
+    //auto canvasComp = SHComponentManager::GetComponent_s<SHCanvasComponent>(uiComp->canvasID);
+
+
+    
+    CheckButtonHoveredOrClicked(*uiComp);
     
     if (SHComponentManager::HasComponent<SHRenderable>(comp.GetEID()))
     {
@@ -238,7 +281,7 @@ namespace SHADE
 
       
       AssetID textureID = 0;
-      if (!comp.isHovered && !comp.isClicked)
+      if (!uiComp->isHovered && !uiComp->isClicked)
       {
         if (comp.GetDefaultTexture() != 0 && SHAssetManager::GetType(comp.GetDefaultTexture()) == AssetType::TEXTURE)
         {
@@ -247,7 +290,7 @@ namespace SHADE
           //SHLOG_INFO("SETTING DEFAULT TEXTURE")
         }
       }
-      else if (comp.isClicked)
+      else if (uiComp->isClicked)
       {
         if (comp.GetClickedTexture() != 0 && SHAssetManager::GetType(comp.GetClickedTexture()) == AssetType::TEXTURE)
         {
@@ -288,80 +331,10 @@ namespace SHADE
     auto uiComp = SHComponentManager::GetComponent<SHUIComponent>(comp.GetEID());
     //auto canvasComp = SHComponentManager::GetComponent_s<SHCanvasComponent>(uiComp->canvasID);
 
-    SHVec4 topExtent4 = SHMatrix::Translate(-comp.size.x * 0.5f, comp.size.y * 0.5f, 0.0f) * uiComp->GetMatrix() * SHVec4(0.0f, 0.0f, 0.0f, 1.0f);
+   
-    SHVec4 btmExtent4 = SHMatrix::Translate(comp.size.x * 0.5f, -comp.size.y * 0.5f, 0.0f) * uiComp->GetMatrix() * SHVec4(0.0f, 0.0f, 0.0f, 1.0f);
 
-
+    if (CheckButtonHoveredOrClicked(*uiComp))
-    SHVec2 topExtent{ topExtent4.x,topExtent4.y };
-    SHVec2 btmExtent{ btmExtent4.x,btmExtent4.y };
-
-
-    SHVec2 mousePos;
-    SHVec2 windowSize;
-#ifdef SHEDITOR
-    windowSize = SHEditorWindowManager::GetEditorWindow<SHEditorViewport>()->beginContentRegionAvailable;
-    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)
-
-
-
-#else
-
-    int x, y;
-    SHInputManager::GetMouseScreenPosition(&x, &y);
-    mousePos.x = x;
-    mousePos.y = y;
-    auto ws = SHSystemManager::GetSystem<SHGraphicsSystem>()->GetWindow()->GetWindowSize();
-    windowSize = { static_cast<float>(ws.first), static_cast<float>(ws.second) };
-    mousePos /= windowSize;
-#endif 
-
-    SHVec2 camSize{ cameraSystem->GetCameraWidthHeight(0) };
-    //SHLOG_INFO("TopExtent: {}, {}", topExtent.x, topExtent.y)
-
-    topExtent = CanvasToScreenPoint(topExtent, true);
-    btmExtent = CanvasToScreenPoint(btmExtent, true);
-    //SHLOG_INFO("TopExtent: {}, {}      Btm Extent: {}, {}", topExtent.x, topExtent.y, btmExtent.x, btmExtent.y)
-
-
-    //comp.isClicked = false;
-    if (mousePos.x >= topExtent.x && mousePos.x <= btmExtent.x
-      && mousePos.y >= topExtent.y && mousePos.y <= btmExtent.y)
-    {
-      comp.isHovered = true;
-#ifdef SHEDITOR
-      //if (SHSystemManager::GetSystem<SHEditor>()->editorState == SHEditor::State::PLAY)
-      {
-        if (SHInputManager::GetKeyDown(SHInputManager::SH_KEYCODE::LMB))
-        {
-          comp.isClicked = true;
-        }
-      }
-#else
-      if (SHInputManager::GetKeyDown(SHInputManager::SH_KEYCODE::LMB))
-      {
-        comp.isClicked = true;
-        }
-#endif
-
-      //SHLOG_INFO("HOVERED")
-      }
-    else
-    {
-      comp.isHovered = false;
-      //SHLOG_INFO("NOT HOVERED")
-    }
-    if (comp.isClicked && SHInputManager::GetKeyUp(SHInputManager::SH_KEYCODE::LMB))
-    {
-      comp.isClicked = false;
       comp.value = !comp.value;
-      SHButtonClickEvent clickEvent;
-      clickEvent.EID = comp.GetEID();
-      SHEventManager::BroadcastEvent(clickEvent, SH_BUTTON_CLICK_EVENT);
-    }
 
     if (SHComponentManager::HasComponent<SHRenderable>(comp.GetEID()))
     {

SHADE_Engine/src/UI/SHUISystem.h

@@ -72,6 +72,11 @@ namespace SHADE
     void UpdateButtonComponent(SHButtonComponent& comp) noexcept;
     void UpdateToggleButtonComponent(SHToggleButtonComponent& comp) noexcept;
     void UpdateCanvasComponent(SHCanvasComponent& comp) noexcept;
+
+    //returns true on button release.
+    bool CheckButtonHoveredOrClicked(SHUIComponent& comp) noexcept;
+
+
     
     SHVec2 CanvasToScreenPoint(SHVec2& const canvasPoint, bool normalized) noexcept;