Skip to content
Snippets Groups Projects
Commit 0461e070 authored by Stefan Richter's avatar Stefan Richter
Browse files

Bugfix: MouseCursor not visible in Unity Editor

parent 03e7c0aa
No related branches found
No related tags found
No related merge requests found
Pipeline #5985 passed
......@@ -81,6 +81,7 @@ public enum OperationSystem
WindowsStoreApps = 3,
}
public static bool CursorVisDefault = true; //Script.
public static bool CursorVisLastUsedIngame = true; //Script.
public static bool GadgetCanBeUsed = false;
......
......@@ -246,10 +246,12 @@ void CheckIf()
if (!UICanvas.enabled)
{
updateMouseCursor.setMouse();
CommunicationEvents.CursorVisLastUsedIngame = true;
}
else
{
updateMouseCursor.setMouse_Off();
CommunicationEvents.CursorVisLastUsedIngame = false;
}
SetCamControl123(UICanvas.enabled);
......@@ -320,6 +322,7 @@ void CheckIf()
void CheckUI_Vis()
{
GadgetCanBeUsed = true;
setMouse_ingame();
}
......
......@@ -468,7 +468,7 @@ void CheckUI_Vis()
else
{
//Cursor.visible = true;
updateMouseCursor.setMouse();
updateMouseCursor.setMouse_Off();
SetCursorRenderer123(true);
//SetCamControl123(false);
SetCamControl123(true);
......
......@@ -102,8 +102,9 @@ private void setPauseToken()
}
else
{
//Cursor.visible = false;
Cursor.visible = false;
}
//updateMouseCursor.setMouse();
UIconfig.GamePaused = true;
PauseGame();
......@@ -119,7 +120,11 @@ private void PauseGame()
}
private void ResumeGame()
{
Time.timeScale = UIconfig.Game_TimeScale;
if (!CommunicationEvents.CursorVisLastUsedIngame) { Cursor.visible = false; }
if (ResetLevel)
{
//Restart resClass = new Restart();
......
......@@ -5,9 +5,27 @@
public static class updateMouseCursor
{
private static int setMouseCursorAlreadyDone = 0;
public static void setMouse_ingame()
{
if (CommunicationEvents.CursorVisLastUsedIngame)
{
setMouse();
}
else
{
setMouse_Off();
}
}
public static void setMouse_Off()
{
Cursor.visible = false;
......@@ -28,13 +46,22 @@ public static void setMouse()
}
else
{
DefineCursorBefore();
Cursor.visible = true;
CommunicationEvents.CursorVisDefault = true;
}
}
private static void DefineCursorBefore()
{
if (setMouseCursorAlreadyDone < 10) { if (DefineCursor()) { setMouseCursorAlreadyDone++; } }
}
private static bool DefineCursor()
{
//Android crashes in level scene;
if (CommunicationEvents.Opsys != CommunicationEvents.OperationSystem.Android)
{
......@@ -63,8 +90,11 @@ public static void setMouse()
Cursor.SetCursor(bestCursTextur, Vector2.zero, CursorMode.ForceSoftware);
//print("bestCursTexturSize " + bestCursTexturSize + " " + CursorTexture_List_01.Count);
return true;
}
return false;
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment