Moved tests into their own folder.

Examples/Build.bat

@@ -1,2 +0,0 @@
-mingw32-make
-pause

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);
+			rl.ClearBackground(Color.WHITE);
-			DrawText("Hello, world!", 12, 12, 20, Color.BLACK);
+			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 as `int` to prevent the need for explicit casts.
-- Enums are passed in as type instead of int to avoid explicit casting to a int every time.
+- Color defines stored inside `Color`.
-- Added constructors for some of the types.
+- Uses `string.Format` in place of `TextFormat`.
 
-## Custom build
+# Extras
-1. Add [raygui](https://github.com/raysan5/raygui)
+- Structs have constructors.
-2. Add a file with the following
+- Operator overloading for math types.
-```c
-#include "raylib.h"
-#include "easings.h"
 
-#define PHYSAC_NO_THREADS
+# Contributing
-#define PHYSAC_IMPLEMENTATION 
-#include "physac.h"
-
-#define RAYGUI_IMPLEMENTATION
-#include "raygui.h"
-```
-
-## 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.

Test.NetCore/Properties/launchSettings.json

@@ -1,7 +0,0 @@
-{
-  "profiles": {
-    "Test.NetCore": {
-      "commandName": "Project"
-    }
-  }
-}

Tests/Test.NetCore/Program.cs

@@ -0,0 +1,11 @@
+
+namespace Test.NetCore
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Examples.Test.Run(args);
+        }
+    }
+}

Tests/Test.NetCore/Test.NetCore.csproj

@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <ApplicationIcon>raylib-cs.ico</ApplicationIcon>
+    <Platforms>x64</Platforms>
+    <StartupObject>physics_demo</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <Optimize>false</Optimize>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>true</Prefer32Bit>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <Import Project="..\..\Examples\Examples.projitems" Label="Shared" />
+  <Import Project="..\..\Examples\Examples.projitems" Label="Shared" />
+  <Import Project="..\..\Bindings\Raylib.projitems" Label="Shared" />
+  <Target Name="TestTarget" AfterTargets="Build">
+    <Copy Condition=" '$(Platform)' == 'x86' " SourceFiles="..\..\Bindings\native\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
+    <Copy Condition=" '$(Platform)' == 'AnyCPU' " SourceFiles="..\..\Bindings\native\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
+    <Copy Condition=" '$(Platform)' == 'x64' " SourceFiles="..\..\Bindings\native\x64\raylib.dll" DestinationFolder="$(TargetDir)" />
+  </Target>
+</Project>

Tests/Test.NetCoreRT/Program.cs

@@ -0,0 +1,11 @@
+
+namespace Test.NetCoreRT
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Examples.Test.Run(args);
+        }
+    }
+}

Tests/Test.NetCoreRT/Test.NetCoreRT.csproj

@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <ApplicationIcon>raylib-cs.ico</ApplicationIcon>
+    <Platforms>AnyCPU;x64;x86</Platforms>
+    <StartupObject>core_basic_window</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="1.0.0-alpha-27217-01" />
+  </ItemGroup>
+  <Import Project="..\..\Examples\Examples.projitems" Label="Shared" />
+  <Import Project="..\..\Examples\Examples.projitems" Label="Shared" />
+  <Import Project="..\..\Bindings\Raylib.projitems" Label="Shared" />
+  <Target Name="TestTarget" AfterTargets="Build">
+    <Copy Condition=" '$(Platform)' == 'x86' " SourceFiles="..\..\Bindings\native\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
+    <Copy Condition=" '$(Platform)' == 'AnyCPU' " SourceFiles="..\..\Bindings\native\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
+    <Copy Condition=" '$(Platform)' == 'x64' " SourceFiles="..\..\Bindings\native\x64\raylib.dll" DestinationFolder="$(TargetDir)" />
+  </Target>
+</Project>

Tests/Test.NetCoreRT/nuget.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <packageSources>
+    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+    <clear />
+    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+ </packageSources>
+</configuration>

Tests/Test.NetFX/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
+</configuration>

Tests/Test.NetFX/Program.cs

@@ -0,0 +1,11 @@
+
+namespace Test.NetFX
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Examples.Test.Run(args);
+        }
+    }
+}

