diff --git a/Examples/Build.bat b/Examples/Build.bat deleted file mode 100644 index 4044de1..0000000 --- a/Examples/Build.bat +++ /dev/null @@ -1,2 +0,0 @@ -mingw32-make -pause diff --git a/README.md b/README.md index c0f7f61..47b3874 100644 --- a/README.md +++ b/README.md @@ -2,66 +2,54 @@ # Raylib-cs -C# bindings for raylib 2.0, a simple and easy-to-use library to learn videogames programming (www.raylib.com) +C# bindings for raylib, a simple and easy-to-use library to learn videogames programming (www.raylib.com) -## Installation +# Installation So far, I have only tested on Windows. Tips on making things work smoothly on all platforms is appreciated. 1. Add the [nuget package](https://www.nuget.org/packages/Raylib-cs/) - 2. Start coding! ```csharp using Raylib; -using static Raylib.Raylib; +using rl = Raylib.Raylib; static class Program { public static void Main() { - InitWindow(640, 480, "Hello World"); + rl.InitWindow(640, 480, "Hello World"); - while (!WindowShouldClose()) + while (!rl.WindowShouldClose()) { - BeginDraw(); + rl.BeginDraw(); - ClearBackground(Color.WHITE); - DrawText("Hello, world!", 12, 12, 20, Color.BLACK); + rl.ClearBackground(Color.WHITE); + rl.DrawText("Hello, world!", 12, 12, 20, Color.BLACK); - EndDrawing(); + rl.EndDrawing(); } - - CloseWindow(); + + rl.CloseWindow(); } } ``` # Tech notes -The bindings are close to the original with a few changes and extensions. -- Enums are passed in as type instead of int to avoid explicit casting to a int every time. -- Added constructors for some of the types. +- Enums are passed as `int` to prevent the need for explicit casts. +- Color defines stored inside `Color`. +- Uses `string.Format` in place of `TextFormat`. -## Custom build -1. Add [raygui](https://github.com/raysan5/raygui) -2. Add a file with the following -```c -#include "raylib.h" -#include "easings.h" +# Extras +- Structs have constructors. +- Operator overloading for math types. -#define PHYSAC_NO_THREADS -#define PHYSAC_IMPLEMENTATION -#include "physac.h" - -#define RAYGUI_IMPLEMENTATION -#include "raygui.h" -``` - -## Contributing +# Contributing If you have any ideas, feel free to open an issue and tell me what you think. If you'd like to contribute, please fork the repository and make changes as you'd like. Pull requests are warmly welcome. If you want to [request features](https://github.com/raysan5/raylib/pulls) or [report bugs](https://github.com/raysan5/raylib/issues) related to the library (in contrast to this binding), please refer to the [author's project repo](https://github.com/raysan5/raylib). -## License +# License raylib-cs (and raylib) is licensed under an unmodified zlib/libpng license, which is an OSI-certified, BSD-like license that allows static linking with closed source software. Check [LICENSE](LICENSE) for further details. diff --git a/Test.NetCore/Properties/launchSettings.json b/Test.NetCore/Properties/launchSettings.json deleted file mode 100644 index 2f423f6..0000000 --- a/Test.NetCore/Properties/launchSettings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "profiles": { - "Test.NetCore": { - "commandName": "Project" - } - } -} \ No newline at end of file diff --git a/Test.NetCore/Program.cs b/Tests/Test.NetCore/Program.cs similarity index 100% rename from Test.NetCore/Program.cs rename to Tests/Test.NetCore/Program.cs diff --git a/Test.NetCore/Test.NetCore.csproj b/Tests/Test.NetCore/Test.NetCore.csproj similarity index 55% rename from Test.NetCore/Test.NetCore.csproj rename to Tests/Test.NetCore/Test.NetCore.csproj index 10cd64b..10ab6e2 100644 --- a/Test.NetCore/Test.NetCore.csproj +++ b/Tests/Test.NetCore/Test.NetCore.csproj @@ -4,7 +4,7 @@ netcoreapp2.1 raylib-cs.ico x64 - Test.NetCore.Program + physics_demo true @@ -23,23 +23,12 @@ true false - - - - - - - - - - - - - - + + + - - - + + + diff --git a/Test.NetCore/raylib-cs.ico b/Tests/Test.NetCore/raylib-cs.ico similarity index 100% rename from Test.NetCore/raylib-cs.ico rename to Tests/Test.NetCore/raylib-cs.ico diff --git a/Test.NetCoreRT/Program.cs b/Tests/Test.NetCoreRT/Program.cs similarity index 100% rename from Test.NetCoreRT/Program.cs rename to Tests/Test.NetCoreRT/Program.cs diff --git a/Test.NetCoreRT/Test.NetCoreRT.csproj b/Tests/Test.NetCoreRT/Test.NetCoreRT.csproj similarity index 62% rename from Test.NetCoreRT/Test.NetCoreRT.csproj rename to Tests/Test.NetCoreRT/Test.NetCoreRT.csproj index 96755b8..f61cf39 100644 --- a/Test.NetCoreRT/Test.NetCoreRT.csproj +++ b/Tests/Test.NetCoreRT/Test.NetCoreRT.csproj @@ -20,21 +20,15 @@ true false - - - - - - - - - + + + - - - + + + diff --git a/Test.NetCoreRT/nuget.config b/Tests/Test.NetCoreRT/nuget.config similarity index 100% rename from Test.NetCoreRT/nuget.config rename to Tests/Test.NetCoreRT/nuget.config diff --git a/Test.NetCoreRT/raylib-cs.ico b/Tests/Test.NetCoreRT/raylib-cs.ico similarity index 100% rename from Test.NetCoreRT/raylib-cs.ico rename to Tests/Test.NetCoreRT/raylib-cs.ico diff --git a/Test.NetFX/App.config b/Tests/Test.NetFX/App.config similarity index 100% rename from Test.NetFX/App.config rename to Tests/Test.NetFX/App.config diff --git a/Test.NetFX/Program.cs b/Tests/Test.NetFX/Program.cs similarity index 100% rename from Test.NetFX/Program.cs rename to Tests/Test.NetFX/Program.cs diff --git a/Test.NetFX/Properties/AssemblyInfo.cs b/Tests/Test.NetFX/Properties/AssemblyInfo.cs similarity index 100% rename from Test.NetFX/Properties/AssemblyInfo.cs rename to Tests/Test.NetFX/Properties/AssemblyInfo.cs diff --git a/Test.NetFX/RayForm.cs b/Tests/Test.NetFX/RayForm.cs similarity index 78% rename from Test.NetFX/RayForm.cs rename to Tests/Test.NetFX/RayForm.cs index 9a20aa5..21e49e0 100644 --- a/Test.NetFX/RayForm.cs +++ b/Tests/Test.NetFX/RayForm.cs @@ -3,7 +3,8 @@ using System.Drawing; using System.Runtime.InteropServices; using System.Windows.Forms; using Raylib; -using static Raylib.Raylib; +using rl = Raylib.Raylib; +using Color = Raylib.Color; namespace Test.NetFX { @@ -55,11 +56,11 @@ namespace Test.NetFX private void Test() { - SetConfigFlags(ConfigFlag.FLAG_WINDOW_UNDECORATED); - InitWindow(800, 480, "Rayforms test"); - SetTargetFPS(60); + rl.SetConfigFlags(ConfigFlag.FLAG_WINDOW_UNDECORATED); + rl.InitWindow(800, 480, "Rayforms test"); + rl.SetTargetFPS(60); - IntPtr winHandle = GetWindowHandle(); + IntPtr winHandle = rl.GetWindowHandle(); Invoke(new Action(() => { SetWindowPos(winHandle, Handle, 0, 0, 0, 0, 0x0401 /*NOSIZE | SHOWWINDOW */); @@ -68,8 +69,7 @@ namespace Test.NetFX windowAttached = true; })); - // Main game loop - while (!WindowShouldClose()) // Detect window close button or ESC key + while (!rl.WindowShouldClose()) // Detect window close button or ESC key { // Update //---------------------------------------------------------------------------------- @@ -78,20 +78,17 @@ namespace Test.NetFX // Draw //---------------------------------------------------------------------------------- - BeginDrawing(); + rl.BeginDrawing(); + rl.ClearBackground(Color.RAYWHITE); - ClearBackground(RAYWHITE); + rl.DrawText("Congrats! You created your first window!", 190, 200, 20, Color.MAROON); + rl.DrawText(rl.GetFrameTime().ToString(), 100, 10, 15, Color.MAROON); + rl.DrawFPS(10, 10); - DrawText("Congrats! You created your first window!", 190, 200, 20, MAROON); - - DrawText(GetFrameTime().ToString(), 100, 10, 15, MAROON); - - DrawFPS(10, 10); - - EndDrawing(); + rl.EndDrawing(); //---------------------------------------------------------------------------------- } - CloseWindow(); + rl.CloseWindow(); } public static void Run() diff --git a/Test.NetFX/Test.NetFX.csproj b/Tests/Test.NetFX/Test.NetFX.csproj similarity index 86% rename from Test.NetFX/Test.NetFX.csproj rename to Tests/Test.NetFX/Test.NetFX.csproj index 0dd1fb4..cb70188 100644 --- a/Test.NetFX/Test.NetFX.csproj +++ b/Tests/Test.NetFX/Test.NetFX.csproj @@ -97,21 +97,6 @@ - - Easings.cs - - - Physac.cs - - - Raygui.cs - - - Raylib.cs - - - Raymath.cs - @@ -130,11 +115,12 @@ - + - - - + + + + \ No newline at end of file diff --git a/Test.NetFX/raylib-cs.ico b/Tests/Test.NetFX/raylib-cs.ico similarity index 100% rename from Test.NetFX/raylib-cs.ico rename to Tests/Test.NetFX/raylib-cs.ico