Bump Raylib-cs from 7.0.2 to 8.0.0

Examples/GameloopExamples.cs

@@ -139,6 +139,7 @@ public class GameloopExamples : Game
     public InputAction InputActionUIPrevPage {get; private set;}
 
     //gameloop controlled
+    public InputAction InputActionBorderlessFullscreen {get; private set;}
     public InputAction InputActionFullscreen {get; private set;}
     public InputAction InputActionMaximize {get; private set;}
     public InputAction InputActionMinimize {get; private set;}
@@ -802,10 +803,16 @@ protected override void Update(GameTime time, ScreenInfo game, ScreenInfo gameUi
         inputActionTree.CurrentGamepad = Input.GamepadManager.LastUsedGamepad;
         inputActionTree.Update(time.Delta);
 
+        var borderlessFullscreenState = InputActionBorderlessFullscreen.Consume(out _);
+        if (borderlessFullscreenState is { Consumed: false, Pressed: true })
+        {
+            Instance.Window.ToggleBorderlessFullscreen();
+        }
+
         var fullscreenState = InputActionFullscreen.Consume(out _);
         if (fullscreenState is { Consumed: false, Pressed: true })
         {
-            Instance.Window.ToggleBorderlessFullscreen();
+            Instance.Window.ToggleFullscreen();
         }
 
         var maximizeState = InputActionMaximize.Consume(out _);
@@ -997,10 +1004,14 @@ private void SetupInput()
         var cancelGB = new InputTypeGamepadButton(ShapeGamepadButton.MIDDLE_LEFT);
         InputActionUICancel= new(InputSystem.AllAccessTag, defaultSettings, cancelKB, cancelGB);
 
-
-        var fullscreenKB = new InputTypeKeyboardButton(ShapeKeyboardButton.F);
-        var fullscreenGB = new InputTypeGamepadButton(ShapeGamepadButton.LEFT_THUMB);
-        InputActionFullscreen = new(GameloopAccessTag, defaultSettings,fullscreenKB, fullscreenGB);
+        ModifierKeySet modifierKeyLeftControlReveresed = new ModifierKeySet(ModifierKeyOperator.And, new ModifierKeyKeyboardButton(ShapeKeyboardButton.LEFT_CONTROL, true));
+        ModifierKeySet modifierKeyLeftControl = new ModifierKeySet(ModifierKeyOperator.And, new ModifierKeyKeyboardButton(ShapeKeyboardButton.LEFT_CONTROL, false));
+        var borderlessFullscreenKB = new InputTypeKeyboardButton(ShapeKeyboardButton.F, modifierKeyLeftControlReveresed);
+        var borderlessFullscreenGB = new InputTypeGamepadButton(ShapeGamepadButton.LEFT_THUMB);
+        InputActionBorderlessFullscreen = new(GameloopAccessTag, defaultSettings, borderlessFullscreenKB, borderlessFullscreenGB);
+
+        var fullscreenKB = new InputTypeKeyboardButton(ShapeKeyboardButton.F, modifierKeyLeftControl);
+        InputActionFullscreen = new(GameloopAccessTag, defaultSettings, fullscreenKB);
 
         var maximizeKB = new InputTypeKeyboardButton(ShapeKeyboardButton.M);
         // var maximizeGB = new InputTypeGamepadButton(ShapeGamepadButton.RIGHT_THUMB);
@@ -1095,6 +1106,7 @@ private void SetupInput()
         inputActionTree.Add(InputActionUINextTab);
         inputActionTree.Add(InputActionUIPrevPage);
         inputActionTree.Add(InputActionUINextPage);
+        inputActionTree.Add(InputActionBorderlessFullscreen);
         inputActionTree.Add(InputActionFullscreen);
         inputActionTree.Add(InputActionMaximize);
         inputActionTree.Add(InputActionMinimize);

Examples/Program.cs

@@ -7,6 +7,8 @@ public static class Program
 {
     public static void Main(string[] args)
     {
+
+        //TODO: Check all modes if they work still!
         var gameSettings = GameSettings.StretchMode("Shape Engine Examples");
 
         var windowSettings = new WindowSettings
@@ -23,7 +25,7 @@ public static void Main(string[] args)
             MouseEnabled = true,
             MouseVisible = false,
             Msaa4x = true,
-            HighDPI = false,
+            HighDPI = true,
             FramebufferTransparent = false
         };
 

Examples/Scenes/MainScene.cs

@@ -126,7 +126,7 @@ private void HandleInput(float dt, Vector2 mousePosGame, Vector2 mousePosUI)
             { 
                 GameloopExamples.Instance.Window.ToggleMinimizeWindow();
             }
-            var fullscreenState = GameloopExamples.Instance.InputActionFullscreen.Consume(out _);
+            var fullscreenState = GameloopExamples.Instance.InputActionBorderlessFullscreen.Consume(out _);
             if (fullscreenState is { Consumed: false, Pressed: true })
             { 
                 GameloopExamples.Instance.Window.ToggleBorderlessFullscreen();
@@ -295,7 +295,7 @@ private void DrawInputInfoBox(Rect area)
             var curInputDevice = Input.CurrentInputDeviceType;
             if (curInputDevice == InputDeviceType.Mouse) curInputDevice = InputDeviceType.Keyboard;
 
-            string fullscreenInputTypeName = GameloopExamples.Instance.InputActionFullscreen.GetInputTypeDescription(curInputDevice, true, 1, false);
+            string fullscreenInputTypeName = GameloopExamples.Instance.InputActionBorderlessFullscreen.GetInputTypeDescription(curInputDevice, true, 1, false);
             var fullscreenInfo = $"Fullscreen {fullscreenInputTypeName}";
 
             string cycleShaderInputTypeDescription = GameloopExamples.Instance.InputActionCycleShaders.GetInputTypeDescription(InputDeviceType.Keyboard, true, 1, false);

ShapeEngine/Core/GameDef/Game.cs

@@ -797,11 +797,11 @@ public int ClearScreenTextures()
     /// <param name="gameInfo">Information about the game screen area.</param>
     /// <param name="gameUiInfo">Information about the game UI screen area.</param>
     /// <param name="uiInfo">Information about the general UI screen area.</param>
-
     protected virtual void UpdateCursor(float dt, ScreenInfo gameInfo, ScreenInfo gameUiInfo, ScreenInfo uiInfo)
     {
 
     }
+
     /// <summary>
     /// Draws the cursor in the game world space.
     /// </summary>
@@ -814,6 +814,7 @@ protected virtual void DrawCursorGame(ScreenInfo gameInfo)
     {
 
     }
+
     /// <summary>
     /// Draws the cursor on the game UI. This method is called during the UI rendering phase when the mouse is on the screen.
     /// </summary>
@@ -822,11 +823,11 @@ protected virtual void DrawCursorGame(ScreenInfo gameInfo)
     /// This is a virtual method intended to be overridden by derived classes to implement custom cursor rendering.
     /// The base implementation does not draw anything.
     /// </remarks>
-
     protected virtual void DrawCursorGameUi(ScreenInfo gameUiInfo)
     {
 
     }
+
     /// <summary>
     /// Draws cursor UI elements on the screen.
     /// </summary>
@@ -835,7 +836,6 @@ protected virtual void DrawCursorGameUi(ScreenInfo gameUiInfo)
     /// This is a virtual method that can be overridden by derived classes to implement custom cursor drawing.
     /// It's called during the rendering process when the mouse is detected on the screen.
     /// </remarks>
-
     protected virtual void DrawCursorUi(ScreenInfo uiInfo)
     {
 

ShapeEngine/Core/GameDef/GameGameloop.cs

@@ -378,7 +378,8 @@ private void DrawToScreen()
 
         ResolveDrawUI(UIScreenInfo);
 
-        if (Window.MouseOnScreen) DrawCursorUi(UIScreenInfo);
+        // if (Window.MouseOnScreen) DrawCursorUi(UIScreenInfo);
+        DrawCursorUi(UIScreenInfo);
 
         Raylib.EndDrawing();
     }
@@ -394,13 +395,15 @@ private void EndGameloop()
     private void GameTextureOnDrawGame(ScreenInfo gameScreenInfo, ScreenTexture texture)
     {
         ResolveDrawGame(gameScreenInfo);
-        if (Window.MouseOnScreen) DrawCursorGame(gameScreenInfo);
+        // if (Window.MouseOnScreen) DrawCursorGame(gameScreenInfo);
+        DrawCursorGame(gameScreenInfo);
     }
 
     private void GameTextureOnDrawUI(ScreenInfo gameUiScreenInfo, ScreenTexture texture)
     {
         ResolveDrawGameUI(gameUiScreenInfo);
-        if (Window.MouseOnScreen) DrawCursorGameUi(gameUiScreenInfo);
+        // if (Window.MouseOnScreen) DrawCursorGameUi(gameUiScreenInfo);
+        DrawCursorGameUi(gameUiScreenInfo);
     }
 
     private void GameTextureOnTextureResized(int w, int h)