Tests/Test.NetFX/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Test.NetFX")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Test.NetFX")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("55d7bb37-3dc7-4a33-b21e-4f549ec988b5")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Tests/Test.NetFX/RayForm.cs

@@ -0,0 +1,99 @@
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using Raylib;
+using rl = Raylib.Raylib;
+using Color = Raylib.Color;
+
+namespace Test.NetFX
+{
+    public partial class RayForms : Form
+    {
+        private Panel gamePanel;
+        private bool windowAttached = false;
+
+        #region WinAPI Entry Points
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr SetWindowPos(IntPtr handle, IntPtr handleAfter, int x, int y, int cx, int cy, uint flags);
+        [DllImport("user32.dll")]
+        private static extern IntPtr SetParent(IntPtr child, IntPtr newParent);
+        [DllImport("user32.dll")]
+        private static extern IntPtr ShowWindow(IntPtr handle, int command);
+
+        #endregion
+
+        public RayForms()
+        {
+            Size = new Size(1024, 700);
+            Text = "Rayforms";
+
+            gamePanel = new Panel();
+            gamePanel.Size = new Size(800, 500);
+            gamePanel.Location = new Point(50, 50);
+
+            Button button = new Button();
+            button.Text = "Attach window";
+            button.Size = new Size(150, 20);
+            button.Location = new Point(
+                (Size.Width / 2) - (button.Size.Width / 2),
+                gamePanel.Location.Y + gamePanel.Size.Height + 10
+            );
+            button.Click += new EventHandler(ClickedButton);
+            Controls.Add(button);
+            Controls.Add(gamePanel);
+        }
+
+        private void ClickedButton(object sender, EventArgs e)
+        {
+            if (!windowAttached)
+            {
+                // new Thread(Test).Start();
+                Test();
+            }
+        }
+
+        private void Test()
+        {
+            rl.SetConfigFlags(ConfigFlag.FLAG_WINDOW_UNDECORATED);
+            rl.InitWindow(800, 480, "Rayforms test");
+            rl.SetTargetFPS(60);
+
+            IntPtr winHandle = rl.GetWindowHandle();
+            Invoke(new Action(() =>
+            {
+                SetWindowPos(winHandle, Handle, 0, 0, 0, 0, 0x0401 /*NOSIZE | SHOWWINDOW */);
+                SetParent(winHandle, gamePanel.Handle);
+                ShowWindow(winHandle, 1);
+                windowAttached = true;
+            }));
+
+            while (!rl.WindowShouldClose())    // Detect window close button or ESC key
+            {
+                // Update
+                //----------------------------------------------------------------------------------
+                // TODO: Update your variables here
+                //----------------------------------------------------------------------------------
+
+                // Draw
+                //----------------------------------------------------------------------------------
+                rl.BeginDrawing();
+                rl.ClearBackground(Color.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);
+
+                rl.EndDrawing();
+                //----------------------------------------------------------------------------------
+            }
+            rl.CloseWindow();
+        }
+
+        public static void Run()
+        {
+            Application.Run(new RayForms());
+        }
+    }
+}

Tests/Test.NetFX/Test.NetFX.csproj

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{55D7BB37-3DC7-4A33-B21E-4F549EC988B5}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Test.NetFX</RootNamespace>
+    <AssemblyName>Test.NetFX</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>raylib-cs.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>Test.NetFX.Program</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RayForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Memory">
+      <Version>4.5.1</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="raylib-cs.ico" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="..\..\Examples\Examples.projitems" Label="Shared" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="AfterBuild">
+    <Copy Condition=" '$(Platform)' == 'x86' " SourceFiles="..\..\Bindings\native\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
+    <Copy Condition=" '$(Platform)' == 'AnyCPU' " SourceFiles="..\..\Bindings\native\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
+    <Copy Condition=" '$(Platform)' == 'x64' " SourceFiles="..\..\Bindings\native\x64\raylib.dll" DestinationFolder="$(TargetDir)" />
+  </Target>
+  <Import Project="..\..\Bindings\Raylib.projitems" Label="Shared" />
+</Project>