diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade index 4c5e7b6c..d6f58ab0 100644 --- a/Assets/Scenes/Level2.shade +++ b/Assets/Scenes/Level2.shade @@ -5443,7 +5443,6 @@ Default Texture: 63979907 Hovered Texture: 51379325 Clicked Texture: 66788278 - current texture: 0 IsActive: true UI Component: Canvas ID: 10 @@ -5477,7 +5476,6 @@ Default Texture: 61602036 Hovered Texture: 58910810 Clicked Texture: 57786063 - current texture: 0 IsActive: true UI Component: Canvas ID: 10 @@ -5513,7 +5511,6 @@ Default Texture: 64806384 Hovered Texture: 58347825 Clicked Texture: 63234380 - current texture: 0 IsActive: true UI Component: Canvas ID: 10 @@ -8917,7 +8914,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.400000006, y: 1.29999995, z: 1} Friction: 0.400000006 diff --git a/Assets/Scripts/UI/SC_MainMenu.cs b/Assets/Scripts/UI/SC_MainMenu.cs index d2caaba0..ffa053b3 100644 --- a/Assets/Scripts/UI/SC_MainMenu.cs +++ b/Assets/Scripts/UI/SC_MainMenu.cs @@ -24,23 +24,12 @@ public class MainMenu : Script protected override void start() { - //Input.SetMouseCentering(false); - //Application.IsCursorVisible = true; + Input.SetMouseCentering(false); + Application.IsCursorVisible = true; SceneFadeInOut.Instance.CallFadeOut(); } protected override void update() { -/* if (Input.GetKeyDown(Input.KeyCode.K) && obj) - { - if (testRenderable.Material.GetProperty("data.alpha") == 1) - { - testRenderable.Material.SetProperty("data.alpha", 0); - } - else if (testRenderable.Material.GetProperty("data.alpha") == 0) - { - testRenderable.Material.SetProperty("data.alpha", 1); - } - }*/ if (Input.GetKeyDown(Input.KeyCode.Space)) { diff --git a/SHADE_Managed/src/Engine/Application.cxx b/SHADE_Managed/src/Engine/Application.cxx index e89f97ab..b176f67e 100644 --- a/SHADE_Managed/src/Engine/Application.cxx +++ b/SHADE_Managed/src/Engine/Application.cxx @@ -78,7 +78,7 @@ namespace SHADE } void Application::IsCursorVisible::set(bool value) { - //SHWindow::SetMouseVisible(value); + SHWindow::SetMouseVisible(value); } double Application::FixDeltaTime::get() { diff --git a/SHADE_Managed/src/Input/Input.cxx b/SHADE_Managed/src/Input/Input.cxx index 5b76392b..ee628523 100644 --- a/SHADE_Managed/src/Input/Input.cxx +++ b/SHADE_Managed/src/Input/Input.cxx @@ -149,7 +149,7 @@ namespace SHADE void Input::SetMouseCentering(bool state) { - //SHInputManager::SetMouseCentering(state); + SHInputManager::SetMouseCentering(state); } bool Input::GetMouseCentering()