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/MainGame.shade

@@ -9567,10 +9567,17 @@
       maxMultiplierDuration: 5
       maxMultiplierCombo: 10
       multiplierFont: 60
+    - Type: PauseMenu
+      Enabled: true
+      resumeBtn: 8
+      retryBtn: 461
+      quitBtn: 0
+      gamePauseText: 11
+      canvas: 10
 - EID: 199
   Name: =====Text====
   IsActive: true
-  NumberOfChildren: 3
+  NumberOfChildren: 4
   Components: ~
   Scripts: ~
 - EID: 237
@@ -9618,6 +9625,21 @@
       Font: 176667660
       IsActive: true
   Scripts: ~
+- EID: 11
+  Name: GamePause
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -250, y: 300, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 100, y: 100, z: 100}
+      IsActive: true
+    Text Renderer Component:
+      Text: Game Pause
+      Font: 176667660
+      IsActive: false
+  Scripts: ~
 - EID: 198
   Name: ====Raccoon====
   IsActive: true
@@ -9676,18 +9698,21 @@
       maxJumpHeight: 2
       maxJumpTime: 0.75
       fallMultipler: 3
-      lightMultiper: 0.75
+      jumpPadMultiplayer: 1.20000005
-      mediumMultiper: 0.5
+      lightMultiper: 0.899999976
-      heavyMultiper: 0.25
+      mediumMultiper: 0.699999988
+      heavyMultiper: 0.5
     - Type: PickAndThrow
       Enabled: true
       throwForce: [10, 8, 10]
-      cameraArmOffSet: [0, 0.25, 0]
+      cameraArmOffSet: [0.25, 0.600000024, 0.200000003]
       delayTimer: 1
       aimingLength: 1
       throwItem: false
       rayDistance: 0.75
       rayHeight: 0.100000001
+      aimingFOV: 50
+      defaultFOV: 45
 - EID: 3
   Name: HoldingPoint
   IsActive: true
@@ -9714,30 +9739,31 @@
       Pitch: 0
       Yaw: 360
       Roll: 1.28065994e-06
-      Width: 1920
+      Width: 2560
+      Height: 1369
       Near: 0.00999999978
       Far: 10000
       Perspective: true
-      FOV: 90
+      FOV: 45
       IsActive: true
     Camera Arm Component:
       Arm Pitch: 0
       Arm Yaw: 0
       Arm Length: 3
       Look At Camera Origin: true
-      Target Offset: {x: 0, y: 0, z: 0}
+      Target Offset: {x: 0, y: 0.75, z: 0}
       Camera Collision: true
       IsActive: true
   Scripts:
     - Type: SHADE_Scripting.ThirdPersonCamera
       Enabled: true
       armLength: 3
-      turnSpeedPitch: 0.300000012
+      turnSpeedPitch: 0.200000003
-      turnSpeedYaw: 0.5
+      turnSpeedYaw: 0.400000006
-      pitchClamp: 45
       inverseXControls: false
-      inverseYControls: true
+      inverseYControls: false
-      lowerClamp: 5
+      pitchUpperClamp: 45
+      pitchLowerClamp: 5
 - EID: 9
   Name: PlayerBag
   IsActive: true
@@ -10489,11 +10515,11 @@
       Translate: {x: 2.70000005, y: 0.100000001, z: -2}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
+      IsActive: false
     Renderable Component:
       Mesh: 140697366
       Material: 129495479
-      IsActive: true
+      IsActive: false
     RigidBody Component:
       Type: Dynamic
       Drag: 0.00999999978
@@ -10507,7 +10533,7 @@
       Freeze Rotation X: true
       Freeze Rotation Y: false
       Freeze Rotation Z: true
-      IsActive: true
+      IsActive: false
     Collider Component:
       Colliders:
         - Is Trigger: false
@@ -10519,7 +10545,7 @@
           Density: 1
           Position Offset: {x: 0, y: 0.899999976, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
+      IsActive: false
   Scripts:
     - Type: Homeowner1
       Enabled: true
@@ -10531,4 +10557,155 @@
       eyeOffset: [0, 1.64999998, 0]
       distanceToCapture: 0.5
       captureTime: 0.5
-      footstepSFXIntervalMultiplier: 0.5
+      footstepSFXIntervalMultiplier: 0.5
+- EID: 12
+  Name: Mesh_Meat
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 2.30459714, y: 0.209537908, z: 6.371418}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 136892700
+      Material: 131956078
+      IsActive: true
+    RigidBody Component:
+      Type: Dynamic
+      Drag: 0.00999999978
+      Angular Drag: 0.100000001
+      Use Gravity: true
+      Interpolate: false
+      Sleeping Enabled: true
+      Freeze Position X: false
+      Freeze Position Y: false
+      Freeze Position Z: false
+      Freeze Rotation X: false
+      Freeze Rotation Y: false
+      Freeze Rotation Z: false
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 2
+          Type: Box
+          Half Extents: {x: 0.300000012, y: 0.300000012, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts:
+    - Type: Item
+      Enabled: true
+      Score: 50
+      currCategory: 1
+      density: 1
+      dontReturn: false
+- EID: 16
+  Name: JumpPad
+  IsActive: false
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 3.43332767, y: 0.149463654, z: 6.84711409}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: false
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 1
+          Type: Box
+          Half Extents: {x: 1, y: 0.25, z: 1}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: false
+  Scripts:
+    - Type: JumpPad
+      Enabled: true
+- EID: 10
+  Name: Canvas
+  IsActive: false
+  NumberOfChildren: 3
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      IsActive: false
+  Scripts: ~
+- EID: 8
+  Name: ResumeButton
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 100, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 300, y: 200, z: 500}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 129340704
+      IsActive: true
+    Button Component:
+      Default Texture: 52901020
+      Hovered Texture: 62235279
+      Clicked Texture: 64722619
+      IsActive: true
+    UI Component:
+      Canvas ID: 10
+      IsActive: true
+  Scripts: ~
+- EID: 0
+  Name: QuitButton
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: -300, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 300, y: 200, z: 500}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 129340704
+      IsActive: true
+    Button Component:
+      Default Texture: 66477839
+      Hovered Texture: 65045286
+      Clicked Texture: 58607560
+      IsActive: true
+    UI Component:
+      Canvas ID: 10
+      IsActive: true
+  Scripts: ~
+- EID: 461
+  Name: RetryButton
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: -100, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 300, y: 200, z: 500}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 129340704
+      IsActive: true
+    Button Component:
+      Default Texture: 55782622
+      Hovered Texture: 58972174
+      Clicked Texture: 55224464
+      IsActive: true
+    UI Component:
+      Canvas ID: 10
+      IsActive: true
+  Scripts: ~

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

Assets/Scripts/Audio/AudioHandler.cs

@@ -19,5 +19,13 @@ namespace SHADE_Scripting.Audio
         h.Value.Stop(fadeOut);
       }
     }
+
+    public static void pauseAllSounds(bool pause)
+    {
+      foreach (KeyValuePair<string, AudioClipHandler> h in audioClipHandlers)
+      {
+        h.Value.SetPause(pause);
+      }
+    }
   }
 }

Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs

