Tidying up project

- Added Release folder for important dlls that will be used in nuget package
- Moved Rayforms into Examples folder
- Added updated generator(WIP)

Bindings/Bindings.csproj

@@ -84,9 +84,6 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="RayForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="Easings.cs" />
     <Compile Include="Physac.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -98,10 +95,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="RayForm.resx">
-      <DependentUpon>RayForm.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Bindings/Raygui.cs

@@ -1,7 +1,7 @@
 /**********************************************************************************************
  * 
  * Raygui
- * https://github.com/raysan5/raygui/blob/master/src/raygui.h
+ * Original - https://github.com/raysan5/raygui/blob/master/src/raygui.h
  * 
 **********************************************************************************************/
 

Bindings/Raylib.cs

@@ -744,6 +744,30 @@ namespace Raylib
 		[DllImport(nativeLibName)]
 		public static extern int GetScreenHeight();
 
+         // Get number of connected monitors
+        [DllImport(nativeLibName)]
+        public static extern int GetMonitorCount();
+
+        // Get primary monitor width
+        [DllImport(nativeLibName)]
+        public static extern int GetMonitorWidth(int monitor);
+
+        // Get primary monitor height
+        [DllImport(nativeLibName)]
+        public static extern int GetMonitorHeight(int monitor);
+
+        // Get primary monitor physical width in millimetres
+        [DllImport(nativeLibName)]
+        public static extern int GetMonitorPhysicalWidth(int monitor);
+
+        // Get primary monitor physical height in millimetres
+        [DllImport(nativeLibName)]
+        public static extern int GetMonitorPhysicalHeight(int monitor);
+
+        // Get the human-readable, UTF-8 encoded name of the primary monitor
+        [DllImport(nativeLibName)]
+        public static extern string GetMonitorName(int monitor);
+
 	    // Get current clipboard text
 		//[DllImport(nativeLibName)]
 		//public static extern string GetClipboard();

Bindings/Raymath.cs

@@ -111,12 +111,24 @@ namespace Raylib
             return Raylib.Vector2Normalize(v);
         }
 
-        // extra operators(Vector2Add(v1, v2) -> v1 += v2);
+        // operators
         [DllImport(Raylib.nativeLibName, EntryPoint = "Vector2Add")]
-        public static extern Vector2 operator +(Vector2 v1, Vector2 v2);
+        public static extern Vector2 operator +(Vector2 v1, Vector2 v3);
 
         [DllImport(Raylib.nativeLibName, EntryPoint = "Vector2Subtract")]
-        public static extern Vector2 operator -(Vector2 v1, Vector2 v2);
+        public static extern Vector2 operator -(Vector2 v1, Vector2 v3);
+
+        [DllImport(Raylib.nativeLibName, EntryPoint = "Vector2MultiplyV")]
+        public static extern Vector2 operator *(Vector2 v1, Vector2 v3);
+
+        [DllImport(Raylib.nativeLibName, EntryPoint = "Vector2Scale")]
+        public static extern Vector2 operator *(Vector2 v1, float scale);
+
+        [DllImport(Raylib.nativeLibName, EntryPoint = "Vector2Divide")]
+        public static extern Vector2 operator /(Vector2 v1, Vector2 v3);
+
+        [DllImport(Raylib.nativeLibName, EntryPoint = "Vector2Negate")]
+        public static extern Vector2 operator -(Vector2 v1);
     }
 
     // Vector3 type

Bindings/core_basic_window.cs

@@ -1 +0,0 @@
-
using Raylib;
using static Raylib.Raylib;

public partial class Examples
{
    /*******************************************************************************************
    *
    *   raylib [core] example - Basic window
    *
    *   Welcome to raylib!
    *
    *   To test examples, just press F6 and execute raylib_compile_execute script
    *   Note that compiled executable is placed in the same folder as .c file
    *
    *   You can find all basic examples on C:\raylib\raylib\examples folder or
    *   raylib official webpage: www.raylib.com
    *
    *   Enjoy using raylib. :)
    *
    *   This example has been created using raylib 1.0 (www.raylib.com)
    *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
    *
    *   Copyright (c) 2013-2016 Ramon Santamaria (@raysan5)
    *
    ********************************************************************************************/
    
