From 0d994b0992d9d7461a45491944742ec5be6c451a Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 1 Oct 2022 12:27:25 +0100 Subject: [PATCH] Update to raylib 4.2 (#117) Update bindings to use raylib 4.2.0. Review comments and utils. --- README.md | 6 +- Raylib-cs/Raylib-cs.csproj | 7 +- Raylib-cs/interop/Raylib.cs | 182 ++++++++++++++++--------- Raylib-cs/interop/Raymath.cs | 143 ++++++++++++++++--- Raylib-cs/interop/Rlgl.cs | 16 ++- Raylib-cs/types/Core.cs | 10 ++ Raylib-cs/types/Input.cs | 39 ++++-- Raylib-cs/types/Raylib.Utils.cs | 19 +-- Raylib-cs/types/native/CBool.cs | 2 +- Raylib-cs/types/native/FilePathList.cs | 27 ++++ 10 files changed, 325 insertions(+), 126 deletions(-) create mode 100644 Raylib-cs/types/native/FilePathList.cs diff --git a/README.md b/README.md index bc56ba8..f8e2b44 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Raylib-cs -C# bindings for raylib 4.0.0, a simple and easy-to-use library to learn videogames programming (www.raylib.com) +C# bindings for raylib 4.2.0, a simple and easy-to-use library to learn videogames programming (www.raylib.com) [![GitHub contributors](https://img.shields.io/github/contributors/ChrisDill/Raylib-cs)](https://github.com/ChrisDill/Raylib-cs/graphs/contributors) [![License](https://img.shields.io/badge/license-zlib%2Flibpng-blue.svg)](LICENSE) @@ -19,7 +19,7 @@ Raylib-cs targets net5.0 and net6.0. This is the prefered method to get started - The package is still new so please report any [issues](https://github.com/ChrisDill/Raylib-cs/issues). ``` -dotnet add package Raylib-cs --version 4.0.0.2 +dotnet add package Raylib-cs --version 4.2.0 ``` [![NuGet](https://img.shields.io/nuget/dt/raylib-cs)](https://www.nuget.org/packages/Raylib-cs/) @@ -32,7 +32,7 @@ If you need to edit Raylib-cs source then you will need to add the bindings as a 2. Add [Raylib-cs/Raylib-cs.csproj](Raylib-cs/Raylib-cs.csproj) to your project as an existing project. -3. Download the native libraries for the platforms you want to build for using the [official 4.0.0 release](https://github.com/raysan5/raylib/releases/tag/4.0.0). +3. Download the native libraries for the platforms you want to build for using the [official 4.2.0 release](https://github.com/raysan5/raylib/releases/tag/4.2.0). **NOTE: the MSVC version is required for Windows platforms** 4. **(Recommended)** Put the native library for each platform under `Raylib-cs/runtimes/{platform}/native/` diff --git a/Raylib-cs/Raylib-cs.csproj b/Raylib-cs/Raylib-cs.csproj index 22f0ed1..12cacee 100644 --- a/Raylib-cs/Raylib-cs.csproj +++ b/Raylib-cs/Raylib-cs.csproj @@ -11,9 +11,9 @@ - 4.0.0 - 4.0.0.2 - 4.0.0.2 + 4.2.0 + 4.2.0 + 4.2.0 Chris Dill, Raysan5 true Zlib @@ -49,5 +49,6 @@ + diff --git a/Raylib-cs/interop/Raylib.cs b/Raylib-cs/interop/Raylib.cs index 9a0e6d3..81ad262 100644 --- a/Raylib-cs/interop/Raylib.cs +++ b/Raylib-cs/interop/Raylib.cs @@ -13,13 +13,13 @@ namespace Raylib_cs /// public const string nativeLibName = "raylib"; - public const string RAYLIB_VERSION = "4.0"; + public const string RAYLIB_VERSION = "4.2"; public const float DEG2RAD = MathF.PI / 180.0f; public const float RAD2DEG = 180.0f / MathF.PI; /// - /// Returns color with alpha applied, alpha goes from 0.0f to 1.0f
+ /// Get color with alpha applied, alpha goes from 0.0f to 1.0f
/// NOTE: Added for compatability with previous versions /// public static Color Fade(Color color, float alpha) => ColorAlpha(color, alpha); @@ -122,6 +122,10 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void SetWindowSize(int width, int height); + /// Set window opacity [0.0f..1.0f] (only PLATFORM_DESKTOP) + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern void SetWindowOpacity(float opacity); + /// Get native window handle [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void* GetWindowHandle(); @@ -134,6 +138,14 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern int GetScreenHeight(); + /// Get current render width (it considers HiDPI) + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern int GetRenderWidth(); + + /// Get current render height (it considers HiDPI) + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern int GetRenderHeight(); + /// Get number of connected monitors [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern int GetMonitorCount(); @@ -186,6 +198,14 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void SetClipboardText(sbyte* text); + /// Enable waiting for events on EndDrawing(), no automatic event polling + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern void EnableEventWaiting(); + + /// Disable waiting for events on EndDrawing(), automatic events polling + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern void DisableEventWaiting(); + // Custom frame control functions // NOTE: Those functions are intended for advance users that want full control over the frame processing // By default EndDrawing() does this job: draws everything + SwapScreenBuffer() + manage frame timming + PollInputEvents() @@ -199,9 +219,9 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void PollInputEvents(); - /// Wait for some milliseconds (halt program execution) + /// Wait for some time (halt program execution) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern void WaitTime(float ms); + public static extern void WaitTime(double seconds); // Cursor-related functions @@ -353,31 +373,31 @@ namespace Raylib_cs // Screen-space-related functions - /// Returns a ray trace from mouse position + /// Get a ray trace from mouse position [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Ray GetMouseRay(Vector2 mousePosition, Camera3D camera); - /// Returns camera transform matrix (view matrix) + /// Get camera transform matrix (view matrix) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Matrix4x4 GetCameraMatrix(Camera3D camera); - /// Returns camera 2d transform matrix + /// Get camera 2d transform matrix [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Matrix4x4 GetCameraMatrix2D(Camera2D camera); - /// Returns the screen space position for a 3d world space position + /// Get the screen space position for a 3d world space position [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector2 GetWorldToScreen(Vector3 position, Camera3D camera); - /// Returns size position for a 3d world space position + /// Get size position for a 3d world space position [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector2 GetWorldToScreenEx(Vector3 position, Camera3D camera, int width, int height); - /// Returns the screen space position for a 2d camera world space position + /// Get the screen space position for a 2d camera world space position [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector2 GetWorldToScreen2D(Vector2 position, Camera2D camera); - /// Returns the world space position for a 2d camera screen space position + /// Get the world space position for a 2d camera screen space position [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector2 GetScreenToWorld2D(Vector2 position, Camera2D camera); @@ -388,22 +408,22 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void SetTargetFPS(int fps); - /// Returns current FPS + /// Get current FPS [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern int GetFPS(); - /// Returns time in seconds for last frame drawn + /// Get time in seconds for last frame drawn [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern float GetFrameTime(); - /// Returns elapsed time in seconds since InitWindow() + /// Get elapsed time in seconds since InitWindow() [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern double GetTime(); // Misc. functions - /// Returns a random value between min and max (both included) + /// Get a random value between min and max (both included) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern int GetRandomValue(int min, int max); @@ -478,6 +498,10 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern CBool SaveFileData(sbyte* fileName, void* data, uint bytesToWrite); + /// Export data to code (.h), returns true on success + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern CBool ExportDataAsCode(sbyte* data, uint size, sbyte* fileName); + // Load text data from file (read), returns a '\0' terminated string [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern char* LoadFileText(sbyte* fileName); @@ -502,6 +526,10 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern CBool IsFileExtension(sbyte* fileName, sbyte* ext); + /// Get file length in bytes + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern int GetFileLength(sbyte* fileName); + /// Get pointer to extension for a filename string (includes dot: '.png') [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern sbyte* GetFileExtension(sbyte* fileName); @@ -526,13 +554,21 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern sbyte* GetWorkingDirectory(); + /// Get the directory of the running application (uses static string) + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern sbyte* GetApplicationDirectory(); + /// Get filenames in a directory path (memory should be freed) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern char** GetDirectoryFiles(sbyte* dirPath, int* count); + public static extern FilePathList LoadDirectoryFiles(sbyte* dirPath, int* count); /// Clear directory files paths buffers (free memory) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern void ClearDirectoryFiles(); + public static extern void UnloadDirectoryFiles(FilePathList files); + + /// Check if a given path is a file or a directory + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern CBool IsPathFile(sbyte* path); /// Change working directory, return true on success [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] @@ -544,11 +580,11 @@ namespace Raylib_cs /// Get dropped files names (memory should be freed) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern sbyte** GetDroppedFiles(int* count); + public static extern FilePathList LoadDroppedFiles(); /// Clear dropped files paths buffer (free memory) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern void ClearDroppedFiles(); + public static extern void UnloadDroppedFiles(FilePathList files); /// Get file modification time (last write time) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] @@ -573,17 +609,6 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern byte* DecodeDataBase64(byte* data, int* outputLength); - - // Persistent storage management - - /// Save integer value to storage file (to defined position) - [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern CBool SaveStorageValue(uint position, int value); - - /// Load integer value from storage file (from defined position) - [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern int LoadStorageValue(uint position); - /// Open URL with default system browser (if available) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void OpenURL(sbyte* url); @@ -629,7 +654,7 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern CBool IsGamepadAvailable(int gamepad); - /// Return gamepad internal name id + /// Get gamepad internal name id [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern sbyte* GetGamepadName(int gamepad); @@ -653,11 +678,11 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern int GetGamepadButtonPressed(); - /// Return gamepad axis count for a gamepad + /// Get gamepad axis count for a gamepad [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern int GetGamepadAxisCount(int gamepad); - /// Return axis movement value for a gamepad axis + /// Get axis movement value for a gamepad axis [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern float GetGamepadAxisMovement(int gamepad, GamepadAxis axis); @@ -684,15 +709,15 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern CBool IsMouseButtonUp(MouseButton button); - /// Returns mouse position X + /// Get mouse position X [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern int GetMouseX(); - /// Returns mouse position Y + /// Get mouse position Y [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern int GetMouseY(); - /// Returns mouse position XY + /// Get mouse position XY [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector2 GetMousePosition(); @@ -712,10 +737,14 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void SetMouseScale(float scaleX, float scaleY); - /// Returns mouse wheel movement Y + /// Get mouse wheel movement for X or Y, whichever is larger [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern float GetMouseWheelMove(); + /// Get mouse wheel movement for both X and Y + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern Vector2 GetMouseWheelMoveV(); + /// Set mouse cursor [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void SetMouseCursor(MouseCursor cursor); @@ -723,15 +752,15 @@ namespace Raylib_cs // Input-related functions: touch - /// Returns touch position X for touch point 0 (relative to screen size) + /// Get touch position X for touch point 0 (relative to screen size) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern int GetTouchX(); - /// Returns touch position Y for touch point 0 (relative to screen size) + /// Get touch position Y for touch point 0 (relative to screen size) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern int GetTouchY(); - /// Returns touch position XY for a touch point index (relative to screen size) + /// Get touch position XY for a touch point index (relative to screen size) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector2 GetTouchPosition(int index); @@ -816,9 +845,11 @@ namespace Raylib_cs // Basic Shapes Drawing Functions (Module: shapes) //------------------------------------------------------------------------------------ - /// Set texture and rectangle to be used on shapes drawing
+ /// + /// Set texture and rectangle to be used on shapes drawing
/// NOTE: It can be useful when using basic shapes and one single font.
- /// Defining a white rectangle would allow drawing everything in a single draw call. + /// Defining a white rectangle would allow drawing everything in a single draw call. + /// [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void SetShapesTexture(Texture2D texture, Rectangle source); @@ -1082,7 +1113,7 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Image GenImageWhiteNoise(int width, int height, float factor); - /// Generate image: cellular algorithm. Bigger tileSize means bigger cells + /// Generate image: cellular algorithm, bigger tileSize means bigger cells [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Image GenImageCellular(int width, int height, int tileSize); @@ -1429,7 +1460,10 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Font LoadFont(sbyte* fileName); - /// Load font from file with extended parameters + /// + /// Load font from file with extended parameters, use NULL for fontChars and 0 for glyphCount to load + /// the default character set + /// [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Font LoadFontEx(sbyte* fileName, int fontSize, int* fontChars, int glyphCount); @@ -1437,8 +1471,7 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Font LoadFontFromImage(Image image, Color key, int firstChar); - /// Load font from memory buffer, fileType refers to extension: i.e. "ttf"
- /// fileData refers to const unsigned char * + /// Load font from memory buffer, fileType refers to extension: i.e. "ttf" [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Font LoadFontFromMemory(sbyte* fileType, byte* fileData, int dataSize, int fontSize, int* fontChars, int glyphCount); @@ -1458,6 +1491,10 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void UnloadFont(Font font); + /// Export font as code file, returns true on success + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern CBool ExportFontAsCode(Font font, sbyte* fileName); + // Text drawing functions @@ -1479,8 +1516,11 @@ namespace Raylib_cs /// Draw one character (codepoint) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern void DrawTextCodepoint(Font font, int codepoint, Vector2 position, float scale, Color tint); + public static extern void DrawTextCodepoint(Font font, int codepoint, Vector2 position, float fontSize, Color tint); + /// Draw multiple characters (codepoint) + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern void DrawTextCodepoints(Font font, int* codepoints, int count, Vector2 position, float fontSize, float spacing, Color tint); // Text font info functions @@ -1519,7 +1559,7 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern int GetCodepointCount(sbyte* text); - /// Returns next codepoint in a UTF8 encoded string; 0x3f('?') is returned on failure + /// Get next codepoint in a UTF8 encoded string; 0x3f('?') is returned on failure [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern int GetCodepoint(sbyte* text, int* bytesProcessed); @@ -1747,11 +1787,6 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void GenMeshTangents(Mesh* mesh); - /// Compute mesh binormals - [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern void GenMeshBinormals(Mesh* mesh); - - // Material loading/unloading functions //TODO: safe Helper method @@ -1850,7 +1885,7 @@ namespace Raylib_cs /// Draw a billboard texture defined by source [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern void DrawBillboardRec(Camera3D camera, Texture2D texture, Rectangle source, Vector3 center, float size, Color tint); + public static extern void DrawBillboardRec(Camera3D camera, Texture2D texture, Rectangle source, Vector3 position, Vector2 size, Color tint); /// Draw a billboard texture defined by source and rotation [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] @@ -1894,16 +1929,12 @@ namespace Raylib_cs /// Detect collision between ray and sphere [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern CBool GetRayCollisionSphere(Ray ray, Vector3 center, float radius); + public static extern RayCollision GetRayCollisionSphere(Ray ray, Vector3 center, float radius); /// Detect collision between ray and box [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern RayCollision GetRayCollisionBox(Ray ray, BoundingBox box); - /// Get collision info between ray and model - [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern RayCollision GetRayCollisionModel(Ray ray, Model model); - /// Get collision info between ray and mesh [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern RayCollision GetRayCollisionMesh(Ray ray, Mesh mesh, Matrix4x4 transform); @@ -1946,8 +1977,7 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Wave LoadWave(sbyte* fileName); - /// Load wave from memory buffer, fileType refers to extension: i.e. "wav"
- /// fileData refers to a const unsigned char * + /// Load wave from memory buffer, fileType refers to extension: i.e. "wav" [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Wave LoadWaveFromMemory(sbyte* fileType, byte* fileData, int dataSize); @@ -2022,9 +2052,9 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void SetSoundPitch(Sound sound, float pitch); - /// Convert wave data to desired format + /// Set pan for a sound (0.5 is center) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern void WaveFormat(Wave* wave, int sampleRate, int sampleSize, int channels); + public static extern void SetSoundPan(Sound sound, float pan); /// Copy a wave to a new wave [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] @@ -2034,12 +2064,14 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void WaveCrop(Wave* wave, int initSample, int finalSample); - //TODO: Span + /// Convert wave data to desired format + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern void WaveFormat(Wave* wave, int sampleRate, int sampleSize, int channels); + /// Get samples data from wave as a floats array [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern float* LoadWaveSamples(Wave wave); - //TODO: Span /// Unload samples data loaded with LoadWaveSamples() [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void UnloadWaveSamples(float* samples); @@ -2095,6 +2127,10 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void SetMusicPitch(Music music, float pitch); + /// Set pan for a music (0.5 is center) + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern void SetMusicPan(Music music, float pan); + /// Get music time length (in seconds) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern float GetMusicTimeLength(Music music); @@ -2150,8 +2186,24 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void SetAudioStreamPitch(AudioStream stream, float pitch); + /// Set pan for audio stream (0.5 is centered) + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern void SetAudioStreamPan(AudioStream stream, float pan); + /// Default size for new audio streams [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void SetAudioStreamBufferSizeDefault(int size); + + /// Audio thread callback to request new data + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern void SetAudioStreamCallback(AudioStream stream, delegate* unmanaged[Cdecl] callback); + + /// Attach audio stream processor to stream + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern void AttachAudioStreamProcessor(AudioStream stream, delegate* unmanaged[Cdecl] processor); + + /// Detach audio stream processor from stream + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern void DetachAudioStreamProcessor(AudioStream stream, delegate* unmanaged[Cdecl] processor); } } diff --git a/Raylib-cs/interop/Raymath.cs b/Raylib-cs/interop/Raymath.cs index 7ef3ece..1767e3f 100644 --- a/Raylib-cs/interop/Raymath.cs +++ b/Raylib-cs/interop/Raymath.cs @@ -39,6 +39,13 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern float Remap(float value, float inputStart, float inputEnd, float outputStart, float outputEnd); + /// Wrap input value from min to max + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern float Wrap(float value, float min, float max); + + /// Check whether two given floats are almost equal + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern int FloatEquals(float x, float y); /// Vector with components value 0.0f [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] @@ -80,7 +87,11 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern float Vector2Distance(Vector2 v1, Vector2 v2); - /// Calculate angle from two vectors in X-axis + /// Calculate square distance between two vectors + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern float Vector2DistanceSqr(Vector2 v1, Vector2 v2); + + /// Calculate angle from two vectors [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern float Vector2Angle(Vector2 v1, Vector2 v2); @@ -104,14 +115,44 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector2 Vector2Normalize(Vector2 v); + /// Transforms a Vector2 by a given Matrix + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern Vector2 Vector2Transform(Vector2 v, Matrix4x4 mat); + /// Calculate linear interpolation between two vectors [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector2 Vector2Lerp(Vector2 v1, Vector2 v2, float amount); + /// Calculate reflected vector to normal + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern Vector2 Vector2Reflect(Vector2 v, Vector2 normal); + /// Rotate vector by angle [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector2 Vector2Rotate(Vector2 v, float angle); + /// Move Vector towards target + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern Vector2 Vector2MoveTowards(Vector2 v, Vector2 target, float maxDistance); + + /// Invert the given vector + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern Vector2 Vector2Invert(Vector2 v); + + /// + /// Clamp the components of the vector between min and max values specified by the given vectors + /// + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern Vector2 Vector2Clamp(Vector2 v); + + /// Clamp the magnitude of the vector between two min and max values + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern Vector2 Vector2ClampValue(Vector2 v, float min, float max); + + /// Check whether two given vectors are almost equal + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern int Vector2Equals(Vector2 p, Vector2 q); + /// Vector with components value 0.0f [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] @@ -169,6 +210,10 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern float Vector3Distance(Vector3 v1, Vector3 v2); + /// Calculate square distance between two vectors + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern float Vector3DistanceSqr(Vector3 v1, Vector3 v2); + /// Calculate angle between two vectors in XY and XZ [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector2 Vector3Angle(Vector3 v1, Vector3 v2); @@ -185,9 +230,11 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector3 Vector3Normalize(Vector3 v); - /// Orthonormalize provided vectors
+ /// + /// Orthonormalize provided vectors
/// Makes vectors normalized and orthogonal to each other
- /// Gram-Schmidt function implementation + /// Gram-Schmidt function implementation + /// [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void Vector3OrthoNormalize(Vector3* v1, Vector3* v2); @@ -199,6 +246,10 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector3 Vector3RotateByQuaternion(Vector3 v, Quaternion q); + /// Rotates a vector around an axis + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern Vector3 Vector3RotateByAxisAngle(Vector3 v, Vector3 axis, float angle); + /// Calculate linear interpolation between two vectors [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector3 Vector3Lerp(Vector3 v1, Vector3 v2, float amount); @@ -207,21 +258,25 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector3 Vector3Reflect(Vector3 v, Vector3 normal); - /// Return min value for each pair of components + /// Get min value for each pair of components [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector3 Vector3Min(Vector3 v1, Vector3 v2); - /// Return max value for each pair of components + /// Get max value for each pair of components [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector3 Vector3Max(Vector3 v1, Vector3 v2); - /// Compute barycenter coordinates (u, v, w) for point p with respect to triangle (a, b, c)
- /// NOTE: Assumes P is on the plane of the triangle + /// + /// Compute barycenter coordinates (u, v, w) for point p with respect to triangle (a, b, c)
+ /// NOTE: Assumes P is on the plane of the triangle + /// [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector3 Vector3Barycenter(Vector3 p, Vector3 a, Vector3 b, Vector3 c); - /// Projects a Vector3 from screen space into object space
- /// NOTE: We are avoiding calling other raymath functions despite available + /// + /// Projects a Vector3 from screen space into object space
+ /// NOTE: We are avoiding calling other raymath functions despite available + /// [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector3 Vector3Unproject(Vector3 source, Matrix4x4 projection, Matrix4x4 view); @@ -229,6 +284,36 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern float3 Vector3ToFloatV(Vector3 v); + /// Invert the given vector + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern Vector3 Vector3Invert(Vector3 v); + + /// + /// Clamp the components of the vector between + /// min and max values specified by the given vectors + /// + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern Vector3 Vector3Clamp(Vector3 v, Vector3 min, Vector3 max); + + /// Clamp the magnitude of the vector between two values + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern Vector3 Vector3ClampValue(Vector3 v, float min, float max); + + /// Check whether two given vectors are almost equal + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern int Vector3Equals(Vector3 p, Vector3 q); + + /// + /// Compute the direction of a refracted ray where v specifies the + /// normalized direction of the incoming ray, n specifies the + /// normalized normal vector of the interface of two optical media, + /// and r specifies the ratio of the refractive index of the medium + /// from where the ray comes to the refractive index of the medium + /// on the other side of the surface + /// + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern Vector3 Vector3Refract(Vector3 v, Vector3 n, float r); + /// Compute matrix determinant [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] @@ -262,8 +347,10 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Matrix4x4 MatrixSubtract(Matrix4x4 left, Matrix4x4 right); - /// Get two matrix multiplication
- /// NOTE: When multiplying matrices... the order matters! + /// + /// Get two matrix multiplication
+ /// NOTE: When multiplying matrices... the order matters! + /// [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Matrix4x4 MatrixMultiply(Matrix4x4 left, Matrix4x4 right); @@ -271,8 +358,10 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Matrix4x4 MatrixTranslate(float x, float y, float z); - /// Create rotation matrix from axis and angle
- /// NOTE: Angle should be provided in radians + /// + /// Create rotation matrix from axis and angle
+ /// NOTE: Angle should be provided in radians + /// [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Matrix4x4 MatrixRotate(Vector3 axis, float angle); @@ -304,8 +393,10 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Matrix4x4 MatrixFrustum(double left, double right, double bottom, double top, double near, double far); - /// Get perspective projection matrix
- /// NOTE: Angle should be provided in radians + /// + /// Get perspective projection matrix
+ /// NOTE: Angle should be provided in radians + /// [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Matrix4x4 MatrixPerspective(double fovy, double aspect, double near, double far); @@ -390,8 +481,10 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Matrix4x4 QuaternionToMatrix(Quaternion q); - /// Get rotation quaternion for an angle and axis
- /// NOTE: angle must be provided in radians + /// + /// Get rotation quaternion for an angle and axis
+ /// NOTE: angle must be provided in radians + /// [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Quaternion QuaternionFromAxisAngle(Vector3 axis, float angle); @@ -399,18 +492,26 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void QuaternionToAxisAngle(Quaternion q, Vector3* outAxis, float* outAngle); - /// Get the quaternion equivalent to Euler angles
- /// NOTE: Rotation order is ZYX + /// + /// Get the quaternion equivalent to Euler angles
+ /// NOTE: Rotation order is ZYX + /// [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Quaternion QuaternionFromEuler(float pitch, float yaw, float roll); - /// Get the Euler angles equivalent to quaternion (roll, pitch, yaw)
- /// NOTE: Angles are returned in a Vector3 struct in radians + /// + /// Get the Euler angles equivalent to quaternion (roll, pitch, yaw)
+ /// NOTE: Angles are returned in a Vector3 struct in radians + /// [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Vector3 QuaternionToEuler(Quaternion q); /// Transform a quaternion given a transformation matrix [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern Quaternion QuaternionTransform(Quaternion q, Matrix4x4 mat); + + /// Check whether two given quaternions are almost equal + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern int QuaternionEquals(Quaternion p, Quaternion q); } } diff --git a/Raylib-cs/interop/Rlgl.cs b/Raylib-cs/interop/Rlgl.cs index 1a33317..5413c39 100644 --- a/Raylib-cs/interop/Rlgl.cs +++ b/Raylib-cs/interop/Rlgl.cs @@ -64,6 +64,7 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void rlMatrixMode(int mode); + /// public static void rlMatrixMode(MatrixMode mode) { rlMatrixMode((int)mode); @@ -94,8 +95,7 @@ namespace Raylib_cs public static extern void rlScalef(float x, float y, float z); /// - /// Multiply the current matrix by another matrix - ///
+ /// Multiply the current matrix by another matrix
/// Current Matrix can be set via /// [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] @@ -466,6 +466,10 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void rlUpdateVertexBuffer(uint bufferId, void* data, int dataSize, int offset); + /// Update vertex buffer elements with new data + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] + public static extern void rlUpdateVertexBufferElements(uint id, void* data, int dataSize, int offset); + [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void rlUnloadVertexArray(uint vaoId); @@ -511,7 +515,7 @@ namespace Raylib_cs /// Update GPU texture with new data [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern void rlUpdateTexture(uint id, int width, int height, PixelFormat format, void* data); + public static extern void rlUpdateTexture(uint id, int offsetX, int offsetY, int width, int height, PixelFormat format, void* data); /// Get OpenGL internal formats [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] @@ -596,9 +600,9 @@ namespace Raylib_cs [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] public static extern void rlSetUniformSampler(int locIndex, uint textureId); - /// Set shader currently active + /// Set shader currently active (id and locations) [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern void rlSetShader(Shader shader); + public static extern void rlSetShader(uint id, int* locs); // Compute shader management @@ -621,7 +625,7 @@ namespace Raylib_cs /// Update SSBO buffer data [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] - public static extern void rlUpdateShaderBufferElements(Shader shader); + public static extern void rlUpdateShaderBufferElements(uint id, void* data, ulong dataSize, ulong offset); /// Get SSBO buffer size [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] diff --git a/Raylib-cs/types/Core.cs b/Raylib-cs/types/Core.cs index 63d4a43..40042c2 100644 --- a/Raylib-cs/types/Core.cs +++ b/Raylib-cs/types/Core.cs @@ -70,6 +70,11 @@ namespace Raylib_cs /// FLAG_WINDOW_HIGHDPI = 0x00002000, + /// + /// Set to support mouse passthrough, only supported when FLAG_WINDOW_UNDECORATED + /// + FLAG_WINDOW_MOUSE_PASSTHROUGH = 0x00004000, + /// /// Set to try enabling MSAA 4X /// @@ -158,6 +163,11 @@ namespace Raylib_cs /// BLEND_SUBTRACT_COLORS, + /// + /// Blend premultiplied textures considering alpha + /// + BLEND_ALPHA_PREMULTIPLY, + /// /// Blend textures using custom src/dst factors (use rlSetBlendMode()) /// diff --git a/Raylib-cs/types/Input.cs b/Raylib-cs/types/Input.cs index 0ae0413..4bf82d5 100644 --- a/Raylib-cs/types/Input.cs +++ b/Raylib-cs/types/Input.cs @@ -279,7 +279,7 @@ namespace Raylib_cs public enum GamepadButton { /// - /// This is here just for error checking + /// Unknown button, just for error checking /// GAMEPAD_BUTTON_UNKNOWN = 0, @@ -323,41 +323,54 @@ namespace Raylib_cs /// GAMEPAD_BUTTON_RIGHT_FACE_LEFT, - // Triggers + /// + /// Gamepad top/back trigger left (first), it could be a trailing button + /// GAMEPAD_BUTTON_LEFT_TRIGGER_1, - GAMEPAD_BUTTON_LEFT_TRIGGER_2, - GAMEPAD_BUTTON_RIGHT_TRIGGER_1, - GAMEPAD_BUTTON_RIGHT_TRIGGER_2, - - // These are buttons in the center of the gamepad /// - /// PS3 Select + /// Gamepad top/back trigger left (second), it could be a trailing button + /// + GAMEPAD_BUTTON_LEFT_TRIGGER_2, + + /// + /// Gamepad top/back trigger right (first), it could be a trailing button + /// + GAMEPAD_BUTTON_RIGHT_TRIGGER_1, + + /// + /// Gamepad top/back trigger right (second), it could be a trailing button + /// + GAMEPAD_BUTTON_RIGHT_TRIGGER_2, + + /// + /// Gamepad center buttons, left one (i.e. PS3: Select) /// GAMEPAD_BUTTON_MIDDLE_LEFT, /// - /// PS Button/XBOX Button + /// Gamepad center buttons, middle one (i.e. PS3: PS, Xbox: XBOX) /// GAMEPAD_BUTTON_MIDDLE, /// - /// PS3 Start + /// Gamepad center buttons, right one (i.e. PS3: Start) /// GAMEPAD_BUTTON_MIDDLE_RIGHT, /// - /// Left joystick press button + /// Gamepad joystick pressed button left /// GAMEPAD_BUTTON_LEFT_THUMB, /// - /// Right joystick press button + /// Gamepad joystick pressed button right /// GAMEPAD_BUTTON_RIGHT_THUMB } - /// Gesture + /// + /// Gesture /// NOTE: It could be used as flags to enable only some gestures /// [Flags] diff --git a/Raylib-cs/types/Raylib.Utils.cs b/Raylib-cs/types/Raylib.Utils.cs index 9334071..9cc9a14 100644 --- a/Raylib-cs/types/Raylib.Utils.cs +++ b/Raylib-cs/types/Raylib.Utils.cs @@ -190,14 +190,14 @@ namespace Raylib_cs /// Get dropped files names (memory should be freed) public static string[] GetDroppedFiles() { - int count; - var buffer = GetDroppedFiles(&count); - var files = new string[count]; + var filePathList = LoadDroppedFiles(); + var files = new string[filePathList.count]; - for (var i = 0; i < count; i++) + for (var i = 0; i < filePathList.count; i++) { - files[i] = Marshal.PtrToStringUTF8((IntPtr)buffer[i]); + files[i] = Marshal.PtrToStringUTF8((IntPtr)filePathList.paths[i]); } + UnloadDroppedFiles(filePathList); return files; } @@ -661,15 +661,6 @@ namespace Raylib_cs } } - /// Compute mesh binormals - public static void GenMeshBinormals(ref Mesh mesh) - { - fixed (Mesh* p = &mesh) - { - GenMeshBinormals(p); - } - } - /// Convert wave data to desired format public static void WaveFormat(ref Wave wave, int sampleRate, int sampleSize, int channels) { diff --git a/Raylib-cs/types/native/CBool.cs b/Raylib-cs/types/native/CBool.cs index d3a8e5f..376d581 100644 --- a/Raylib-cs/types/native/CBool.cs +++ b/Raylib-cs/types/native/CBool.cs @@ -67,7 +67,7 @@ namespace Raylib_cs { return new CBool { value = (sbyte)(left.value - right.value) }; } - + // ToString override public override string ToString() { diff --git a/Raylib-cs/types/native/FilePathList.cs b/Raylib-cs/types/native/FilePathList.cs new file mode 100644 index 0000000..a2e33e2 --- /dev/null +++ b/Raylib-cs/types/native/FilePathList.cs @@ -0,0 +1,27 @@ +using System; +using System.Runtime.InteropServices; + +namespace Raylib_cs +{ + /// + /// File path list + /// + [StructLayout(LayoutKind.Sequential)] + public unsafe struct FilePathList + { + /// + /// Filepaths max entries + /// + public uint capacity; + + /// + /// Filepaths entries count + /// + public uint count; + + /// + /// Filepaths entries + /// + public byte** paths; + } +}