@@ -8,7 +8,7 @@ using static Item;
 
 public class PickAndThrow : Script
 {
-  public Vector3 throwForce = new Vector3(100.0f, 200.0f, 100.0f);
+  public Vector3 throwForce = new Vector3(10.0f, 8.0f, 10.0f);
   public Vector3 cameraArmOffSet = new Vector3(0.0f, 0.25f, 0.0f);
   public GameObject item { get; set; }
   public float delayTimer = 1.0f;
@@ -33,6 +33,9 @@ public class PickAndThrow : Script
   [Tooltip("Height of ray")]
   public float rayHeight = 0.1f;
 
+  public float aimingFOV = 50;
+  public float defaultFOV = 45;
+
   protected override void awake()
   {
     pc = GetScript<PlayerController>();
@@ -74,6 +77,7 @@ public class PickAndThrow : Script
           pc.isAiming = true;
           pc.camArm.ArmLength = aimingLength;
           pc.camArm.TargetOffset = cameraArmOffSet;
+          pc.cam.FOV = aimingFOV;
         }
 
         if (Input.GetMouseButtonUp(Input.MouseCode.LeftButton) && pc.isAiming)
@@ -83,6 +87,7 @@ public class PickAndThrow : Script
           itemCollider.GetCollisionShape(0).IsTrigger = false;
           pc.isAiming = false;
           pc.camArm.TargetOffset = Vector3.Zero;
+          pc.cam.FOV = defaultFOV;
           if (tpc)
             pc.camArm.ArmLength = tpc.armLength;
           pc.holdItem = false;
@@ -103,6 +108,7 @@ public class PickAndThrow : Script
         if (Input.GetMouseButtonDown(Input.MouseCode.RightButton) && pc.isAiming)
         {
           pc.isAiming = false;
+          pc.cam.FOV = defaultFOV;
           pc.camArm.TargetOffset = Vector3.Zero;
           if (tpc)
             pc.camArm.ArmLength = tpc.armLength;
@@ -132,7 +138,7 @@ public class PickAndThrow : Script
     {
       if (itemScript)
       {
-        Vector3 vec = new Vector3(throwForce.x * lastXDir, throwForce.y, throwForce.z * lastZDir);
+        Vector3 vec = new Vector3(throwForce.x * lastXDir, throwForce.y + (throwForce.y * GetPitchRatioRange()), throwForce.z * lastZDir);
         if (itemScript.currCategory == ItemCategory.LIGHT)
           itemRidigBody.AddForce(vec * 0.2f);
         if (itemScript.currCategory == ItemCategory.MEDIUM)
@@ -254,5 +260,10 @@ public class PickAndThrow : Script
     return false;
   }
 
+  private float GetPitchRatioRange()
+  {
+    return (pc.camArm.Pitch - tpc.pitchUpperClamp) / (tpc.pitchLowerClamp - tpc.pitchUpperClamp);
+  }
+
 
 }

Assets/Scripts/Gameplay/Player/SC_PlayerController.cs

@@ -65,7 +65,7 @@ public class PlayerController : Script
   //Jumping vars==================================================================
   [Tooltip("max height of the jump")]
   public float maxJumpHeight = 1.0f;
-  [Tooltip("max amt of time it will take for the jump")]
+  [Tooltip("max amount of time it will take for the jump")]
   public float maxJumpTime = 0.5f;
   [Tooltip("increase gravity when falling")]
   public float fallMultipler = 3.0f;
@@ -73,6 +73,9 @@ public class PlayerController : Script
   private bool isGrounded = true;
   private float gravity = -9.8f;
   private float groundGravity = -0.5f;
+  public bool landedOnJumpPad { get; set; }
+  [Tooltip("multiply height on Jump Pad ")]
+  public float jumpPadMultiplayer = 2.0f;
 
   //ItemMultipler==================================================================
   [Tooltip("How light item will affect player jump")]
@@ -88,6 +91,7 @@ public class PlayerController : Script
     isMoveKeyPress = false;
     holdItem = false;
     isAiming = false;
+    landedOnJumpPad = false;
 
     //Jump setup
     float timeToApex = maxJumpTime / 2;
@@ -287,7 +291,7 @@ public class PlayerController : Script
   {
     if (currentState == RaccoonStates.WALKING || currentState == RaccoonStates.RUNNING || currentState == RaccoonStates.IDLE)
     {
-      if (Input.GetKeyDown(Input.KeyCode.Space) && isGrounded && rb != null)
+      if ( (Input.GetKeyDown(Input.KeyCode.Space) || landedOnJumpPad ) && isGrounded && rb != null)
       {
         currentState = RaccoonStates.JUMP;
         Vector3 v = rb.LinearVelocity;
@@ -302,6 +306,12 @@ public class PlayerController : Script
           if (item != null && item.currCategory == ItemCategory.HEAVY)
             v.y *= heavyMultiper;
         }
+
+        if (landedOnJumpPad)
+        { 
+          v.y *= jumpPadMultiplayer;
+          landedOnJumpPad = false;
+        }
         rb.LinearVelocity = v;
       }
     }

Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs

@@ -14,10 +14,10 @@ namespace SHADE_Scripting
     public float armLength = 2.0f;
     public float turnSpeedPitch = 0.3f;
     public float turnSpeedYaw = 0.5f;
-    public float pitchClamp = 45.0f;
     public bool inverseXControls = false;
     public bool inverseYControls = false;
-    public float lowerClamp = 5.0f;
+    public float pitchUpperClamp = 45.0f;
+    public float pitchLowerClamp = 5.0f;
 
     protected override void awake()
     {
@@ -51,17 +51,17 @@ namespace SHADE_Scripting
           arm.Pitch += vel.y * turnSpeedPitch * Time.DeltaTimeF;
 
         if (inverseXControls)
-          arm.Yaw -= vel.x * turnSpeedYaw * Time.DeltaTimeF;
-        else
           arm.Yaw += vel.x * turnSpeedYaw * Time.DeltaTimeF;
+        else
+          arm.Yaw -= vel.x * turnSpeedYaw * Time.DeltaTimeF;
 
-        if (arm.Pitch > pitchClamp)
+        if (arm.Pitch > pitchUpperClamp)
         {
-          arm.Pitch = pitchClamp;
+          arm.Pitch = pitchUpperClamp;
         }
-        else if (arm.Pitch < lowerClamp)
+        else if (arm.Pitch < pitchLowerClamp)
         {
-          arm.Pitch = lowerClamp;
+          arm.Pitch = pitchLowerClamp;
         }
       }
     }

Assets/Scripts/Gameplay/SC_GameManager.cs

@@ -38,6 +38,9 @@ public class GameManager : Script
   private Vector3 fontScalar;
 
   public static GameManager Instance { get; private set; }
+  //public static int highScore { get; private set; } maybe need
+
+  public bool GamePause { get; set; }
 
   protected override void start()
   {
@@ -83,7 +86,11 @@ public class GameManager : Script
 
   protected override void update()
   {
-    Cheats();
+    if (GamePause)
+    {
+      return;
+    }
+
     if (currGameState == GameState.START)
     {
       timer -= Time.DeltaTimeF;
@@ -140,15 +147,6 @@ public class GameManager : Script
       Instance = null;
   }
 
-  private void Cheats()
-  {
-    if (Input.GetKeyDown(Input.KeyCode.Escape))
-    {
-      Audio.StopAllSounds();
-      SceneManager.ChangeScene(97158628);
-    }
-  }
-
   public void ItemScored()
   {
     totalItemCount -= 1;

Assets/Scripts/SC_JumpPad.cs

@@ -0,0 +1,22 @@
+using SHADE;
+using System;
+
+public class JumpPad : Script
+{
+  protected override void awake()
+  {
+  }
+
+  protected override void update()
+  {
+  }
+
+  protected override void onCollisionEnter(CollisionInfo info)
+  {
+    if (info.GameObject.GetScript<PlayerController>() && info.GameObject.GetScript<PlayerController>().currentState == PlayerController.RaccoonStates.FALLING)
+    {
+      info.GameObject.GetScript<PlayerController>().landedOnJumpPad = true;
+    }
+  }
+
+}

Assets/Scripts/SC_JumpPad.cs.shmeta

@@ -0,0 +1,3 @@
+Name: SC_JumpPad
+ID: 167326885
+Type: 9

Assets/Scripts/UI/SC_ChangeSceneButton.cs

@@ -11,8 +11,9 @@ public class ChangeSceneButton : Script
         UIElement ui = GetComponent<UIElement>();
         if (ui != null)
         {
-            ui.OnClick.RegisterAction(() =>
+            ui.OnRelease.RegisterAction(() =>
             {
+
                 if (sceneID != 0)
                 {
                     Audio.PlaySFXOnce2D("event:/UI/success");

Assets/Scripts/UI/SC_PauseMenu.cs

@@ -0,0 +1,106 @@
+using System;
+using SHADE;
+using SHADE_Scripting.Audio;
+
+public class PauseMenu : Script
+{
+  public GameObject resumeBtn;
+  public GameObject retryBtn;
+  public GameObject quitBtn;
+
+  public GameObject gamePauseText;
+  public GameObject canvas;
+
+  protected override void awake()
+  {
+    GameManager.Instance.GamePause = false;
+    if (gamePauseText)
+      gamePauseText.GetComponent<TextRenderable>().Enabled = false;
+    if (canvas)
+      canvas.SetActive(false);
+
+    if (!resumeBtn)
+      Debug.LogError("Resume Btn missing");
+
+    if (!retryBtn)
+      Debug.LogError("Retry Btn missing");
+
+    if (!quitBtn)
+      Debug.LogError("Quit Btn missing");
+  }
+  protected override void start()
+  {
+    //resume
+    UIElement resume = resumeBtn.GetComponent<UIElement>();
+    if (resume != null)
+    {
+      resume.OnClick.RegisterAction(() =>
+      {
+        if (GameManager.Instance.GamePause)
+        {
+          GameManager.Instance.GamePause = false;
+          AudioHandler.pauseAllSounds(false);
+          if (gamePauseText)
+            gamePauseText.GetComponent<TextRenderable>().Enabled = false;
+          if (canvas)
+            canvas.SetActive(false);
+        }
+      });
+    }
+    else
+    {
+      Debug.LogError("Failed to register resume button.");
+    }
+
+    //retry
+    UIElement retry = retryBtn.GetComponent<UIElement>();
+    if (retry != null)
+    {
+      retry.OnClick.RegisterAction(() =>
+      {
+        Audio.StopAllSounds();
+        //get curr scene
+        //SceneManager.ChangeScene(); 
+      });
+    }
+    else
+    {
+      Debug.LogError("Failed to register retry button.");
+    }
+
+    UIElement quit = quitBtn.GetComponent<UIElement>();
+    if (quit != null)
+    {
+      quit.OnClick.RegisterAction(() =>
+      {
+        Audio.StopAllSounds();
+        //go to main menu
+        SceneManager.ChangeScene(97158628);
+      });
+    }
+    else
+    {
+      Debug.LogError("Failed to register quit button.");
+    }
+  }
+
+  protected override void update()
+  {
+    if (GameManager.Instance.GamePause)
+    {
+      return;
+    }
+
+    if (Input.GetKeyDown(Input.KeyCode.Escape) && !GameManager.Instance.GamePause)
+    {
+      GameManager.Instance.GamePause = true;
+      AudioHandler.pauseAllSounds(true);
+      if (gamePauseText)
+        gamePauseText.GetComponent<TextRenderable>().Enabled = true;
+      if (canvas)
+        canvas.SetActive(true);
+    }
+
+  }
+}
+

Assets/Scripts/UI/SC_PauseMenu.cs.shmeta

@@ -0,0 +1,3 @@
+Name: SC_PauseMenu
+ID: 151952680
+Type: 9

SHADE_Application/src/Application/SBApplication.cpp

@@ -132,16 +132,19 @@ namespace Sandbox
     SHSystemManager::RegisterRoutine<SHTransformSystem, SHTransformSystem::TransformPostPhysicsUpdate>();
     SHSystemManager::RegisterRoutine<SHDebugDrawSystem, SHDebugDrawSystem::ProcessPointsRoutine>();
 
-    SHSystemManager::RegisterRoutine<SHScriptEngine, SHScriptEngine::GizmosDrawRoutine>();
-    SHSystemManager::RegisterRoutine<SHGraphicsSystem, SHGraphicsSystem::PrepareRenderRoutine>();
-    SHSystemManager::RegisterRoutine<SHGraphicsSystem, SHGraphicsSystem::BatcherDispatcherRoutine>();
-    SHSystemManager::RegisterRoutine<SHGraphicsSystem, SHGraphicsSystem::BeginRoutine>();
 
     //SHSystemManager::RegisterRoutine<SHCameraSystem, SHCameraSystem::EditorCameraUpdate>();
     SHSystemManager::RegisterRoutine<SHUISystem, SHUISystem::AddUIComponentRoutine>();
     SHSystemManager::RegisterRoutine<SHUISystem, SHUISystem::UpdateCanvasMatrixRoutine>();
     SHSystemManager::RegisterRoutine<SHUISystem, SHUISystem::UpdateUIMatrixRoutine>();
     SHSystemManager::RegisterRoutine<SHUISystem, SHUISystem::UpdateButtonsRoutine>();
+
+    SHSystemManager::RegisterRoutine<SHScriptEngine, SHScriptEngine::GizmosDrawRoutine>();
+    SHSystemManager::RegisterRoutine<SHGraphicsSystem, SHGraphicsSystem::PrepareRenderRoutine>();
+    SHSystemManager::RegisterRoutine<SHGraphicsSystem, SHGraphicsSystem::BatcherDispatcherRoutine>();
+    SHSystemManager::RegisterRoutine<SHGraphicsSystem, SHGraphicsSystem::BeginRoutine>();
+
+
     SHSystemManager::RegisterRoutine<SHCameraSystem, SHCameraSystem::CameraSystemUpdate>();
     
 #ifdef SHEDITOR

SHADE_Engine/src/Camera/SHCameraSystem.cpp

@@ -284,7 +284,7 @@ namespace SHADE
         {
           camera.offset = arm->GetOffset();
           if (arm->lookAtCameraOrigin)
-            CameraLookAt(camera, camera.position);
+            CameraLookAt(camera, camera.position + arm->GetTargetOffset());
 
         }
 

SHADE_Engine/src/Editor/EditorWindow/InputBindings/SHInputBindingsPanel.cpp

@@ -47,6 +47,8 @@ namespace SHADE
     if (SHEditorWindow::Begin())
     {
       //ImGui::ShowDemoWindow();
+      if (bindingRenames.size() != SHInputManager::CountBindings())
+        resizeVectors(SHInputManager::CountBindings());
 
       //Binding count
       ImGui::Text("Binding Count: %d", SHInputManager::CountBindings());
@@ -127,6 +129,8 @@ namespace SHADE
           {
             SHInputManager::RenameBinding(binding.first, bindingRenames[entryNumber]);
             bindingRenames[entryNumber].clear();
+            ImGui::End();
+            return;
           }
 
           if (ImGui::Button(labelConcat("Delete Binding##", entryNumber).c_str()))

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/Graphics/MiddleEnd/TextRendering/SHTextRenderingSubSystem.cpp

@@ -13,6 +13,7 @@
 #include "Math/Transform/SHTransformComponent.h"
 #include "Graphics/MiddleEnd/GlobalData/SHGlobalDescriptorSets.h"
 #include "Graphics/MiddleEnd/Interface/SHRenderer.h"
+#include "Scene/SHSceneManager.h"
 
 namespace SHADE
 {
@@ -184,6 +185,9 @@ namespace SHADE
 
     for (auto& comp : textRendererComps)
     {
+      if (!SHSceneManager::CheckNodeAndComponentsActive<SHTextRenderableComponent>(comp.GetEID()))
+        continue;
+
       auto* transform = SHComponentManager::GetComponent<SHTransformComponent>(comp.GetEID());
 
       Handle<SHFont> fontHandle = comp.fontHandle;

SHADE_Engine/src/Input/SHInputManager.cpp

@@ -14,6 +14,9 @@
 #include <fstream>
 #include "SHInputManager.h"
 #include "../Tools/SHException.h"
+#include <Graphics/Windowing/SHWindow.h>
+#include <Graphics/MiddleEnd/Interface/SHGraphicsSystem.h>
+#include <Graphics/MiddleEnd/Interface/SHGraphicsSystemInterface.h>
 
 namespace SHADE
 {
@@ -21,6 +24,7 @@ namespace SHADE
   /* Static defines                                                         */
   /*------------------------------------------------------------------------*/
 
+  bool SHInputManager::mouseCentering = false;
   bool SHInputManager::controllerInUse = false;
 
   std::map<std::string, SHInputManager::SHLogicalBindingData> SHInputManager::bindings;
@@ -751,6 +755,7 @@ namespace SHADE
       {
         ++keyCount;
         keys[i] = true;
+        controllerInUse = false;
       }
       else keys[i] = false;
 
@@ -801,6 +806,25 @@ namespace SHADE
     mouseVelocityX = static_cast<double>(mouseScreenX - mouseScreenXLast) / dt;
     mouseVelocityY = static_cast<double>(mouseScreenY - mouseScreenYLast) / dt;
 
+
+    //Mouse Centering
+    if (mouseCentering)
+    {
+      uint32_t width = SHADE::SHGraphicsSystemInterface::GetWindowWidth();
+      uint32_t height = SHADE::SHGraphicsSystemInterface::GetWindowHeight();
+      SetMouseWindowPosition(width / 2, height / 2);
+
+      //These four lines help a lot
+      POINT p;
+      GetCursorPos(&p);
+      mouseVelocityX -= static_cast<double>(p.x - mouseScreenX) / dt;
+      mouseVelocityY -= static_cast<double>(p.y - mouseScreenY) / dt;
+    }
+
+    if (mouseVelocityX != 0.0 || mouseVelocityY != 0.0)
+      controllerInUse = false;
+      
+
     //Mouse wheel vertical delta updating
     mouseWheelVerticalDelta = 0;
     mouseWheelVerticalDelta = mouseWheelVerticalDeltaPoll;

SHADE_Engine/src/Input/SHInputManager.h

@@ -1074,6 +1074,18 @@ namespace SHADE
       SetCursorPos(p.x, p.y);
     }
 
+    //Call to set the flag to start mouse centering every frame
+    static inline void SetMouseCentering(bool state) noexcept
+    {
+      mouseCentering = state;
+    }
+
+    //Get the flag whether mouse centering is on or not
+    static inline bool GetMouseCentering() noexcept
+    {
+      return mouseCentering;
+    }
+
   private:
     /*------------------------------------------------------------------------*/
     /* Constants                                                              */
@@ -1097,6 +1109,9 @@ namespace SHADE
     /* Data Members                                                           */
     /*------------------------------------------------------------------------*/
 
+    //Whether mouse centering will be called every frame or not
+    static bool mouseCentering;
+
     //If the last input is from controller(s) or KB/M
     //True if from controller(s), False if from KB/M
     //Useful for switching control hints between controllers and KB/M

SHADE_Engine/src/Scripting/SHScriptEngine.cpp

@@ -369,6 +369,27 @@ namespace SHADE
     return eventData->handle;
   }
 
+  SHEventHandle SHScriptEngine::onUIElementReleased(SHEventPtr eventPtr)
+  {
+    auto eventData = reinterpret_cast<const SHEventSpec<SHButtonClickEvent>*>(eventPtr.get());
+    csUIElementOnReleased(eventData->data->EID);
+    return eventData->handle;
+  }
+
+  SHEventHandle SHScriptEngine::onUIElementOnHoverEntered(SHEventPtr eventPtr)
+  {
+    auto eventData = reinterpret_cast<const SHEventSpec<SHButtonClickEvent>*>(eventPtr.get());
+    csUIElementOnHoverEntered(eventData->data->EID);
+    return eventData->handle;
+  }
+
+  SHEventHandle SHScriptEngine::onUIElementOnHoverExited(SHEventPtr eventPtr)
+  {
+    auto eventData = reinterpret_cast<const SHEventSpec<SHButtonClickEvent>*>(eventPtr.get());
+    csUIElementOnHoverExited(eventData->data->EID);
+    return eventData->handle;
+  }
+
   SHEventHandle SHScriptEngine::onSceneNodeChildrenAdded(SHEventPtr eventPtr)
   {
     auto eventData = reinterpret_cast<const SHEventSpec<SHSceneGraphAddChildEvent>*>(eventPtr.get());
@@ -539,6 +560,24 @@ namespace SHADE
       DEFAULT_CSHARP_NAMESPACE + ".UIElement",
       "OnClicked"
     );
+    csUIElementOnReleased = dotNet.GetFunctionPtr<CsEventRelayFuncPtr>
+    (
+      DEFAULT_CSHARP_LIB_NAME,
+      DEFAULT_CSHARP_NAMESPACE + ".UIElement",
+      "OnReleased"
+    );
+    csUIElementOnHoverEntered = dotNet.GetFunctionPtr<CsEventRelayFuncPtr>
+    (
+      DEFAULT_CSHARP_LIB_NAME,
+      DEFAULT_CSHARP_NAMESPACE + ".UIElement",
+      "OnHoverEntered"
+    );
+    csUIElementOnHoverExited = dotNet.GetFunctionPtr<CsEventRelayFuncPtr>
+    (
+      DEFAULT_CSHARP_LIB_NAME,
+      DEFAULT_CSHARP_NAMESPACE + ".UIElement",
+      "OnHoverExited"
+    );
     csEditorRenderScripts = dotNet.GetFunctionPtr<CsScriptEditorFuncPtr>
     (
       DEFAULT_CSHARP_LIB_NAME,
@@ -608,6 +647,21 @@ namespace SHADE
       std::make_shared<SHEventReceiverSpec<SHScriptEngine>>(this, &SHScriptEngine::onUIElementClicked)
     };
     SHEventManager::SubscribeTo(SH_BUTTON_CLICK_EVENT, std::dynamic_pointer_cast<SHEventReceiver>(clickedUIElementEventReceiver));
+    std::shared_ptr<SHEventReceiverSpec<SHScriptEngine>> releasedUIElementEventReceiver
+    {
+      std::make_shared<SHEventReceiverSpec<SHScriptEngine>>(this, &SHScriptEngine::onUIElementReleased)
+    };
+    SHEventManager::SubscribeTo(SH_BUTTON_RELEASE_EVENT, std::dynamic_pointer_cast<SHEventReceiver>(releasedUIElementEventReceiver));
+    std::shared_ptr<SHEventReceiverSpec<SHScriptEngine>> hoverEnterUIElementEventReceiver
+    {
+      std::make_shared<SHEventReceiverSpec<SHScriptEngine>>(this, &SHScriptEngine::onUIElementOnHoverEntered)
+    };
+    SHEventManager::SubscribeTo(SH_BUTTON_HOVER_ENTER_EVENT, std::dynamic_pointer_cast<SHEventReceiver>(hoverEnterUIElementEventReceiver));
+    std::shared_ptr<SHEventReceiverSpec<SHScriptEngine>> hoverExitedUIElementEventReceiver
+    {
+      std::make_shared<SHEventReceiverSpec<SHScriptEngine>>(this, &SHScriptEngine::onUIElementOnHoverExited)
+    };
+    SHEventManager::SubscribeTo(SH_BUTTON_HOVER_EXIT_EVENT, std::dynamic_pointer_cast<SHEventReceiver>(hoverExitedUIElementEventReceiver));
 
     /* SceneGraph */
     // Register for SceneNode child added event

SHADE_Engine/src/Scripting/SHScriptEngine.h

@@ -292,6 +292,9 @@ namespace SHADE
     CsEventRelayFuncPtr            csSceneNodeChildrenChanged    = nullptr;
     CsEventRelayFuncPtr            csUIElementOnRemoved          = nullptr;
     CsEventRelayFuncPtr            csUIElementOnClicked          = nullptr;
+    CsEventRelayFuncPtr            csUIElementOnReleased         = nullptr;
+    CsEventRelayFuncPtr            csUIElementOnHoverEntered     = nullptr;
+    CsEventRelayFuncPtr            csUIElementOnHoverExited      = nullptr;
     // - Editor
     CsScriptEditorFuncPtr          csEditorRenderScripts         = nullptr;
     CsFuncPtr                      csEditorUndo                  = nullptr;
@@ -306,6 +309,9 @@ namespace SHADE
     SHEventHandle onColliderComponentRemoved(SHEventPtr eventPtr);
     SHEventHandle onUIElementRemoved(SHEventPtr eventPtr);
     SHEventHandle onUIElementClicked(SHEventPtr eventPtr);
+    SHEventHandle onUIElementReleased(SHEventPtr eventPtr);
+    SHEventHandle onUIElementOnHoverEntered(SHEventPtr eventPtr);
+    SHEventHandle onUIElementOnHoverExited(SHEventPtr eventPtr);
     SHEventHandle onSceneNodeChildrenAdded(SHEventPtr eventPtr);
     SHEventHandle onSceneNodeChildrenRemoved(SHEventPtr eventPtr);
     SHEventHandle onSceneDestroyed(SHEventPtr eventPtr);

SHADE_Engine/src/Serialization/SHSerialization.cpp

@@ -70,6 +70,7 @@ namespace SHADE
     //Compile component IDs
     const auto componentIDList = SHSerialization::GetComponentIDList(node[ComponentsNode]);
     eid = SHEntityManager::CreateEntity(componentIDList, eid, name, parentEID);
+
     createdEntities[oldEID] = eid;
     //createdEntities.push_back(eid);
     if (node[NumberOfChildrenNode])
@@ -90,6 +91,12 @@ namespace SHADE
     if (node[ScriptsNode])
       SHSystemManager::GetSystem<SHScriptEngine>()->DeserialiseScripts(eid, node[ScriptsNode]);
 
+    auto& sceneGraph = SHSceneManager::GetCurrentSceneGraph();
+    if (node[IsActiveNode])
+    {
+      sceneGraph.SetActive(eid, node[IsActiveNode].as<bool>());
+    }
+
     return eid;
   }
 

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,156 +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 };
-    
-    
-    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;
-      SHButtonClickEvent clickEvent;
-      clickEvent.EID = comp.GetEID();
-      SHEventManager::BroadcastEvent(clickEvent, SH_BUTTON_CLICK_EVENT);
-    }
-    
-    if (SHComponentManager::HasComponent<SHRenderable>(comp.GetEID()))
-    {
-      auto renderable = SHComponentManager::GetComponent_s<SHRenderable>(comp.GetEID());
-      //auto texture = SHResourceManager::Get<SHTexture>(comp.GetDefaultTexture());
-
-      
-      AssetID textureID = 0;
-      if (!comp.isHovered && !comp.isClicked)
-      {
-        if (comp.GetDefaultTexture() != 0 && SHAssetManager::GetType(comp.GetDefaultTexture()) == AssetType::TEXTURE)
-        {
-          textureID = comp.GetDefaultTexture();
-          //material->SetProperty("data.textureIndex", SHResourceManager::LoadOrGet<SHTexture>(comp.GetDefaultTexture()));
-          //SHLOG_INFO("SETTING DEFAULT TEXTURE")
-        }
-      }
-      else if (comp.isClicked)
-      {
-        if (comp.GetClickedTexture() != 0 && SHAssetManager::GetType(comp.GetClickedTexture()) == AssetType::TEXTURE)
-        {
-          textureID = comp.GetClickedTexture();
-          //material->SetProperty("data.textureIndex", SHResourceManager::LoadOrGet<SHTexture>(comp.GetClickedTexture()));
-          //SHLOG_INFO("SETTING CLICKED TEXTURE")
-        }
-      }
-      else
-      {
-        if (comp.GetHoveredTexture() != 0 && SHAssetManager::GetType(comp.GetHoveredTexture()) == AssetType::TEXTURE)
-        {
-          textureID = comp.GetHoveredTexture();
-          //material->SetProperty("data.textureIndex", SHResourceManager::LoadOrGet<SHTexture>( comp.GetHoveredTexture()));
-          //SHLOG_INFO("SETTING HOVERED TEXTURE")
-        }
-      }
-      if (textureID != 0 && textureID != comp.currentTexture)
-      {
-        auto material = renderable->GetModifiableMaterial();
-        comp.currentTexture = textureID;
-        material->SetProperty("data.textureIndex", SHResourceManager::LoadOrGet<SHTexture>(textureID));
-      }
-
-
-      
-    }
-  }
-
-
-  void SHUISystem::UpdateToggleButtonComponent(SHToggleButtonComponent& 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);
-
-    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
@@ -331,38 +199,145 @@ 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);
+        //SHLOG_INFO("C++ BROADCASTED HOVER ENTER EVENT EID: {}", clickEvent.EID);
+      }
       comp.isHovered = true;
+
+
+
 #ifdef SHEDITOR
       //if (SHSystemManager::GetSystem<SHEditor>()->editorState == SHEditor::State::PLAY)
       {
         if (SHInputManager::GetKeyDown(SHInputManager::SH_KEYCODE::LMB))
         {
           comp.isClicked = true;
+          SHButtonClickEvent clickEvent;
+          clickEvent.EID = comp.GetEID();
+          SHEventManager::BroadcastEvent(clickEvent, SH_BUTTON_CLICK_EVENT);
         }
       }
 #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")
     }
     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);
+      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()))
+    {
+      auto renderable = SHComponentManager::GetComponent_s<SHRenderable>(comp.GetEID());
+      //auto texture = SHResourceManager::Get<SHTexture>(comp.GetDefaultTexture());
+
+      
+      AssetID textureID = 0;
+      if (!uiComp->isHovered && !uiComp->isClicked)
+      {
+        if (comp.GetDefaultTexture() != 0 && SHAssetManager::GetType(comp.GetDefaultTexture()) == AssetType::TEXTURE)
+        {
+          textureID = comp.GetDefaultTexture();
+          //material->SetProperty("data.textureIndex", SHResourceManager::LoadOrGet<SHTexture>(comp.GetDefaultTexture()));
+          //SHLOG_INFO("SETTING DEFAULT TEXTURE")
+        }
+      }
+      else if (uiComp->isClicked)
+      {
+        if (comp.GetClickedTexture() != 0 && SHAssetManager::GetType(comp.GetClickedTexture()) == AssetType::TEXTURE)
+        {
+          textureID = comp.GetClickedTexture();
+          //material->SetProperty("data.textureIndex", SHResourceManager::LoadOrGet<SHTexture>(comp.GetClickedTexture()));
+          //SHLOG_INFO("SETTING CLICKED TEXTURE")
+        }
+      }
+      else
+      {
+        if (comp.GetHoveredTexture() != 0 && SHAssetManager::GetType(comp.GetHoveredTexture()) == AssetType::TEXTURE)
+        {
+          textureID = comp.GetHoveredTexture();
+          //material->SetProperty("data.textureIndex", SHResourceManager::LoadOrGet<SHTexture>( comp.GetHoveredTexture()));
+          //SHLOG_INFO("SETTING HOVERED TEXTURE")
+        }
+      }
+      if (textureID != 0 && textureID != comp.currentTexture)
+      {
+        auto material = renderable->GetModifiableMaterial();
+        comp.currentTexture = textureID;
+        material->SetProperty("data.textureIndex", SHResourceManager::LoadOrGet<SHTexture>(textureID));
+        loadTexture = true;
+      }
+
+
+      
+    }
+  }
+
+
+  void SHUISystem::UpdateToggleButtonComponent(SHToggleButtonComponent& 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);
+
+   
+
+    if (CheckButtonHoveredOrClicked(*uiComp))
+      comp.value = !comp.value;
+
     if (SHComponentManager::HasComponent<SHRenderable>(comp.GetEID()))
     {
       auto renderable = SHComponentManager::GetComponent_s<SHRenderable>(comp.GetEID());
@@ -394,6 +369,7 @@ namespace SHADE
         auto material = renderable->GetModifiableMaterial();
         comp.currentTexture = textureID;
         material->SetProperty("data.textureIndex", SHResourceManager::LoadOrGet<SHTexture>(textureID));
+        loadTexture = true;
       }
 
 
