From 0911c3ab88a820479ac6ef7e0ac9acdcdf5be676 Mon Sep 17 00:00:00 2001 From: ChrisDill Date: Wed, 31 Jul 2019 17:51:20 +0100 Subject: [PATCH] Reviewed Tests project - Removed example browsing test. Focusing on examples being built on their own instead. - Removed old .projitems/.shproj from bindings and examples. - Simplified NetCore, NetCoreRT, NetFX tests into one that uses multitarget instead. --- Bindings/Raylib.projitems | 19 --- Bindings/Raylib.shproj | 13 -- Examples/Examples.projitems | 82 ------------- Examples/Examples.shproj | 13 -- Tests/Program.cs | 48 ++++++++ Tests/Test.NetCore/Program.cs | 11 -- Tests/Test.NetCore/Test.NetCore.csproj | 34 ------ Tests/Test.NetCoreRT/Program.cs | 11 -- Tests/Test.NetCoreRT/Test.NetCoreRT.csproj | 34 ------ Tests/Test.NetCoreRT/raylib-cs.ico | Bin 142667 -> 0 bytes Tests/Test.NetFX/App.config | 6 - Tests/Test.NetFX/Program.cs | 11 -- Tests/Test.NetFX/Properties/AssemblyInfo.cs | 36 ------ Tests/Test.NetFX/RayForm.cs | 99 --------------- Tests/Test.NetFX/Test.NetFX.csproj | 126 -------------------- Tests/Test.NetFX/raylib-cs.ico | Bin 142667 -> 0 bytes Tests/Tests.MultiTarget.csproj | 28 +++++ Tests/{Test.NetCoreRT => }/nuget.config | 0 Tests/{Test.NetCore => }/raylib-cs.ico | Bin 19 files changed, 76 insertions(+), 495 deletions(-) delete mode 100644 Bindings/Raylib.projitems delete mode 100644 Bindings/Raylib.shproj delete mode 100644 Examples/Examples.projitems delete mode 100644 Examples/Examples.shproj create mode 100644 Tests/Program.cs delete mode 100644 Tests/Test.NetCore/Program.cs delete mode 100644 Tests/Test.NetCore/Test.NetCore.csproj delete mode 100644 Tests/Test.NetCoreRT/Program.cs delete mode 100644 Tests/Test.NetCoreRT/Test.NetCoreRT.csproj delete mode 100644 Tests/Test.NetCoreRT/raylib-cs.ico delete mode 100644 Tests/Test.NetFX/App.config delete mode 100644 Tests/Test.NetFX/Program.cs delete mode 100644 Tests/Test.NetFX/Properties/AssemblyInfo.cs delete mode 100644 Tests/Test.NetFX/RayForm.cs delete mode 100644 Tests/Test.NetFX/Test.NetFX.csproj delete mode 100644 Tests/Test.NetFX/raylib-cs.ico create mode 100644 Tests/Tests.MultiTarget.csproj rename Tests/{Test.NetCoreRT => }/nuget.config (100%) rename Tests/{Test.NetCore => }/raylib-cs.ico (100%) diff --git a/Bindings/Raylib.projitems b/Bindings/Raylib.projitems deleted file mode 100644 index c126779..0000000 --- a/Bindings/Raylib.projitems +++ /dev/null @@ -1,19 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - f660ff67-d70e-4ae0-9080-d922243e9b6e - - - Raylib - - - - - - - - - - \ No newline at end of file diff --git a/Bindings/Raylib.shproj b/Bindings/Raylib.shproj deleted file mode 100644 index 2be244b..0000000 --- a/Bindings/Raylib.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - f660ff67-d70e-4ae0-9080-d922243e9b6e - 14.0 - - - - - - - - diff --git a/Examples/Examples.projitems b/Examples/Examples.projitems deleted file mode 100644 index 4fe020d..0000000 --- a/Examples/Examples.projitems +++ /dev/null @@ -1,82 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 36e54e2a-5899-4d4d-9d78-120db1b4c7b2 - - - Examples - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Examples/Examples.shproj b/Examples/Examples.shproj deleted file mode 100644 index 5949e1d..0000000 --- a/Examples/Examples.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 36e54e2a-5899-4d4d-9d78-120db1b4c7b2 - 14.0 - - - - - - - - diff --git a/Tests/Program.cs b/Tests/Program.cs new file mode 100644 index 0000000..a0c89af --- /dev/null +++ b/Tests/Program.cs @@ -0,0 +1,48 @@ +using Raylib; +using static Raylib.Raylib; + +namespace Tests +{ + class Program + { + static void Main(string[] args) + { + // Initialization + //-------------------------------------------------------------------------------------- + const int screenWidth = 800; + const int screenHeight = 450; + + InitWindow(screenWidth, screenHeight, "raylib [core] example - basic window"); + + SetTargetFPS(60); // Set our game to run at 60 frames-per-second + //-------------------------------------------------------------------------------------- + + // Main game loop + while (!WindowShouldClose()) // Detect window close button or ESC key + { + // Update + //---------------------------------------------------------------------------------- + // TODO: Update your variables here + //---------------------------------------------------------------------------------- + + // Draw + //---------------------------------------------------------------------------------- + BeginDrawing(); + + ClearBackground(Color.RAYWHITE); + + DrawText("Congrats! You created your first window!", 190, 200, 20, Color.LIGHTGRAY); + + EndDrawing(); + //---------------------------------------------------------------------------------- + } + + // De-Initialization + //-------------------------------------------------------------------------------------- + CloseWindow(); // Close window and OpenGL context + //-------------------------------------------------------------------------------------- + + return; + } + } +} diff --git a/Tests/Test.NetCore/Program.cs b/Tests/Test.NetCore/Program.cs deleted file mode 100644 index 3e77a51..0000000 --- a/Tests/Test.NetCore/Program.cs +++ /dev/null @@ -1,11 +0,0 @@ - -namespace Test.NetCore -{ - class Program - { - static void Main(string[] args) - { - Examples.Test.Run(args); - } - } -} diff --git a/Tests/Test.NetCore/Test.NetCore.csproj b/Tests/Test.NetCore/Test.NetCore.csproj deleted file mode 100644 index bc2a387..0000000 --- a/Tests/Test.NetCore/Test.NetCore.csproj +++ /dev/null @@ -1,34 +0,0 @@ - - - Exe - netcoreapp2.1 - raylib-cs.ico - x64 - - - - true - - - true - false - - - false - true - true - DEBUG;TRACE - - - true - false - - - - - - - - - - diff --git a/Tests/Test.NetCoreRT/Program.cs b/Tests/Test.NetCoreRT/Program.cs deleted file mode 100644 index 5a07db4..0000000 --- a/Tests/Test.NetCoreRT/Program.cs +++ /dev/null @@ -1,11 +0,0 @@ - -namespace Test.NetCoreRT -{ - class Program - { - static void Main(string[] args) - { - Examples.Test.Run(args); - } - } -} diff --git a/Tests/Test.NetCoreRT/Test.NetCoreRT.csproj b/Tests/Test.NetCoreRT/Test.NetCoreRT.csproj deleted file mode 100644 index d941b37..0000000 --- a/Tests/Test.NetCoreRT/Test.NetCoreRT.csproj +++ /dev/null @@ -1,34 +0,0 @@ - - - Exe - netcoreapp2.1 - raylib-cs.ico - AnyCPU;x64;x86 - core_basic_window - - - true - - - true - false - - - true - - - true - false - - - - - - - - - - - - - diff --git a/Tests/Test.NetCoreRT/raylib-cs.ico b/Tests/Test.NetCoreRT/raylib-cs.ico deleted file mode 100644 index 296d5dd59c742944d814a44152a05b1d2a8018f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142667 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 diff --git a/Tests/Test.NetFX/App.config b/Tests/Test.NetFX/App.config deleted file mode 100644 index 00bfd11..0000000 --- a/Tests/Test.NetFX/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Tests/Test.NetFX/Program.cs b/Tests/Test.NetFX/Program.cs deleted file mode 100644 index 6835a79..0000000 --- a/Tests/Test.NetFX/Program.cs +++ /dev/null @@ -1,11 +0,0 @@ - -namespace Test.NetFX -{ - class Program - { - static void Main(string[] args) - { - Examples.Test.Run(args); - } - } -} diff --git a/Tests/Test.NetFX/Properties/AssemblyInfo.cs b/Tests/Test.NetFX/Properties/AssemblyInfo.cs deleted file mode 100644 index 825cc70..0000000 --- a/Tests/Test.NetFX/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -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")] diff --git a/Tests/Test.NetFX/RayForm.cs b/Tests/Test.NetFX/RayForm.cs deleted file mode 100644 index 120e729..0000000 --- a/Tests/Test.NetFX/RayForm.cs +++ /dev/null @@ -1,99 +0,0 @@ -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()); - } - } -} diff --git a/Tests/Test.NetFX/Test.NetFX.csproj b/Tests/Test.NetFX/Test.NetFX.csproj deleted file mode 100644 index 2cf6d51..0000000 --- a/Tests/Test.NetFX/Test.NetFX.csproj +++ /dev/null @@ -1,126 +0,0 @@ - - - - - Debug - AnyCPU - {55D7BB37-3DC7-4A33-B21E-4F549EC988B5} - Exe - Test.NetFX - Test.NetFX - v4.6.1 - 512 - true - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - raylib-cs.ico - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - true - true - false - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - true - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - true - true - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - true - true - - - Test.NetFX.Program - - - - - - - - - - - - - - - - - - Form - - - - - - - - 4.5.1 - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Tests/Test.NetFX/raylib-cs.ico b/Tests/Test.NetFX/raylib-cs.ico deleted file mode 100644 index 296d5dd59c742944d814a44152a05b1d2a8018f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142667 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 diff --git a/Tests/Tests.MultiTarget.csproj b/Tests/Tests.MultiTarget.csproj new file mode 100644 index 0000000..9988494 --- /dev/null +++ b/Tests/Tests.MultiTarget.csproj @@ -0,0 +1,28 @@ + + + net40;net45;net46;net461;net462;netcoreapp2.1 + + + + Exe + netcoreapp2.1 + raylib-cs.ico + AnyCPU;x64;x86 + true + + + + + + + + + + + + + diff --git a/Tests/Test.NetCoreRT/nuget.config b/Tests/nuget.config similarity index 100% rename from Tests/Test.NetCoreRT/nuget.config rename to Tests/nuget.config diff --git a/Tests/Test.NetCore/raylib-cs.ico b/Tests/raylib-cs.ico similarity index 100% rename from Tests/Test.NetCore/raylib-cs.ico rename to Tests/raylib-cs.ico