From cb77e4f19563cb1eee027185415a13261c089b3a Mon Sep 17 00:00:00 2001 From: Meatcorps Date: Fri, 22 May 2026 10:07:42 +0200 Subject: [PATCH] Improved XML comments for consistency, fixed spacing and formatting across examples, added new resources to `resources.LICENSE`. --- Examples/Core/DeltaTime.cs | 7 +- Examples/Core/InputGamepad.cs | 2 +- Examples/Core/InputGesturesTestBed.cs | 128 +++++++++++++++++--------- Examples/Core/InputMouseWheel.cs | 2 +- Examples/Core/InputVirtualControls.cs | 25 +++-- Examples/Models/LoadingGltf.cs | 5 +- Examples/licenses/resources.LICENSE | 1 + Raylib-cs/interop/Rlgl.cs | 6 +- 8 files changed, 113 insertions(+), 63 deletions(-) diff --git a/Examples/Core/DeltaTime.cs b/Examples/Core/DeltaTime.cs index 8577636..38dd077 100644 --- a/Examples/Core/DeltaTime.cs +++ b/Examples/Core/DeltaTime.cs @@ -1,6 +1,3 @@ -using System.Numerics; - -namespace Examples.Core; /******************************************************************************************* * * raylib [core] example - delta time @@ -18,6 +15,10 @@ namespace Examples.Core; * ********************************************************************************************/ +using System.Numerics; + +namespace Examples.Core; + using static Raylib_cs.Raylib; public class DeltaTime diff --git a/Examples/Core/InputGamepad.cs b/Examples/Core/InputGamepad.cs index 883ab4e..7d0104a 100644 --- a/Examples/Core/InputGamepad.cs +++ b/Examples/Core/InputGamepad.cs @@ -90,7 +90,7 @@ public class InputGamepad string gamepadName = GetGamepadName_(gamepad); DrawText($"GP{gamepad}: {gamepadName}", 10, 10, 10, Color.Black); - if (gamepadName.Contains(XBOX_ALIAS_1, StringComparison.OrdinalIgnoreCase)|| + if (gamepadName.Contains(XBOX_ALIAS_1, StringComparison.OrdinalIgnoreCase) || gamepadName.Contains(XBOX_ALIAS_2, StringComparison.OrdinalIgnoreCase)) { DrawTexture(texXboxPad, 0, 0, Color.DarkGray); diff --git a/Examples/Core/InputGesturesTestBed.cs b/Examples/Core/InputGesturesTestBed.cs index 4039ebb..893c5dd 100644 --- a/Examples/Core/InputGesturesTestBed.cs +++ b/Examples/Core/InputGesturesTestBed.cs @@ -32,23 +32,23 @@ public class InputGesturesTestBed public static int Main() { -// Initialization + // Initialization //-------------------------------------------------------------------------------------- const int screenWidth = 800; const int screenHeight = 450; InitWindow(screenWidth, screenHeight, "raylib [core] example - input gestures testbed"); - Vector2 messagePosition = new Vector2( 160, 7 ); + Vector2 messagePosition = new Vector2(160, 7); // Last gesture variables definitions Gesture lastGesture = 0; - Vector2 lastGesturePosition = new Vector2( 165, 130 ); + Vector2 lastGesturePosition = new Vector2(165, 130); // Gesture log variables definitions // NOTE: The gesture log uses an array (as an inverted circular queue) to store the performed gestures string[] gestureLog = new string[GESTURE_LOG_SIZE + 1]; - for (int i= 0; i < GESTURE_LOG_SIZE; i++) + for (int i = 0; i < GESTURE_LOG_SIZE; i++) { gestureLog[i] = new string(new char[12]); } @@ -64,16 +64,16 @@ public class InputGesturesTestBed // - 3 hides repeated events and hide hold events int logMode = 1; - Color gestureColor = new Color(0, 0, 0, 255 ); - Rectangle logButton1 = new Rectangle( 53, 7, 48, 26 ); - Rectangle logButton2 = new Rectangle( 108, 7, 36, 26 ); - Vector2 gestureLogPosition = new Vector2( 10, 10 ); + Color gestureColor = new Color(0, 0, 0, 255); + Rectangle logButton1 = new Rectangle(53, 7, 48, 26); + Rectangle logButton2 = new Rectangle(108, 7, 36, 26); + Vector2 gestureLogPosition = new Vector2(10, 10); // Protractor variables definitions float angleLength = 90.0f; float currentAngleDegrees = 0.0f; - Vector2 finalVector = new Vector2( 0.0f, 0.0f ); - Vector2 protractorPosition = new Vector2( 266.0f, 315.0f ); + Vector2 finalVector = new Vector2(0.0f, 0.0f); + Vector2 protractorPosition = new Vector2(266.0f, 315.0f); SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- @@ -103,20 +103,36 @@ public class InputGesturesTestBed { switch (logMode) { - case 3: logMode = 2; break; - case 2: logMode = 3; break; - case 1: logMode = 0; break; - default: logMode = 1; break; + case 3: + logMode = 2; + break; + case 2: + logMode = 3; + break; + case 1: + logMode = 0; + break; + default: + logMode = 1; + break; } } else if (CheckCollisionPointRec(GetMousePosition(), logButton2)) { switch (logMode) { - case 3: logMode = 1; break; - case 2: logMode = 0; break; - case 1: logMode = 3; break; - default: logMode = 2; break; + case 3: + logMode = 1; + break; + case 2: + logMode = 0; + break; + case 1: + logMode = 3; + break; + default: + logMode = 2; + break; } } } @@ -320,7 +336,7 @@ public class InputGesturesTestBed // Note: Official it's using raylibs functions for string manipulation. But in C# it will end up in an unsafe handling. string angleString = currentAngleDegrees.ToString("F3"); int angleStringDot = angleString.IndexOf('.'); - string angleStringTrim = angleString.Substring(0, angleStringDot + 3); + string angleStringTrim = angleString.Substring(0, angleStringDot + 3); DrawText(angleStringTrim, (int)protractorPosition.X + 55, (int)protractorPosition.Y + 92, 20, gestureColor); DrawCircleV(protractorPosition, 80.0f, Color.White); @@ -397,38 +413,62 @@ public class InputGesturesTestBed { switch (gesture) { - case 0: return "None"; - case 1: return "Tap"; - case 2: return "Double Tap"; - case 4: return "Hold"; - case 8: return "Drag"; - case 16: return "Swipe Right"; - case 32: return "Swipe Left"; - case 64: return "Swipe Up"; - case 128: return "Swipe Down"; - case 256: return "Pinch In"; - case 512: return "Pinch Out"; - default: return "Unknown"; + case 0: + return "None"; + case 1: + return "Tap"; + case 2: + return "Double Tap"; + case 4: + return "Hold"; + case 8: + return "Drag"; + case 16: + return "Swipe Right"; + case 32: + return "Swipe Left"; + case 64: + return "Swipe Up"; + case 128: + return "Swipe Down"; + case 256: + return "Pinch In"; + case 512: + return "Pinch Out"; + default: + return "Unknown"; } } -// Get color for gesture value + // Get color for gesture value static Color GetGestureColor(int gesture) { switch (gesture) { - case 0: return Color.Black; - case 1: return Color.Blue; - case 2: return Color.SkyBlue; - case 4: return Color.Black; - case 8: return Color.Lime; - case 16: return Color.Red; - case 32: return Color.Red; - case 64: return Color.Red; - case 128: return Color.Red; - case 256: return Color.Violet; - case 512: return Color.Orange; - default: return Color.Black; + case 0: + return Color.Black; + case 1: + return Color.Blue; + case 2: + return Color.SkyBlue; + case 4: + return Color.Black; + case 8: + return Color.Lime; + case 16: + return Color.Red; + case 32: + return Color.Red; + case 64: + return Color.Red; + case 128: + return Color.Red; + case 256: + return Color.Violet; + case 512: + return Color.Orange; + default: + return Color.Black; } } } diff --git a/Examples/Core/InputMouseWheel.cs b/Examples/Core/InputMouseWheel.cs index d0c4c5f..57900f4 100644 --- a/Examples/Core/InputMouseWheel.cs +++ b/Examples/Core/InputMouseWheel.cs @@ -28,7 +28,7 @@ public class InputMouseWheel InitWindow(screenWidth, screenHeight, "raylib [core] example - input mouse wheel"); - int boxPositionY = screenHeight/2 - 40; + int boxPositionY = screenHeight / 2 - 40; int scrollSpeed = 4; // Scrolling speed in pixels SetTargetFPS(60); diff --git a/Examples/Core/InputVirtualControls.cs b/Examples/Core/InputVirtualControls.cs index be1b0aa..626d913 100644 --- a/Examples/Core/InputVirtualControls.cs +++ b/Examples/Core/InputVirtualControls.cs @@ -62,7 +62,7 @@ public class InputVirtualControls ) // Down ]; - Vector2[][] arrowTris = [ + Vector2[][] arrowTris = [ // Up [ new Vector2( @@ -122,9 +122,9 @@ public class InputVirtualControls ]; int pressedButton = (int)PadButton.BUTTON_NONE; - Vector2 inputPosition = new Vector2( 0, 0 ); + Vector2 inputPosition = new Vector2(0, 0); - Vector2 playerPosition = new Vector2( (float)screenWidth / 2, (float)screenHeight / 2 ); + Vector2 playerPosition = new Vector2((float)screenWidth / 2, (float)screenHeight / 2); float playerSpeed = 75f; SetTargetFPS(60); @@ -168,11 +168,20 @@ public class InputVirtualControls // Move player according to pressed button switch ((PadButton)pressedButton) { - case PadButton.BUTTON_UP: playerPosition.Y -= playerSpeed * GetFrameTime(); break; - case PadButton.BUTTON_LEFT: playerPosition.X -= playerSpeed * GetFrameTime(); break; - case PadButton.BUTTON_RIGHT: playerPosition.X += playerSpeed * GetFrameTime(); break; - case PadButton.BUTTON_DOWN: playerPosition.Y += playerSpeed * GetFrameTime(); break; - default: break; + case PadButton.BUTTON_UP: + playerPosition.Y -= playerSpeed * GetFrameTime(); + break; + case PadButton.BUTTON_LEFT: + playerPosition.X -= playerSpeed * GetFrameTime(); + break; + case PadButton.BUTTON_RIGHT: + playerPosition.X += playerSpeed * GetFrameTime(); + break; + case PadButton.BUTTON_DOWN: + playerPosition.Y += playerSpeed * GetFrameTime(); + break; + default: + break; } ; diff --git a/Examples/Models/LoadingGltf.cs b/Examples/Models/LoadingGltf.cs index 588c003..609bf41 100644 --- a/Examples/Models/LoadingGltf.cs +++ b/Examples/Models/LoadingGltf.cs @@ -21,7 +21,6 @@ ********************************************************************************************/ using System.Numerics; -using System.Runtime.InteropServices; using static Raylib_cs.Raylib; namespace Examples.Models; @@ -67,11 +66,11 @@ public class LoadingGltf if (IsKeyPressed(KeyboardKey.Right)) { - animIndex = (animIndex + 1)%anims.Length; + animIndex = (animIndex + 1) % anims.Length; } else if (IsKeyPressed(KeyboardKey.Left)) { - animIndex = (animIndex + anims.Length - 1)%anims.Length; + animIndex = (animIndex + anims.Length - 1) % anims.Length; } diff --git a/Examples/licenses/resources.LICENSE b/Examples/licenses/resources.LICENSE index 0eda567..1c206f4 100644 --- a/Examples/licenses/resources.LICENSE +++ b/Examples/licenses/resources.LICENSE @@ -55,6 +55,7 @@ models: | models/barracks.obj,
models/barracks_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - | | models/church.obj,
models/church_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - | | models/watermill.obj,
models/watermill_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - | +| greenman.glb, greenman_hat.glb, greenman_sword.glb, greenman_shield.glb | [@ip](https://github.com/ipzaur) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - | images: | resource | author | licence | notes | diff --git a/Raylib-cs/interop/Rlgl.cs b/Raylib-cs/interop/Rlgl.cs index 1d3cd64..746031c 100644 --- a/Raylib-cs/interop/Rlgl.cs +++ b/Raylib-cs/interop/Rlgl.cs @@ -477,7 +477,7 @@ public static unsafe partial class Rlgl [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])] public static partial void SetPointSize(float size); - /// Set the point drawing size + /// Get the point drawing size [LibraryImport(NativeLibName, EntryPoint = "rlGetPointSize")] [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])] public static partial float GetPointSize(); @@ -594,12 +594,12 @@ public static unsafe partial class Rlgl [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])] public static partial GlVersion GetVersion(); - /// Get default framebuffer width + /// Set current framebuffer width [LibraryImport(NativeLibName, EntryPoint = "rlSetFramebufferWidth")] [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])] public static partial int SetFramebufferWidth(int width); - /// Get default framebuffer width + /// Set current framebuffer height [LibraryImport(NativeLibName, EntryPoint = "rlSetFramebufferHeight")] [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])] public static partial int SetFramebufferHeight(int height);