@@ -417,6 +393,11 @@ namespace SHADE
       if (SHSceneManager::CheckNodeAndComponentsActive<SHToggleButtonComponent>(comp.GetEID()))
         system->UpdateToggleButtonComponent(comp);
     }
+    if (system->loadTexture == true)
+    {
+      system->loadTexture = false;
+      SHResourceManager::FinaliseChanges();
+    }
   }
 
   SHVec2 SHUISystem::CanvasToScreenPoint(SHVec2& const canvasPoint, bool normalized) noexcept

SHADE_Engine/src/UI/SHUISystem.h

@@ -68,10 +68,17 @@ namespace SHADE
 
 
   private:
+    bool loadTexture{false};
+
     void UpdateUIComponent(SHUIComponent& comp) noexcept;
     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;
     

SHADE_Managed/src/Components/Renderable.cxx

@@ -47,11 +47,16 @@ namespace SHADE
         }
     }
     SHADE::Material Renderable::Material::get()
+    {
+        auto mat = GetNativeComponent()->GetModifiableMaterial();
+        return mat ? SHADE::Material(mat) : SHADE::Material();
+    }
+    SHADE::Material Renderable::SharedMaterial::get()
     {
         auto mat = GetNativeComponent()->GetMaterial();
         return mat ? SHADE::Material(mat) : SHADE::Material();
     }
-    void Renderable::Material::set(SHADE::Material value)
+    void Renderable::SharedMaterial::set(SHADE::Material value)
     {
         if (value)
         {

SHADE_Managed/src/Components/Renderable.hxx

@@ -55,9 +55,19 @@ namespace SHADE
             void set(MeshAsset value);
         }
         /// <summary>
-        /// Material used to render this Renderable.
+        /// Special instance of the shared Material for this Renderable. When accessing 
+        /// this property, a new instance of the shared Material is created and assigned 
+        /// to this Renderable. Hence, changes will only affect this Renderable.
         /// </summary>
         property SHADE::Material Material
+        {
+            SHADE::Material get();
+        }
+        /// <summary>
+        /// The shared Material used to render this Renderable and other Renderables
+        /// using the same base Material.
+        /// </summary>
+        property SHADE::Material SharedMaterial
         {
             SHADE::Material get();
             void set(SHADE::Material value);

SHADE_Managed/src/Components/UIElement.cxx

@@ -28,6 +28,18 @@ namespace SHADE
     : Component(entity)
     {}
 
+    void UIElement::ClearStaticEventData()
+    {
+        if (onClickEventMap != nullptr)
+            onClickEventMap->Clear();
+        if (onReleasedEventMap != nullptr)
+            onReleasedEventMap->Clear();
+        if (onHoverEnterEventMap != nullptr)
+            onHoverEnterEventMap->Clear();
+        if (onHoverExitEventMap != nullptr)
+            onHoverExitEventMap->Clear();
+    }
+
     /*---------------------------------------------------------------------------------*/
     /* Properties                                                                      */
     /*---------------------------------------------------------------------------------*/
@@ -37,7 +49,7 @@ namespace SHADE
         if (onClickEventMap == nullptr)
         {
             onClickEventMap = gcnew System::Collections::Generic::Dictionary<Entity, CallbackEvent ^>();
-        }
+        }   
 
         // Create event if it wasn't before
         if (!onClickEventMap->ContainsKey(owner.EntityId))
@@ -48,6 +60,57 @@ namespace SHADE
         // Return the event
         return onClickEventMap[owner.EntityId];
     }