    public static int core_basic_window()
    {
        // Initialization
        //--------------------------------------------------------------------------------------
        int screenWidth = 800;
        int screenHeight = 450;
    
        InitWindow(screenWidth, screenHeight, "raylib [core] example - basic window");
        
        SetTargetFPS(60);
        //--------------------------------------------------------------------------------------
    
        // Main game loop
        while (!WindowShouldClose())    // Detect window close button or ESC key
        {
            // Update
            //----------------------------------------------------------------------------------
            // TODO: Update your variables here
            //----------------------------------------------------------------------------------
    
            // Draw
            //----------------------------------------------------------------------------------
            BeginDrawing();
    
                ClearBackground(RAYWHITE);
    
                DrawText("Congrats! You created your first window!", 190, 200, 20, MAROON);
    
            EndDrawing();
            //----------------------------------------------------------------------------------
        }
    
        // De-Initialization
        //--------------------------------------------------------------------------------------   
        CloseWindow();        // Close window and OpenGL context
        //--------------------------------------------------------------------------------------
    
        return 0;
    }
}

Examples/Properties/AssemblyInfo.cs

@@ -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("Examples")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Examples")]
-[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("2b152086-45ad-4dd2-a9a5-32aec4fe608c")]
-
-// 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")]

Examples/RayForm.cs

@@ -6,23 +6,29 @@ using static Raylib.Raylib;
 
 namespace Raylib
 {
-    class DrawControl : Form
+    class RayForm : Form
     {
         private Panel panel;
 
+        #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 static void Run()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new DrawControl());
+            Application.Run(new RayForm());
         }
 
-        public DrawControl()
+        public RayForm()
         {
             panel = new Panel();
             panel.Size = new Size(640, 480);
@@ -49,4 +55,4 @@ namespace Raylib
 
         }
     }
-}
+}

Generator/Generator.cs

