From dc5335038ae19f4a6bb8300f15ca7ad37e692a3d Mon Sep 17 00:00:00 2001 From: ChrisDill Date: Sat, 11 Dec 2021 12:15:51 +0000 Subject: [PATCH] Fix IsGestureDetected and formatting --- Raylib-cs/Logging.cs | 2 +- Raylib-cs/Raylib.cs | 21 ++++++++++----------- Raylib-cs/Rlgl.cs | 4 ++-- Raylib-cs/types/Audio.cs | 2 +- Raylib-cs/types/Input.cs | 2 +- Raylib-cs/types/Model.cs | 18 +++++++++--------- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/Raylib-cs/Logging.cs b/Raylib-cs/Logging.cs index c74d0ff..aeebc0c 100644 --- a/Raylib-cs/Logging.cs +++ b/Raylib-cs/Logging.cs @@ -71,7 +71,7 @@ namespace Raylib_cs var buffer = Marshal.AllocHGlobal(byteLength); vsprintf(buffer, format, args); - + string result = Marshal.PtrToStringUTF8(buffer); Marshal.FreeHGlobal(buffer); diff --git a/Raylib-cs/Raylib.cs b/Raylib-cs/Raylib.cs index 5527c7f..17d6120 100644 --- a/Raylib-cs/Raylib.cs +++ b/Raylib-cs/Raylib.cs @@ -84,7 +84,7 @@ namespace Raylib_cs public static void InitWindow(int width, int height, Utf8String title) { - fixed (byte* p = title) + fixed (byte* p = title) { InitWindow(width, height, p); } @@ -559,7 +559,7 @@ namespace Raylib_cs /// Load file data as byte array (read) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern byte* LoadFileData(string fileName, ref int bytesRead); + public static extern byte* LoadFileData(string fileName, ref int bytesRead); /// Unload file data allocated by LoadFileData() [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] @@ -783,8 +783,7 @@ namespace Raylib_cs /// Check if a gesture have been detected [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - [return: MarshalAs(UnmanagedType.I1)] - public static extern bool IsGestureDetected(Gesture gesture); + public static extern CBool IsGestureDetected(Gesture gesture); /// Get latest detected gesture @@ -1323,7 +1322,7 @@ namespace Raylib_cs { fixed (byte* p = text) { - ImageDrawText(ref dst, p, x,y,fontSize,color); + ImageDrawText(ref dst, p, x, y, fontSize, color); } } @@ -1338,7 +1337,7 @@ namespace Raylib_cs ImageDrawTextEx(ref dst, font, p, position, fontSize, spacing, tint); } } - + // Texture loading functions // NOTE: These functions require GPU access @@ -1542,7 +1541,7 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void DrawTextEx(Font font, byte* text, Vector2 position, float fontSize, float spacing, Color tint); - public static void DrawTextEx(Font font, Utf8String text, Vector2 position, float fontSize, + public static void DrawTextEx(Font font, Utf8String text, Vector2 position, float fontSize, float spacing, Color tint) { fixed (byte* p = text) @@ -1560,7 +1559,7 @@ namespace Raylib_cs { fixed (byte* p = text) { - DrawTextEx(font, p, position, fontSize, spacing, tint); + DrawTextEx(font, p, position, fontSize, spacing, tint); } } @@ -1629,11 +1628,11 @@ namespace Raylib_cs { fixed (byte* p2 = append) { - TextAppend(p1,p2, &position); + TextAppend(p1, p2, &position); } } } - + /// Get Pascal case notation version of provided string [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] @@ -2017,7 +2016,7 @@ namespace Raylib_cs { throw new ApplicationException("Failed to load animation"); } - + return new ReadOnlySpan(model, animsCount); } } diff --git a/Raylib-cs/Rlgl.cs b/Raylib-cs/Rlgl.cs index d515eb3..8590282 100644 --- a/Raylib-cs/Rlgl.cs +++ b/Raylib-cs/Rlgl.cs @@ -41,7 +41,7 @@ namespace Raylib_cs public const int RL_TEXTURE_WRAP_CLAMP = 0x812F; public const int RL_TEXTURE_WRAP_MIRROR_REPEAT = 0x8370; public const int RL_TEXTURE_WRAP_MIRROR_CLAMP = 0x8742; - + // GL equivalent data types public const int RL_UNSIGNED_BYTE = 0x1401; @@ -737,7 +737,7 @@ namespace Raylib_cs /// QUADS = 0x0007 } - + /// /// Texture parameters (equivalent to OpenGL defines) /// diff --git a/Raylib-cs/types/Audio.cs b/Raylib-cs/types/Audio.cs index 0b6f476..13ee10c 100644 --- a/Raylib-cs/types/Audio.cs +++ b/Raylib-cs/types/Audio.cs @@ -28,7 +28,7 @@ namespace Raylib_cs /// Number of channels (1-mono, 2-stereo) /// public uint channels; - + //TODO: SPAN ? /// /// Buffer data pointer diff --git a/Raylib-cs/types/Input.cs b/Raylib-cs/types/Input.cs index 464e676..4efd0e9 100644 --- a/Raylib-cs/types/Input.cs +++ b/Raylib-cs/types/Input.cs @@ -356,7 +356,7 @@ namespace Raylib_cs /// GAMEPAD_BUTTON_RIGHT_THUMB } - + /// Gesture /// NOTE: It could be used as flags to enable only some gestures /// diff --git a/Raylib-cs/types/Model.cs b/Raylib-cs/types/Model.cs index cfa10b4..5a96b73 100644 --- a/Raylib-cs/types/Model.cs +++ b/Raylib-cs/types/Model.cs @@ -90,12 +90,12 @@ namespace Raylib_cs /// Number of animation frames /// public readonly int frameCount; - + /// /// Bones information (skeleton, BoneInfo *) /// public readonly BoneInfo* bones; - + /// public ReadOnlySpan BoneInfo => new(bones, boneCount); @@ -106,15 +106,15 @@ namespace Raylib_cs /// public FramePosesCollection FramePoses => new(framePoses, frameCount, boneCount); - + public struct FramePosesCollection { readonly Transform** framePoses; - + readonly int frameCount; - + readonly int boneCount; - + public FramePoses this[int index] { get @@ -122,12 +122,12 @@ namespace Raylib_cs return new(framePoses[index], boneCount); } } - + internal FramePosesCollection(Transform** framePoses, int frameCount, int boneCount) { this.framePoses = framePoses; this.frameCount = frameCount; - this.boneCount = boneCount; + this.boneCount = boneCount; } } } @@ -145,7 +145,7 @@ namespace Raylib_cs return ref poses[index]; } } - + internal FramePoses(Transform* poses, int count) { this.poses = poses;