+    CallbackEvent^ UIElement::OnRelease::get()
+    {
+        // Create map if it wasn't before
+        if (onReleasedEventMap == nullptr)
+        {
+            onReleasedEventMap = gcnew System::Collections::Generic::Dictionary<Entity, CallbackEvent ^>();
+        }
+
+        // Create event if it wasn't before
+        if (!onReleasedEventMap->ContainsKey(owner.EntityId))
+        {
+            onReleasedEventMap->Add(owner.EntityId, gcnew CallbackEvent());
+        }
+
+        // Return the event
+        return onReleasedEventMap[owner.EntityId];
+    }
+    CallbackEvent^ UIElement::OnHoverEnter::get()
+    {
+        // Create map if it wasn't before
+        if (onHoverEnterEventMap == nullptr)
+        {
+            onHoverEnterEventMap = gcnew System::Collections::Generic::Dictionary<Entity, CallbackEvent ^>();
+        }
+
+        // Create event if it wasn't before
+        if (!onHoverEnterEventMap->ContainsKey(owner.EntityId))
+        {
+            onHoverEnterEventMap->Add(owner.EntityId, gcnew CallbackEvent());
+        }
+
+        // Return the event
+        return onHoverEnterEventMap[owner.EntityId];
+    }
+    CallbackEvent^ UIElement::OnHoverExit::get()
+    {
+        // Create map if it wasn't before
+        if (onHoverExitEventMap == nullptr)
+        {
+            onHoverExitEventMap = gcnew System::Collections::Generic::Dictionary<Entity, CallbackEvent ^>();
+        }
+
+        // Create event if it wasn't before
+        if (!onHoverExitEventMap->ContainsKey(owner.EntityId))
+        {
+            onHoverExitEventMap->Add(owner.EntityId, gcnew CallbackEvent());
+        }
+
+        // Return the event
+        return onHoverExitEventMap[owner.EntityId];
+    }
 
     /*---------------------------------------------------------------------------------*/
     /* Event Handling Functions                                                        */
@@ -60,6 +123,18 @@ namespace SHADE
         {
             onClickEventMap->Remove(entity);
         }
+        if (onReleasedEventMap != nullptr && onReleasedEventMap->ContainsKey(entity))
+        {
+            onReleasedEventMap->Remove(entity);
+        }
+        if (onHoverEnterEventMap != nullptr && onHoverEnterEventMap->ContainsKey(entity))
+        {
+            onHoverEnterEventMap->Remove(entity);
+        }
+        if (onHoverExitEventMap != nullptr && onHoverExitEventMap->ContainsKey(entity))
+        {
+            onHoverExitEventMap->Remove(entity);
+        }
         SAFE_NATIVE_CALL_END("UIElement.OnComponentRemoved")
     }
     void UIElement::OnClicked(EntityID entity)
@@ -72,4 +147,34 @@ namespace SHADE
         }
         SAFE_NATIVE_CALL_END("UIElement.OnClicked")
     }