@@ -7,39 +7,8 @@ namespace Raylibcs
 {
     static class Generator
     {
-        public static string template = @"
-using System;
-using System.Runtime.InteropServices;
-
-namespace Raylib
-{
-    public static partial class rl
-    {
-        #region Raylib-cs Variables
-
-        // Used by DllImport to load the native library.
-        private const string nativeLibName = 'raylib.dll';
-
-        #endregion
-
-        #region Raylib-cs Functions 
-
-{{ CONTENT }}
-    }
-}
-";
-
-        public static string exampleTemplate = @"
-using Raylib;
-using static Raylib.Raylib;
-
-public partial class Examples
-{
-{{ CONTENT }}
-}";
-
         public static string RaylibDirectory = "C:\\raylib\\raylib\\";
-        public static string InstallDirectory = "C:\\raylib\\raylib\\src\\";
+        public static string RaylibDirectory2 = "C:\\Users\\Chris\\Documents\\projects\\raylib\\";
 
         // string extensions
         private static string CapitalizeFirstCharacter(string format)
@@ -62,11 +31,12 @@ public partial class Examples
         // testing regex
         public static string ReplaceEx(this string input, string pattern, string replacement)
         {
-            input = input.Replace("\r", "\r\n");
+            var matches = Regex.Matches(input, pattern);
-            foreach (Match match in Regex.Matches(input, pattern))
+            foreach (Match match in matches)
             {
-                Console.WriteLine(match.Value);
+                //Console.WriteLine(match.Value);
             }
+            // Console.WriteLine(matches.Count);
             //return input;
  
             //var match = Regex.IsMatch(input, pattern);
@@ -76,9 +46,13 @@ public partial class Examples
         // Create binding code
         public static void Process(string filePath, string api)
         {
-            var lines = File.ReadAllLines(InstallDirectory + filePath);
+            var lines = File.ReadAllLines(RaylibDirectory + "src//" + filePath);
             var output = "";
 
+            output += "using Raylib;\n";
+            output += "using static Raylib.Raylib;\n\n";
+            output += "public partial class Examples\n{\n";
+
             // convert functions to c#
             foreach (string line in lines)
             {
@@ -94,8 +68,11 @@ public partial class Examples
             }
             output += "\t\t#endregion\n";
 
+            //output += text;
+            output += "\n}";
+
             // convert syntax to c#
-            output = template.Replace("{{ CONTENT }}", output);
+            //output = template.Replace("{{ CONTENT }}", output);
 
             output = output.Replace("(void)", "()");
             output = output.Replace("const char *", "string ");
@@ -120,38 +97,109 @@ public partial class Examples
 
         // Convert c style to c#
         // Design is close to raylib so only a few changes needed
-        public static void ProcessExample(string file, string dirName)
+        public static void ProcessExample(string file, string folder, string path)
         {
+            // fix #defines
+            // fix structs
+            // fix enums
+            // remove return 0 for main
+            // fix {} initialization(not all cases covered)
+
+            // load and setup
             var fileName = Path.GetFileNameWithoutExtension(file);
             var text = File.ReadAllText(file);
+            var result = "";
+            var output = "";
+            output += "using Raylib;\n";
+            output += "using static Raylib.Raylib;\n\n";
+            output += "public partial class " + folder + "\n{\n";
+            // text = text.Replace("\r", "\r\n");
 
-            // indent since example will be in Examples namespace
+            // rough file conversion
-            text = text.Indent(4);
+            string[] lines = text.Split('\n');
-
+            for (int i = 0; i < lines.Length; i++)
-            // add template and fill in content
-            var output = exampleTemplate;
-            output = output.Replace("{{ CONTENT }}", text);
-            //output = output.Replace("int main()", "public static int " + fileName + "()");
-            //output = output.Replace("#include \"raylib.h\"", "");
-
-            // test regex on one file for now
-            if (fileName == "core_2d_camera")
             {
-                // remove #include lines
+                string line = lines[i];
 
-                // #define x y -> private const int x = y;
+                // ignore certain preprocess symbols
-                //output = output.ReplaceEx(@"#define (\w+).*?(\d+)", "private const int $1 = $2;");
+                if (line.Contains("#include"))
+                    continue;
+                else if (line.Contains("#if"))
+                    continue;
+                else if (line.Contains("#else"))
+                    continue;
+                else if (line.Contains("#endif"))
+                    continue;
 
-                // (Type){...} -> new Type(...);
+                else if (line.Contains("#define"))
-                // output = output.ReplaceEx(@"(\((\w+)\).*?{.*})", @"");
+                {
-                // output = output.ReplaceEx(@"\((\w +)\).*{ (.*)}", @"new $1($2)");
+                    var str = line.Replace("#define", "");
+                    var arr = str.Trim().Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                    if (arr.Length < 2)
+                        continue;
+
+                    bool isNumeric = int.TryParse(arr[1], out var n);
+                    if (isNumeric)
+                        result += "public const int " + arr[0] + " = " + arr[1] + ";\r\n";
+                    else
+                        result += "public const string " + arr[0] + " = " + arr[1] + ";\r\n";
+                }
+
+                // change main signature
+                else if (line.StartsWith("int main"))
+                    result += "public static void Main()\r\n";
+
+                // remove typedef and mark members as public
+                else if (line.StartsWith("typedef struct"))
+                {
+                    var members = "";
+                    while (!line.StartsWith("}"))
+                    {
+                        i++;
+                        line = lines[i];
+                        members += "public " + line + "\n";
+                    }
+
+                    line = line.Replace(" ", "");
+                    line = line.Replace("}", "");
+                    line = line.Replace(";", "");
+                    result += "struct " + line + "{\n\n";
+                    result += members;
+                }
+
+                // copy line by default
+                else
+                    result += line + "\n";
             }
 
-            //output = output.ReplaceEx(@"#define (\w+) (\w+)", @"struct 1 public 2 public 3 public 4");
+            // regex
 
-            var path = "Examples\\" + dirName + "\\" + fileName + ".cs";
+            // (Type){...} -> new Type(...)
-            File.WriteAllText(path, output);
+            // e.g (Vector2){ 100, 100 } -> new Vector2( 100, 100 );
+            result = result.ReplaceEx(@"\((\w+)\){(.*)}", @"new $1($2);");
+            result = result.ReplaceEx(@"\((\w+)\) \w+ = {(.*)}", @"new $1($2);");
 
+            // Type name[size] -> Type[] name = new Type[size];
+            // e.g Rectangle buildings[MAX_BUILDINGS]; -> Rectangle[] buildings = new Rectangle[MAX_BUILDINGS];
+            result = result.ReplaceEx(@"(\w+) (\w+)\[(.*)\];", "$1[] $2 = new $1[$3];");
+
+            result = result.Replace("Music ", "IntPtr ");
+            result = result.Replace("(void)", "()");
+
+            // defines to enums(might use defines as variables aswell not sure)
+            result = result.ReplaceEx(@"KEY_(\w+)", @"(int)Key.$1");
+            result = result.ReplaceEx(@"MOUSE_(\w+)", @"(int)Mouse.$1");
+            result = result.ReplaceEx(@"FLAG_(\w+)", @"(int)Flag.$1");
+            // result = result.ReplaceEx(@"FLAG_(\w+)", @"(int)Flag.$1");
+
+            // add result
+            result = result.Indent(4);
+            output += result;
+            output += "\n}\n";
+
+            // saves relative to executable location
+            var loc = path + "//" + fileName + ".cs";
+            File.WriteAllText(loc, output);
             Console.WriteLine("Generated " + fileName + ".cs");
         }
     }

Generator/Generator.csproj

@@ -31,6 +31,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>raylib-cs.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -49,5 +52,8 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="raylib-cs.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Generator/Program.cs

@@ -4,8 +4,8 @@ using System.IO;
 namespace Raylibcs
 {
     /// <summary>
-    /// Rough generator for Raylib-cs to help automate binding porting raylib code
+    /// Rough generator for Raylib-cs to help automate binding + porting raylib code
-    /// Output will still need to be modified as it is a work in progess
+    /// Output will still need to be modified
     /// </summary>
     class Program
     {
@@ -13,10 +13,10 @@ namespace Raylibcs
         {
             Console.WriteLine("Raylib-cs generator");
 
-            //GenerateBindings();
+            GenerateBindings();
             GenerateExamples();
-            //GenerateTemplates();
+            GenerateTemplates();
-            //GenerateGames();
+            GenerateGames();
 
             Console.WriteLine("Finished generating. Enjoy! :)");
             Console.WriteLine("Press enter to exit");
@@ -26,7 +26,8 @@ namespace Raylibcs
         static void GenerateBindings()
         {
             Console.WriteLine("Generating bindings");
-            // Generator.Generate("raylib.h", "RLAPI");
+            Generator.Process("raylib.h", "RLAPI");
+            Generator.Process("rlgl.h", "RLGL");
         }
 
         static void GenerateExamples()
@@ -34,39 +35,91 @@ namespace Raylibcs
             Console.WriteLine("Generating examples");
 
             // output folder
-            Directory.CreateDirectory("Examples");
+            var folder = "Examples";
-
+            Directory.CreateDirectory(folder);
-            // load files
+            var path = Generator.RaylibDirectory + folder.ToLower();
-            var path = Generator.RaylibDirectory + "Examples";
             var dirs = Directory.GetDirectories(path);
 
-            // convert each file to rough c# version
+            var files = Directory.GetFiles(path, "*.c", SearchOption.AllDirectories);
-            foreach (var dir in dirs)
+            foreach (var file in files)
             {
                 // create sub folder in output
-                var dirName = new DirectoryInfo(dir).Name;
+                var dirName = Path.GetDirectoryName(file);
-                Directory.CreateDirectory("Examples\\" + dirName);
+                var name = new DirectoryInfo(dirName).Name;
-                var files = Directory.GetFiles(dir, "*.c");
+                if (!Directory.Exists(folder + name))
-
+                    Directory.CreateDirectory(folder + "//" + name);
-                foreach (var file in files)
+                Generator.ProcessExample(file, folder, folder + "//" + name);
-                {
-                    Generator.ProcessExample(file, dirName);
-                }
             }
         }
 
         static void GenerateTemplates()
         {
             Console.WriteLine("Generating templates");
-            // TODO
 
+            // output folder
+            var folder = "Templates";
+            Directory.CreateDirectory(folder);
+            var path = Generator.RaylibDirectory2 + folder.ToLower();
+            var dirs = Directory.GetDirectories(path);
+
+            // copy folder structure
+            foreach (string dirPath in Directory.GetDirectories(path, "*",
+    SearchOption.AllDirectories))
+                Directory.CreateDirectory(dirPath.Replace(path, folder));
+
+            // process all c files in directory and output result
+            var files = Directory.GetFiles(path, "*.c", SearchOption.AllDirectories);
+            foreach (var file in files)
+            {
+                var dirName = Path.GetDirectoryName(file);
+                var name = new DirectoryInfo(dirName).Name;
+                if (name == folder.ToLower())
+                {
+                    Generator.ProcessExample(file, folder, folder);
+                }
+                else
+                {
+                    var t = file;
+                    t = folder + t.Replace(path, "");
+                    t = new FileInfo(t).Directory.FullName;
+                    Generator.ProcessExample(file, folder, t);
+                }
+            }
         }
 
         static void GenerateGames()
         {
             Console.WriteLine("Generating games");
-            // TODO
+          
+            // output folder
+            var folder = "Games";
+            Directory.CreateDirectory(folder);
+            var path = Generator.RaylibDirectory2 + folder.ToLower();
+            var dirs = Directory.GetDirectories(path);
 
+            // copy folder structure
+            foreach (string dirPath in Directory.GetDirectories(path, "*",
+    SearchOption.AllDirectories))
+                Directory.CreateDirectory(dirPath.Replace(path, folder));
+
+            // process all c files in directory and output result
+            var files = Directory.GetFiles(path, "*.c", SearchOption.AllDirectories);
+            foreach (var file in files)
+            {
+                var dirName = Path.GetDirectoryName(file);
+                var name = new DirectoryInfo(dirName).Name;
+                if (name == folder.ToLower())
+                {
+                    Generator.ProcessExample(file, folder, folder);
+                }
+                else
+                {
+                    var t = file;
+                    t = folder + t.Replace(path, "");
+                    t = new FileInfo(t).Directory.FullName;
+                    Generator.ProcessExample(file, folder, t);
+                }
+            }
         }
     }
 }

README.md

@@ -11,6 +11,9 @@ Bindings:
 * Raylib
 * Raymath
 
+Currently the only difference to raylib is changing interger constants to enums.
+For example KEY_ENTER becomes Key.ENTER.
+
 ## Installation
 Tested on windows 10 64 bit using the mono compiler.
 
@@ -42,19 +45,6 @@ static class Program
 }
 ```
 
-# TODO:
-- Generator improvements
-- .Net Core support
-- Windows forms support
-- Auto select x86/x64 dll
-
-# Differences
-- interger constants are enums. 
-KEY_ENTER -> Key.ENTER
-
-- types changed to work with C#. 
-char * -> string
-
 ## 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