+    void UIElement::OnReleased(EntityID entity)
+    {
+        SAFE_NATIVE_CALL_BEGIN
+        // Remove the event if it contained an event
+        if (onReleasedEventMap != nullptr && onReleasedEventMap->ContainsKey(entity))
+        {
+            onReleasedEventMap[entity]->Invoke();
+        }
+        SAFE_NATIVE_CALL_END("UIElement.OnReleased")
+    }
+    void UIElement::OnHoverEntered(EntityID entity)
+    {
+        SAFE_NATIVE_CALL_BEGIN
+        // Remove the event if it contained an event
+        if (onHoverEnterEventMap != nullptr && onHoverEnterEventMap->ContainsKey(entity))
+        {
+            onHoverEnterEventMap[entity]->Invoke();
+        }
+        SAFE_NATIVE_CALL_END("UIElement.OnHoverEntered")
+    }
+    void UIElement::OnHoverExited(EntityID entity)
+    {
+        SAFE_NATIVE_CALL_BEGIN
+        // Remove the event if it contained an event
+        if (onHoverExitEventMap != nullptr && onHoverExitEventMap->ContainsKey(entity))
+        {
+            onHoverExitEventMap[entity]->Invoke();
+        }
+        SAFE_NATIVE_CALL_END("UIElement.OnHoverExited")
+    }
 }

SHADE_Managed/src/Components/UIElement.hxx

@@ -50,6 +50,37 @@ namespace SHADE
         {
             CallbackEvent^ get();
         }
+        /// <summary>
+        /// Event that is raised when this UIElement is released.
+        /// </summary>
+        property CallbackEvent^ OnRelease
+        {
+            CallbackEvent^ get();
+        }
+        /// <summary>
+        /// Event that is raised on the first frame when this UIElement is hovered over.
+        /// </summary>
+        property CallbackEvent^ OnHoverEnter
+        {
+            CallbackEvent^ get();
+        }
+        /// <summary>
+        /// Event that is raised on the first frame when this UIElement is no longer
+        /// hovered over.
+        /// </summary>
+        property CallbackEvent^ OnHoverExit
+        {
+            CallbackEvent^ get();
+        }
+
+      internal:
+        /*-----------------------------------------------------------------------------*/
+        /* Static Clear Functions                                                      */
+        /*-----------------------------------------------------------------------------*/
+        /// <summary>
+        /// Disposes static event data which may contains data from SHADE_Scripting.
+        /// </summary>
+        static void ClearStaticEventData();
 
       private:
         /*-----------------------------------------------------------------------------*/
@@ -65,11 +96,32 @@ namespace SHADE
         /// </summary>
         /// <param name="entity">The entity which was clicked.</param>
         static void OnClicked(EntityID entity);
+        /// <summary>
+        /// To be called from native code when this component is released from clicking.
+        /// </summary>
+        /// <param name="entity">The entity which was clicked.</param>
+        static void OnReleased(EntityID entity);
+        /// <summary>
+        /// To be called from native code on the first frame that this component is 
+        /// hovered on.
+        /// </summary>
+        /// <param name="entity">The entity which was clicked.</param>
+        static void OnHoverEntered(EntityID entity);
+        /// <summary>
+        /// To be called from native code on the first frame that this component is 
+        /// no longer hovered on.
+        /// </summary>
+        /// <param name="entity">The entity which was clicked.</param>
+        static void OnHoverExited(EntityID entity);
 
         /*-----------------------------------------------------------------------------*/
         /* Static Data Members                                                         */
         /*-----------------------------------------------------------------------------*/
+        // As these hold references to code in SHADE_Scripting, we must remember to dispose of them when changing scenes
         static System::Collections::Generic::Dictionary<Entity, CallbackEvent^>^ onClickEventMap;
+        static System::Collections::Generic::Dictionary<Entity, CallbackEvent^>^ onReleasedEventMap;
+        static System::Collections::Generic::Dictionary<Entity, CallbackEvent^>^ onHoverEnterEventMap;
+        static System::Collections::Generic::Dictionary<Entity, CallbackEvent^>^ onHoverExitEventMap;
     };
 }
 

SHADE_Managed/src/Engine/ECS.hxx

@@ -51,7 +51,7 @@ namespace SHADE
         /// specified Component.
         /// </returns>
         generic<typename T> where T : BaseComponent
-            static T GetComponent(EntityID entity);
+        static T GetComponent(EntityID entity);
         /// <summary>
         /// Retrieves the first Component from the specified GameObject's children that
         /// matches the specified type.

SHADE_Managed/src/Engine/EngineInterface.cxx

@@ -21,6 +21,7 @@ of DigiPen Institute of Technology is prohibited.
 #include "Utility/Convert.hxx"
 #include "Utility/Debug.hxx"
 #include "Scripts/ScriptStore.hxx"
+#include "Components/UIElement.hxx"
 
 namespace SHADE
 {
@@ -43,6 +44,9 @@ namespace SHADE
         oss << "[EngineInterface] Unloading " << Convert::ToNative(ManagedLibraryName) << ".dll";
         ScriptStore::Exit();
 
+        // Unload static data of components that have access to the assembly
+        UIElement::ClearStaticEventData();
+
         // Unload the script
         scriptContext->Unload();
         scriptContext = nullptr;

SHADE_Managed/src/Input/Input.cxx

@@ -30,10 +30,29 @@ namespace SHADE
     {
         return SHInputManager::GetMouseWheelVerticalDelta();
     }
+    bool Input::ControllerInUse::get()
+    {
+      return SHInputManager::GetControllerInUse();
+    }
 
     /*---------------------------------------------------------------------------------*/
     /* Usage Functions                                                                 */
     /*---------------------------------------------------------------------------------*/
+    bool Input::AnyKey()
+    {
+      return SHInputManager::AnyKey();
+    }
+
+    bool Input::AnyKeyDown()
+    {
+      return SHInputManager::AnyKeyDown();
+    }
+
+    bool Input::AnyKeyUp()
+    {
+      return SHInputManager::AnyKeyUp();
+    }
+
     bool Input::GetKey(KeyCode key)
     {
         return SHInputManager::GetKey(static_cast<SHInputManager::SH_KEYCODE>(key));
@@ -64,6 +83,50 @@ namespace SHADE
         return SHInputManager::GetKeyUp(static_cast<SHInputManager::SH_KEYCODE>(mouseButton));
     }
 
+    bool Input::AnyControllerInput()
+    {
+      return SHInputManager::AnyControllerInput();
+    }
+    bool Input::AnyControllerInputDown()
+    {
+      return SHInputManager::AnyControllerInputDown();
+    }
+    bool Input::AnyControllerInputUp()
+    {
+      return SHInputManager::AnyControllerInputUp();
+    }
+    bool Input::AnyControllerButton()
+    {
+      return SHInputManager::AnyControllerButton();
+    }
+    bool Input::AnyControllerButtonDown()
+    {
+      return SHInputManager::AnyControllerButtonDown();
+    }
+    bool Input::AnyControllerButtonUp()
+    {
+      return SHInputManager::AnyControllerButtonUp();
+    }
+
+    bool Input::GetControllerInput(Input::ControllerCode code)
+    {
+      return SHInputManager::GetControllerInput(static_cast<SHInputManager::SH_CONTROLLERCODE>(code));
+    }
+    double Input::GetControllerInputNormalisedValue(Input::ControllerCode code)
+    {
+      double toReturn = 0.0;
+      SHInputManager::GetControllerInput(static_cast<SHInputManager::SH_CONTROLLERCODE>(code), &toReturn);
+      return toReturn;
+    }
+    bool Input::GetControllerInputDown(Input::ControllerCode code)
+    {
+      return SHInputManager::GetControllerInputDown(static_cast<SHInputManager::SH_CONTROLLERCODE>(code));
+    }
+    bool Input::GetControllerInputUp(Input::ControllerCode code)
+    {
+      return SHInputManager::GetControllerInputUp(static_cast<SHInputManager::SH_CONTROLLERCODE>(code));
+    }
+
     /*---------------------------------------------------------------------------------*/
     /* Cursor Functions                                                                */
     /*---------------------------------------------------------------------------------*/
@@ -76,6 +139,24 @@ namespace SHADE
         );
     }
 
+    Vector2 Input::GetMousePosition()
+    {
+      int x = 0;
+      int y = 0;
+      SHInputManager::GetMouseWindowPosition(&x, &y);
+      return Convert::ToCLI(SHVec2{ (float)x,(float)y });
+    }
+
+    void Input::SetMouseCentering(bool state)
+    {
+      SHInputManager::SetMouseCentering(state);
+    }
+
+    bool Input::GetMouseCentering()
+    {
+      return SHInputManager::GetMouseCentering();
+    }
+
     /*---------------------------------------------------------------------------------*/
     /* Time Functions                                                                  */
     /*---------------------------------------------------------------------------------*/
@@ -106,4 +187,220 @@ namespace SHADE
 
       return Convert::ToCLI(SHVec2{ (float)velX,(float)velY });
     }
+
+    double Input::GetControllerInputHeldTime(Input::ControllerCode code)
+    {
+      return SHInputManager::GetControllerInputHeldTime(static_cast<SHInputManager::SH_CONTROLLERCODE>(code));
+    }
+    double Input::GetControllerInputReleasedTime(Input::ControllerCode code)
+    {
+      return SHInputManager::GetControllerInputReleasedTime(static_cast<SHInputManager::SH_CONTROLLERCODE>(code));
+    }
+
+    /*-----------------------------------------------------------------------------*/
+    /* Binding Functions                                                           */
+    /*-----------------------------------------------------------------------------*/
+    void Input::SaveBindings()
+    {
+      SHInputManager::SaveBindings();
+    }
+
+    void Input::SaveBindings(System::String^ targetFile)
+    {
+      SHInputManager::SaveBindings(Convert::ToNative(targetFile));
+    }
+
+    void Input::LoadBindings()
+    {
+      SHInputManager::LoadBindings();
+    }
+
+    void Input::LoadBindings(System::String^ sourceFile)
+    {
+      SHInputManager::LoadBindings(Convert::ToNative(sourceFile));
+    }
+
+    bool Input::GetBindingInverted(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingInverted(Convert::ToNative(bindingName));
+    }
+    void Input::SetBindingInverted(System::String^ bindingName, bool newValue)
+    {
+      SHInputManager::SetBindingInverted(Convert::ToNative(bindingName), newValue);
+    }
+    double Input::GetBindingGravity(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingGravity(Convert::ToNative(bindingName));
+    }
+    void Input::SetBindingGravity(System::String^ bindingName, double newValue)
+    {
+      SHInputManager::SetBindingGravity(Convert::ToNative(bindingName), newValue);
+    }
+    double Input::GetBindingDead(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingDead(Convert::ToNative(bindingName));
+    }
+    void Input::SetBindingDead(System::String^ bindingName, double newValue)
+    {
+      SHInputManager::SetBindingDead(Convert::ToNative(bindingName), newValue);
+    }
+    double Input::GetBindingSensitivity(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingSensitivity(Convert::ToNative(bindingName));
+    }
+    void Input::SetBindingSensitivity(System::String^ bindingName, double newValue)
+    {
+      SHInputManager::SetBindingSensitivity(Convert::ToNative(bindingName), newValue);
+    }
+    bool Input::GetBindingSnap(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingSnap(Convert::ToNative(bindingName));
+    }
+    void Input::SetBindingSnap(System::String^ bindingName, bool newValue)
+    {
+      SHInputManager::SetBindingSnap(Convert::ToNative(bindingName), newValue);
+    }
+
+
+    System::Collections::Generic::HashSet<Input::KeyCode>^ Input::GetBindingPositiveKeyCodes(System::String^ bindingName)
+    {
+      System::Collections::Generic::HashSet<Input::KeyCode>^ toReturn = gcnew System::Collections::Generic::HashSet<Input::KeyCode>();
+      std::set<SHInputManager::SH_KEYCODE> list = SHInputManager::GetBindingPositiveKeyCodes(Convert::ToNative(bindingName));
+      for (auto kc : list)
+      {
+        toReturn->Add(static_cast<Input::KeyCode>(kc));
+      }
+      return toReturn;
+    }
+    void Input::AddBindingPositiveKeyCode(System::String^ bindingName, Input::KeyCode toAdd)
+    {
+      SHInputManager::AddBindingPositiveKeyCode(Convert::ToNative(bindingName), static_cast<SHInputManager::SH_KEYCODE>(toAdd));
+    }
+    void Input::RemoveBindingPositiveKeyCode(System::String^ bindingName, Input::KeyCode toRemove)
+    {
+      SHInputManager::RemoveBindingPositiveKeyCode(Convert::ToNative(bindingName), static_cast<SHInputManager::SH_KEYCODE>(toRemove));
+    }
+    void Input::ClearBindingPositiveKeyCodes(System::String^ bindingName)
+    {
+      SHInputManager::ClearBindingPositiveKeyCodes(Convert::ToNative(bindingName));
+    }
+
+    System::Collections::Generic::HashSet<Input::KeyCode>^ Input::GetBindingNegativeKeyCodes(System::String^ bindingName)
+    {
+      System::Collections::Generic::HashSet<Input::KeyCode>^ toReturn = gcnew System::Collections::Generic::HashSet<Input::KeyCode>();
+      std::set<SHInputManager::SH_KEYCODE> list = SHInputManager::GetBindingNegativeKeyCodes(Convert::ToNative(bindingName));
+      for (auto kc : list)
+      {
+        toReturn->Add(static_cast<Input::KeyCode>(kc));
+      }
+      return toReturn;
+    }
+    void Input::AddBindingNegativeKeyCode(System::String^ bindingName, Input::KeyCode toAdd)
+    {
+      SHInputManager::AddBindingNegativeKeyCode(Convert::ToNative(bindingName), static_cast<SHInputManager::SH_KEYCODE>(toAdd));
+    }
+    void Input::RemoveBindingNegativeKeyCode(System::String^ bindingName, Input::KeyCode toRemove)
+    {
+      SHInputManager::RemoveBindingNegativeKeyCode(Convert::ToNative(bindingName), static_cast<SHInputManager::SH_KEYCODE>(toRemove));
+    }
+    void Input::ClearBindingNegativeKeyCodes(System::String^ bindingName)
+    {
+      SHInputManager::ClearBindingNegativeKeyCodes(Convert::ToNative(bindingName));
+    }
+
+    System::Collections::Generic::HashSet<Input::ControllerCode>^ Input::GetBindingPositiveControllerCodes(System::String^ bindingName)
+    {
+      System::Collections::Generic::HashSet<Input::ControllerCode>^ toReturn = gcnew System::Collections::Generic::HashSet<Input::ControllerCode>();
+      std::set<SHInputManager::SH_CONTROLLERCODE> list = SHInputManager::GetBindingPositiveControllerCodes(Convert::ToNative(bindingName));
+      for (auto kc : list)
+      {
+        toReturn->Add(static_cast<Input::ControllerCode>(kc));
+      }
+      return toReturn;
+    }
+    void Input::AddBindingPositiveControllerCode(System::String^ bindingName, Input::ControllerCode toAdd)
+    {
+      SHInputManager::AddBindingPositiveControllerCode(Convert::ToNative(bindingName), static_cast<SHInputManager::SH_CONTROLLERCODE>(toAdd));
+    }
+    void Input::RemoveBindingPositiveControllerCode(System::String^ bindingName, Input::ControllerCode toRemove)
+    {
+      SHInputManager::RemoveBindingPositiveControllerCode(Convert::ToNative(bindingName), static_cast<SHInputManager::SH_CONTROLLERCODE>(toRemove));
+    }
+    void Input::ClearBindingPositiveControllerCodes(System::String^ bindingName)
+    {
+      SHInputManager::ClearBindingPositiveControllerCodes(Convert::ToNative(bindingName));
+    }
+
+    System::Collections::Generic::HashSet<Input::ControllerCode>^ Input::GetBindingNegativeControllerCodes(System::String^ bindingName)
+    {
+      System::Collections::Generic::HashSet<Input::ControllerCode>^ toReturn = gcnew System::Collections::Generic::HashSet<Input::ControllerCode>();
+      std::set<SHInputManager::SH_CONTROLLERCODE> list = SHInputManager::GetBindingNegativeControllerCodes(Convert::ToNative(bindingName));
+      for (auto kc : list)
+      {
+        toReturn->Add(static_cast<Input::ControllerCode>(kc));
+      }
+      return toReturn;
+    }
+    void Input::AddBindingNegativeControllerCode(System::String^ bindingName, Input::ControllerCode toAdd)
+    {
+      SHInputManager::AddBindingNegativeControllerCode(Convert::ToNative(bindingName), static_cast<SHInputManager::SH_CONTROLLERCODE>(toAdd));
+    }
+    void Input::RemoveBindingNegativeControllerCode(System::String^ bindingName, Input::ControllerCode toRemove)
+    {
+      SHInputManager::RemoveBindingNegativeControllerCode(Convert::ToNative(bindingName), static_cast<SHInputManager::SH_CONTROLLERCODE>(toRemove));
+    }
+    void Input::ClearBindingNegativeControllerCodes(System::String^ bindingName)
+    {
+      SHInputManager::ClearBindingNegativeControllerCodes(Convert::ToNative(bindingName));
+    }
+
+    double Input::GetBindingAxis(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingAxis(Convert::ToNative(bindingName));
+    }
+    double Input::GetBindingAxisRaw(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingAxisRaw(Convert::ToNative(bindingName));
+    }
+    bool Input::GetBindingPositiveButton(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingPositiveButton(Convert::ToNative(bindingName));
+    }
+    bool Input::GetBindingNegativeButton(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingNegativeButton(Convert::ToNative(bindingName));
+    }
+    bool Input::GetBindingPositiveButtonDown(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingPositiveButtonDown(Convert::ToNative(bindingName));
+    }
+    bool Input::GetBindingNegativeButtonDown(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingNegativeButtonDown(Convert::ToNative(bindingName));
+    }
+    bool Input::GetBindingPositiveButtonUp(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingPositiveButtonUp(Convert::ToNative(bindingName));
+    }
+    bool Input::GetBindingNegativeButtonUp(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingNegativeButtonUp(Convert::ToNative(bindingName));
+    }
+
+    double Input::GetBindingPositiveHeldTime(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingPositiveHeldTime(Convert::ToNative(bindingName));
+    }
+    double Input::GetBindingNegativeHeldTime(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingNegativeHeldTime(Convert::ToNative(bindingName));
+    }
+    double Input::GetBindingPositiveReleasedTime(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingPositiveReleasedTime(Convert::ToNative(bindingName));
+    }
+    double Input::GetBindingNegativeReleasedTime(System::String^ bindingName)
+    {
+      return SHInputManager::GetBindingNegativeReleasedTime(Convert::ToNative(bindingName));
+    }
 }

SHADE_Managed/src/Input/Input.hxx

@@ -181,7 +181,6 @@ namespace SHADE
             //Break
             //Menu
             //Mouse buttons use mouse codes, which are enums declared later
-            //TODO Controller input
 #if 0
             Space = static_cast<int>(SHInputManager::SH_KEYCODE::SPACE),
             //Apostrophe		= static_cast<int>(SHInputManager::SH_KEYCODE::APOSTROPHE),
@@ -355,6 +354,35 @@ namespace SHADE
             Button3	     = static_cast<int>(SHInputManager::SH_KEYCODE::XMB1),
             Button4	     = static_cast<int>(SHInputManager::SH_KEYCODE::XMB2)
         };
+        enum class ControllerCode : int
+        {
+          DpadUp = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::DPAD_UP),
+          DpadDown = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::DPAD_DOWN),
+          DpadLeft = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::DPAD_LEFT),
+          DpadRight = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::DPAD_RIGHT),
+          Start = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::START),
+          Back = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::BACK),
+          LeftThumbstickButton = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::LEFT_THUMBSTICK),
+          RightThumbstickButton = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::RIGHT_THUMBSTICK),
+          LeftShoulder = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::LEFT_SHOULDER),
+          RightShoulder = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::RIGHT_SHOULDER),
+          AButton = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::A),
+          BButton = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::B),
+          XButton = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::X),
+          YButton = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::Y),
+          LeftTrigger = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::LEFT_TRIGGER),
+          RightTrigger = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::RIGHT_TRIGGER),
+          LeftThumbStickX = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::LEFT_THUMBSTICK_X),
+          LeftThumbStickY = static_cast<int>(SHInputManager::SH_CONTROLLERCODE::LEFT_THUMBSTICK_Y)
+        };
+
+        enum class BindingType : int
+        {
+          KbMbController = static_cast<int>(SHInputManager::SH_BINDINGTYPE::KB_MB_CONTROLLER),
+          mouseX = static_cast<int>(SHInputManager::SH_BINDINGTYPE::MOUSE_X),
+          mouseY = static_cast<int>(SHInputManager::SH_BINDINGTYPE::MOUSE_Y),
+          mouseScroll = static_cast<int>(SHInputManager::SH_BINDINGTYPE::MOUSE_SCROLL)
+        };
 
         /*-----------------------------------------------------------------------------*/
         /* Properites                                                                  */
@@ -376,9 +404,25 @@ namespace SHADE
             int get();
         }
 
+        static property bool ControllerInUse
+        {
+          bool get();
+        }
+
         /*-----------------------------------------------------------------------------*/
         /* Usage Functions                                                             */
         /*-----------------------------------------------------------------------------*/
+
+        /// <summary>
+        /// Checks if any key is being held down.
+        /// This will also be true if GetKeyDown() is true.
+        /// </summary>
+        /// <param name="firstKey">KeyCode of the first key that was detected to be pressed.</param>
+        /// <returns>True while the user holds down the key specified.</returns>
+        static bool AnyKey();
+        static bool AnyKeyDown();
+        static bool AnyKeyUp();
+
         /// <summary>
         /// Checks if a specified key is being held down.
         /// This will also be true if GetKeyDown() is true.
@@ -427,6 +471,20 @@ namespace SHADE
         /// True during the frame the user releases the given mouse button.
         /// </returns>
         static bool GetMouseButtonUp(MouseCode mouseButton);
+
+        //For controller
+
+        static bool AnyControllerInput();
+        static bool AnyControllerInputDown();
+        static bool AnyControllerInputUp();
+        static bool AnyControllerButton();
+        static bool AnyControllerButtonDown();
+        static bool AnyControllerButtonUp();
+
+        static bool GetControllerInput(ControllerCode code);
+        static double GetControllerInputNormalisedValue(ControllerCode code);
+        static bool GetControllerInputDown(ControllerCode code);
+        static bool GetControllerInputUp(ControllerCode code);
         
         /*-----------------------------------------------------------------------------*/
         /* Cursor Functions                                                            */
@@ -440,6 +498,11 @@ namespace SHADE
         /// </param>
         static void SetMousePosition(Vector2 pos);
 
+        static Vector2 GetMousePosition();
+
+        static void SetMouseCentering(bool state);
+        static bool GetMouseCentering();
+
         /*-----------------------------------------------------------------------------*/
         /* Timing Functions                                                            */
         /*-----------------------------------------------------------------------------*/
@@ -472,6 +535,66 @@ namespace SHADE
         /// <returns>Time in seconds that the key was held.</returns>
         static double GetMouseReleasedTime(MouseCode mouseButton);
 
+        static double GetControllerInputHeldTime(ControllerCode code);
+        static double GetControllerInputReleasedTime(ControllerCode code);
+
         static Vector2 GetMouseVelocity();
+
+        /*-----------------------------------------------------------------------------*/
+        /* Binding Functions                                                           */
+        /*-----------------------------------------------------------------------------*/
+        static void SaveBindings(); //To default file
+        static void SaveBindings(System::String^ targetFile);
+        static void LoadBindings(); //From default file
+        static void LoadBindings(System::String^ sourceFile);
+
+        static bool GetBindingInverted(System::String^ bindingName);
+        static void SetBindingInverted(System::String^ bindingName, bool newValue);
+        static double GetBindingGravity(System::String^ bindingName);
+        static void SetBindingGravity(System::String^ bindingName, double newValue);
+        static double GetBindingDead(System::String^ bindingName);
+        static void SetBindingDead(System::String^ bindingName, double newValue);
+        static double GetBindingSensitivity(System::String^ bindingName);
+        static void SetBindingSensitivity(System::String^ bindingName, double newValue);
+        static bool GetBindingSnap(System::String^ bindingName);
+        static void SetBindingSnap(System::String^ bindingName, bool newValue);
+
+        static System::Collections::Generic::HashSet<KeyCode>^ GetBindingPositiveKeyCodes(System::String^ bindingName);
+        static void AddBindingPositiveKeyCode(System::String^ bindingName, Input::KeyCode toAdd);
+        static void RemoveBindingPositiveKeyCode(System::String^ bindingName, Input::KeyCode toRemove);
+        static void ClearBindingPositiveKeyCodes(System::String^ bindingName);
+
+        static System::Collections::Generic::HashSet<KeyCode>^ GetBindingNegativeKeyCodes(System::String^ bindingName);
+        static void AddBindingNegativeKeyCode(System::String^ bindingName, Input::KeyCode toAdd);
+        static void RemoveBindingNegativeKeyCode(System::String^ bindingName, Input::KeyCode toRemove);
+        static void ClearBindingNegativeKeyCodes(System::String^ bindingName);
+
+        static System::Collections::Generic::HashSet<ControllerCode>^ GetBindingPositiveControllerCodes(System::String^ bindingName);
+        static void AddBindingPositiveControllerCode(System::String^ bindingName, Input::ControllerCode toAdd);
+        static void RemoveBindingPositiveControllerCode(System::String^ bindingName, Input::ControllerCode toRemove);
+        static void ClearBindingPositiveControllerCodes(System::String^ bindingName);
+
+        static System::Collections::Generic::HashSet<ControllerCode>^ GetBindingNegativeControllerCodes(System::String^ bindingName);
+        static void AddBindingNegativeControllerCode(System::String^ bindingName, Input::ControllerCode toAdd);
+        static void RemoveBindingNegativeControllerCode(System::String^ bindingName, Input::ControllerCode toRemove);
+        static void ClearBindingNegativeControllerCodes(System::String^ bindingName);
+
+        //Binding states
+
+        static double GetBindingAxis(System::String^ bindingName);
+        static double GetBindingAxisRaw(System::String^ bindingName);
+        static bool GetBindingPositiveButton(System::String^ bindingName);
+        static bool GetBindingNegativeButton(System::String^ bindingName);
+        static bool GetBindingPositiveButtonDown(System::String^ bindingName);
+        static bool GetBindingNegativeButtonDown(System::String^ bindingName);
+        static bool GetBindingPositiveButtonUp(System::String^ bindingName);
+        static bool GetBindingNegativeButtonUp(System::String^ bindingName);
+
+        //Binding times
+
+        static double GetBindingPositiveHeldTime(System::String^ bindingName);
+        static double GetBindingNegativeHeldTime(System::String^ bindingName);
+        static double GetBindingPositiveReleasedTime(System::String^ bindingName);
+        static double GetBindingNegativeReleasedTime(System::String^ bindingName);
     };
 }