Initial update to raylib 2.5

- Still a work in progress

Bindings/Easings.cs

@@ -1,5 +1,5 @@
-/* Raylib-cs
+/* Easings.cs
- * Easings.cs - Useful easing functions for values animation
+*
 * Copyright 2019 Chris Dill
 *
 * Release under zLib License.

Bindings/Extensions.cs

@@ -1,5 +1,5 @@
-/* Raylib-cs
+/* Extensions.cs
- * Extensions.cs - Higher level features over bindings. This file is not automatically generated.
+*
 * Copyright 2019 Chris Dill
 *
 * Release under zLib License.
@@ -8,14 +8,51 @@
 
 using System;
 using System.Text;
-using System.Numerics;
+using System.Runtime.InteropServices;
 
 namespace Raylib
 {
-    // Extensions to the raylib bindings.
+    // Extra functions over exsiting bindings
-    // Seperate for easier code generation.
+    // Feel free to modifiy this to fit your project.
     public partial class Raylib
     {
+        public static PhysicsBodyData CreatePhysicsBodyCircleEx(Vector2 pos, float radius, float density)
+        {
+            var body = CreatePhysicsBodyCircle(pos, radius, density);
+            var data = (PhysicsBodyData)Marshal.PtrToStructure(body, typeof(PhysicsBodyData));
+            return data;
+        }
+
+        public static PhysicsBodyData CreatePhysicsBodyRectangleEx(Vector2 pos, float width, float height, float density)
+        {
+            var body = CreatePhysicsBodyRectangle(pos, width, height, density);
+            var data = (PhysicsBodyData)Marshal.PtrToStructure(body, typeof(PhysicsBodyData));
+            return data;
+        }
+
+        public static PhysicsBodyData GetPhysicsBodyEx(int index)
+        {
+            var body = GetPhysicsBodyImport(index);
+            var data = (PhysicsBodyData)Marshal.PtrToStructure(body, typeof(PhysicsBodyData));
+            return data;
+        }
+
+        public static PhysicsBodyData CreatePhysicsBodyPolygonEx(Vector2 pos, float radius, int sides, float density)
+        {
+            var body = CreatePhysicsBodyPolygon(pos, radius, sides, density);
+            var data = (PhysicsBodyData)Marshal.PtrToStructure(body, typeof(PhysicsBodyData));
+            return data;
+        }
+
+        public static void DrawRenderTexture(RenderTexture2D target)
+        {
+            int screenWidth = GetScreenWidth();
+            int screenHeight = GetScreenHeight();
+
+            // NOTE: Render texture must be y-flipped due to default OpenGL coordinates (left-bottom)
+            DrawTexturePro(target.texture, new Rectangle(0, 0, target.texture.width, -target.texture.height), new Rectangle(0, 0, screenWidth, screenHeight), new Vector2(0, 0), 0, Color.WHITE);
+        }
+
         // extension providing SubText
         public static string SubText(this string input, int position, int length)
         {
@@ -74,45 +111,6 @@ namespace Raylib
         }
     }
 
-    // Small utility for tweening values
-    public struct Tween
-    {
-        public delegate float Callback(float t, float b, float c, float d);
-        public Callback easer;
-        public float start;
-        public float end;
-        public float currentTime;
-        public float duration;
-        public bool completed;
-
-        public Tween(Callback easer, float start, float end, float duration)
-        {
-            this.easer = easer;
-            this.start = start;
-            this.end = end;
-            this.currentTime = 0f;
-            this.duration = duration;
-            this.completed = false;
-        }
-
-        public void Reset()
-        {
-            currentTime = 0f;
-            completed = false;
-        }
-
-        public float Apply(float dt)
-        {
-            currentTime += dt;
-            if (currentTime > duration)
-            {
-                currentTime = duration;
-                completed = true;
-            }
-            return easer(currentTime, start, end - start, duration);
-        }
-    }
-
     public partial struct Color
     {
         // Example - Color.RED instead of RED
@@ -160,29 +158,9 @@ namespace Raylib
             this.a = Convert.ToByte(a);
         }
 
-        internal string DebugDisplayString
+        public override string ToString()
         {
-            get
+            return string.Concat(r.ToString(), " ", g.ToString(), " ", b.ToString(), " ", a.ToString());
-            {
-                return string.Concat(
-                    r.ToString(), " ",
-                    g.ToString(), " ",
-                    b.ToString(), " ",
-                    a.ToString()
-                );
-            }
-        }
-
-		// Performs linear interpolation of <see cref="Color"/>.
-		public static Color Lerp(Color value1, Color value2, float amount)
-        {
-            amount = Raylib.Clamp(amount, 0.0f, 1.0f);
-            return new Color(
-                (int)Raylib.Lerp(value1.r, value2.r, amount),
-                (int)Raylib.Lerp(value1.g, value2.g, amount),
-                (int)Raylib.Lerp(value1.b, value2.b, amount),
-                (int)Raylib.Lerp(value1.a, value2.a, amount)
-            );
         }
     }
 
@@ -197,15 +175,6 @@ namespace Raylib
         }
     }
 
-    public partial struct BoundingBox
-    {
-        public BoundingBox(Vector3 min, Vector3 max)
-        {
-            this.min = min;
-            this.max = max;
-        }
-    }
-    
     public partial struct Camera3D
     {
         public Camera3D(Vector3 position, Vector3 target, Vector3 up, float fovy = 90, CameraType type = CameraType.CAMERA_PERSPECTIVE)
@@ -227,17 +196,6 @@ namespace Raylib
         }
     }
 
-    public partial struct RayHitInfo
-    {
-        public RayHitInfo(bool hit, float distance, Vector3 position, Vector3 normal)
-        {
-            this.hit = hit;
-            this.distance = distance;
-            this.position = position;
-            this.normal = normal;
-        }
-    }
-
     // Utlity for accessing math functions through struct
     public partial struct Vector2
     {
@@ -253,11 +211,25 @@ namespace Raylib
             this.y = value;
         }
 
-        public override bool Equals(object obj) => (obj is Vector2) && Equals((Vector2)obj);
+        public override bool Equals(object obj)
-        public override int GetHashCode() => x.GetHashCode() + y.GetHashCode();
+        {
+            return (obj is Vector2) && Equals((Vector2)obj);
+        }
 
-        public float Length() => Raylib.Vector2Length(this);
+        public override int GetHashCode()
-        public float LengthSquared() => (x * x) + (y * y);
+        {
+            return x.GetHashCode() + y.GetHashCode();
+        }
+
+        public float Length()
+        {
+            return Raylib.Vector2Length(this);
+        }
+
+        public float LengthSquared()
+        {
+            return (x * x) + (y * y);
+        }
 
         public override string ToString()
         {
@@ -266,15 +238,15 @@ namespace Raylib
 
         // common values
         public static Vector2 Zero { get { return Raylib.Vector2Zero(); } }
-
         public static Vector2 One { get { return Raylib.Vector2One(); } }
-
         public static Vector2 UnitX { get { return new Vector2(1, 0); } }
-
         public static Vector2 UnitY { get { return new Vector2(0, 1); } }
 
         // convienient operators
-        public static bool operator ==(Vector2 v1, Vector2 v2) => (v1.x == v2.x && v1.y == v2.y);
+        public static bool operator ==(Vector2 v1, Vector2 v2) 
+        {
+            return (v1.x == v2.x && v1.y == v2.y);
+        }
         
         public static bool operator !=(Vector2 v1, Vector2 v2)
         {
@@ -303,7 +275,7 @@ namespace Raylib
 
         public static Vector2 operator *(Vector2 v1, Vector2 v2)
         {
-            return Raylib.Vector2Multiplyv(v1, v2);
+            return Raylib.Vector2MultiplyV(v1, v2);
         }
 
         public static Vector2 operator *(Vector2 v, float scale)
@@ -331,14 +303,6 @@ namespace Raylib
             return Raylib.Vector2Negate(v1);
         }
 
-        public static Vector2 Lerp(Vector2 value1, Vector2 value2, float amount)
-        {
-            return new Vector2(
-                Raylib.Lerp(value1.x, value2.x, amount),
-                Raylib.Lerp(value1.y, value2.y, amount)
-            );
-        }
-
         public static float Length(Vector2 v)
         {
             return Raylib.Vector2Length(v);
@@ -405,8 +369,7 @@ namespace Raylib
         {
             return new Vector2(
                 v1.x > v2.x ? v1.x : v2.x,
-                v1.y > v2.y ? v1.y : v2.y
+                v1.y > v2.y ? v1.y : v2.y);
-            );
         }
 
         // Creates a new <see cref="Vector2"/> that contains a minimal values from the two vectors.
@@ -414,8 +377,7 @@ namespace Raylib
         {
             return new Vector2(
                 v1.x < v2.x ? v1.x : v2.x,
-                v1.y < v2.y ? v1.y : v2.y
+                v1.y < v2.y ? v1.y : v2.y);
-            );
         }
 
         // Clamps the specified value within a range.
@@ -423,12 +385,10 @@ namespace Raylib
         {
             return new Vector2(
                 Raylib.Clamp(value1.x, min.x, max.x),
-                Raylib.Clamp(value1.y, min.y, max.y)
+                Raylib.Clamp(value1.y, min.y, max.y));
-            );
         }
     }
 
-
     // Vector3 type
     public partial struct Vector3
     {
@@ -447,8 +407,15 @@ namespace Raylib
         }
 
         // extensions
-        public override bool Equals(object obj) => (obj is Vector3) && Equals((Vector3)obj);
+        public override bool Equals(object obj)
-        public override int GetHashCode() => x.GetHashCode() + y.GetHashCode() + z.GetHashCode();
+        {
+            return (obj is Vector3) && Equals((Vector3)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return x.GetHashCode() + y.GetHashCode() + z.GetHashCode();
+        }
 
         public override string ToString()
         {
@@ -463,26 +430,62 @@ namespace Raylib
         public static Vector3 UnitZ { get { return new Vector3(0, 0, 1); } }
 
         // convienient operators
-        public static bool operator ==(Vector3 v1, Vector3 v2) => (v1.x == v2.x && v1.y == v2.y && v1.z == v2.z);
+        public static bool operator ==(Vector3 v1, Vector3 v2) 
-        public static bool operator !=(Vector3 v1, Vector3 v2) => !(v1 == v2);
+        { return (v1.x == v2.x && v1.y == v2.y && v1.z == v2.z);}
-        public static bool operator >(Vector3 v1, Vector3 v2) => v1.x > v2.x && v1.y > v2.y && v1.z > v2.z;
-        public static bool operator <(Vector3 v1, Vector3 v2) => v1.x < v2.x && v1.y < v2.y && v1.z < v2.z;
-        public static Vector3 operator +(Vector3 v1, Vector3 v2) => Raylib.Vector3Add(v1, v2);
-        public static Vector3 operator -(Vector3 v1, Vector3 v2) => Raylib.Vector3Subtract(v1, v2);
-        public static Vector3 operator *(Vector3 v1, Vector3 v2) => Raylib.Vector3MultiplyV(v1, v2);
-        public static Vector3 operator *(Vector3 v, float scale) => Raylib.Vector3Scale(v, scale);
-        public static Vector3 operator *(float scale, Vector3 v) => Raylib.Vector3Scale(v, scale);
-        public static Vector3 operator /(Vector3 v1, Vector3 v2) => Raylib.Vector3DivideV(v1, v2);
-        public static Vector3 operator /(Vector3 v1, float div) => Raylib.Vector3Divide(v1, div);
-        public static Vector3 operator -(Vector3 v1) => Raylib.Vector3Negate(v1);
 
-        public static Vector3 Lerp(Vector3 value1, Vector3 value2, float amount)
+        public static bool operator !=(Vector3 v1, Vector3 v2) 
         {
-            return new Vector3(
+            return !(v1 == v2);
-                Raylib.Lerp(value1.x, value2.x, amount),
+            }
-                Raylib.Lerp(value1.y, value2.y, amount),
+
-                Raylib.Lerp(value1.z, value2.z, amount)
+        public static bool operator >(Vector3 v1, Vector3 v2) 
-            );
+        { 
+            return v1.x > v2.x && v1.y > v2.y && v1.z > v2.z;
+            }
+
+        public static bool operator <(Vector3 v1, Vector3 v2) 
+        {
+            return  v1.x < v2.x && v1.y < v2.y && v1.z < v2.z;
+            }
+
+        public static Vector3 operator +(Vector3 v1, Vector3 v2) 
+        { 
+            return Raylib.Vector3Add(v1, v2);
+        }
+
+        public static Vector3 operator -(Vector3 v1, Vector3 v2) 
+        { 
+            return Raylib.Vector3Subtract(v1, v2);
+        }
+
+        public static Vector3 operator *(Vector3 v1, Vector3 v2) 
+        { 
+            return Raylib.Vector3MultiplyV(v1, v2);
+        }
+
+        public static Vector3 operator *(Vector3 v, float scale) 
+        { 
+            return Raylib.Vector3Scale(v, scale);
+        }
+
+        public static Vector3 operator *(float scale, Vector3 v) 
+        { 
+            return Raylib.Vector3Scale(v, scale);
+        }
+
+        public static Vector3 operator /(Vector3 v1, Vector3 v2) 
+        { 
+            return Raylib.Vector3DivideV(v1, v2);
+        }
+
+        public static Vector3 operator /(Vector3 v1, float div) 
+        { 
+            return Raylib.Vector3Divide(v1, div);
+        }
+
+        public static Vector3 operator -(Vector3 v1) 
+        { 
+            return Raylib.Vector3Negate(v1);
         }
     }
 
@@ -505,9 +508,15 @@ namespace Raylib
             w = value;
         }
 
-        public override bool Equals(object obj) => (obj is Vector4) && Equals((Vector4)obj);
+        public override bool Equals(object obj)
+        {
+            return (obj is Vector4) && Equals((Vector4)obj);
+        }
 
-        public override int GetHashCode() => x.GetHashCode() + y.GetHashCode() + z.GetHashCode() + w.GetHashCode();
+        public override int GetHashCode()
+        {
+            return x.GetHashCode() + y.GetHashCode() + z.GetHashCode() + w.GetHashCode();
+        }
 
         public override string ToString()
         {
@@ -515,12 +524,24 @@ namespace Raylib
         }
 
         // convienient operators
-        public static bool operator ==(Vector4 v1, Vector4 v2) => (v1.x == v2.x && v1.y == v2.y && v1.z == v2.z && v1.w == v2.w);
+        public static bool operator ==(Vector4 v1, Vector4 v2) 
+        { 
+            return (v1.x == v2.x && v1.y == v2.y && v1.z == v2.z && v1.w == v2.w);
+        }
 
-        public static bool operator !=(Vector4 v1, Vector4 v2) => !(v1 == v2);
+        public static bool operator !=(Vector4 v1, Vector4 v2) 
+        { 
+            return !(v1 == v2);
+        }
 
-        public static bool operator >(Vector4 v1, Vector4 v2) => v1.x > v2.x && v1.y > v2.y && v1.z > v2.z && v2.w > v2.w;
+        public static bool operator >(Vector4 v1, Vector4 v2) 
+        {
+            return v1.x > v2.x && v1.y > v2.y && v1.z > v2.z && v1.w > v2.w;
+        }
 
-        public static bool operator <(Vector4 v1, Vector4 v2) => v1.x < v2.x && v1.y < v2.y && v1.z < v2.z && v1.w < v2.w;
+        public static bool operator <(Vector4 v1, Vector4 v2)
+        {
+            return v1.x < v2.x && v1.y < v2.y && v1.z < v2.z && v1.w < v2.w;
+        }
     }
 }

Bindings/Physac.cs

@@ -1,20 +1,22 @@
+/* Physac.cs
+*
+* Copyright 2019 Chris Dill
+*
+* Release under zLib License.
+* See LICENSE for details.
+*/
+
 using System;
 using System.Runtime.InteropServices;
 
 namespace Raylib
 {
-    #region Raylib-cs Enums
-
     public enum PhysicsShapeType
     {
         PHYSICS_CIRCLE,
         PHYSICS_POLYGON
     }
 
-    #endregion
-
-    #region Raylib-cs Types
-
     // Mat2 type (used for polygon shape rotation matrix)
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
     public struct Mat2
@@ -26,9 +28,8 @@ namespace Raylib
     }
 
     // @TODO Custom array marshall issue https://github.com/ChrisDill/Raylib-cs/issues/9
-    // hack same as raylib.cs _MaterialMap_e_FixedBuffer
+    // Hack same as raylib.cs _MaterialMap_e_FixedBuffer
-    // no easy way to marshall arrays of custom types. no idea why?!?!
+    // No easy way to marshall arrays of custom types. no idea why?
-    // Span<T> seems to need ref struct.
     public unsafe struct _Polygon_e_FixedBuffer
     {
         public Vector2 v0;
@@ -129,30 +130,8 @@ namespace Raylib
         public float staticFriction;                       // Mixed static friction during collision
     }
 
-    #endregion
-
     public static partial class Raylib
     {
-        #region Raylib-cs Variables
-
-        public const int PHYSAC_MAX_BODIES = 64;
-        public const int PHYSAC_MAX_MANIFOLDS = 4096;
-        public const int PHYSAC_MAX_VERTICES = 24;
-        public const int PHYSAC_CIRCLE_VERTICES = 24;
-
-        public const float PHYSAC_DESIRED_DELTATIME = 1.0f / 60.0f;
-        public const float PHYSAC_MAX_TIMESTEP = 0.02f;
-        public const int PHYSAC_COLLISION_ITERATIONS = 100;
-        public const float PHYSAC_PENETRATION_ALLOWANCE = 0.05f;
-        public const float PHYSAC_PENETRATION_CORRECTION = 0.4f;
-
-        public const float PHYSAC_PI = 3.14159265358979323846f;
-        public const float PHYSAC_DEG2RAD = (PHYSAC_PI / 180.0f);
-
-        #endregion
-
-        #region Raylib-cs Functions
-
         // Initializes physics values, pointers and creates physics loop thread
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void InitPhysics();
@@ -170,34 +149,16 @@ namespace Raylib
         public static extern void SetPhysicsGravity(float x, float y);
 
         // Creates a new circle physics body with generic parameters
-        [DllImport(nativeLibName, EntryPoint = "CreatePhysicsBodyCircle")]
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        private static extern IntPtr CreatePhysicsBodyCircleImport(Vector2 pos, float radius, float density);
+        private static extern IntPtr CreatePhysicsBodyCircle(Vector2 pos, float radius, float density);
-        public static PhysicsBodyData CreatePhysicsBodyCircle(Vector2 pos, float radius, float density)
-        {
-            var body = CreatePhysicsBodyCircleImport(pos, radius, density);
-            var data = (PhysicsBodyData)Marshal.PtrToStructure(body, typeof(PhysicsBodyData));
-            return data;
-        }
 
         // Creates a new rectangle physics body with generic parameters
-        [DllImport(nativeLibName, EntryPoint = "CreatePhysicsBodyRectangle")]
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        private static extern IntPtr CreatePhysicsBodyRectangleImport(Vector2 pos, float width, float height, float density);
+        public static extern IntPtr CreatePhysicsBodyRectangle(Vector2 pos, float width, float height, float density);
-        public static PhysicsBodyData CreatePhysicsBodyRectangle(Vector2 pos, float width, float height, float density)
-        {
-            var body = CreatePhysicsBodyRectangleImport(pos, width, height, density);
-            var data = (PhysicsBodyData)Marshal.PtrToStructure(body, typeof(PhysicsBodyData));
-            return data;
-        }
 
         // Creates a new polygon physics body with generic parameters
-        [DllImport(nativeLibName, EntryPoint = "CreatePhysicsBodyPolygon")]
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        private static extern IntPtr CreatePhysicsBodyPolygonImport(Vector2 pos, float radius, int sides, float density);
+        public static extern IntPtr CreatePhysicsBodyPolygon(Vector2 pos, float radius, int sides, float density);
-        public static PhysicsBodyData CreatePhysicsBodyPolygon(Vector2 pos, float radius, int sides, float density)
-        {
-            var body = CreatePhysicsBodyPolygonImport(pos, radius, sides, density);
-            var data = (PhysicsBodyData)Marshal.PtrToStructure(body, typeof(PhysicsBodyData));
-            return data;
-        }
 
         // Adds a force to a physics body
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
@@ -216,14 +177,8 @@ namespace Raylib
         public static extern int GetPhysicsBodiesCount();
 
         // Returns a physics body of the bodies pool at a specific index
-        [DllImport(nativeLibName, EntryPoint = "GetPhysicsBody")]
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern IntPtr GetPhysicsBodyImport(int index);
-        public static PhysicsBodyData GetPhysicsBody(int index)
-        {
-            var body = GetPhysicsBodyImport(index);
-            var data = (PhysicsBodyData)Marshal.PtrToStructure(body, typeof(PhysicsBodyData));
-            return data;
-        }
 
         // Returns the physics body shape type (PHYSICS_CIRCLE or PHYSICS_POLYGON)
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
@@ -252,7 +207,5 @@ namespace Raylib
         // Unitializes physics pointers and closes physics loop thread
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void ClosePhysics();
-
-        #endregion
     }
 }

Bindings/Raygui.cs

@@ -1,11 +1,18 @@
-using System;
+/* Raygui.cs
+*
+* Copyright 2019 Chris Dill
+*
+* Release under zLib License.
+* See LICENSE for details.
+*/
+
 using System.Runtime.InteropServices;
 using System.Text;
 
 namespace Raylib
 {
     // Gui global state enum
-    enum GuiControlState
+    public enum GuiControlState
     {
         GUI_STATE_NORMAL = 0,
         GUI_STATE_FOCUSED,
@@ -13,8 +20,16 @@ namespace Raylib
         GUI_STATE_DISABLED,
     }
 
+    // Gui global text alignment
+    public enum GuiTextAlignment
+    {
+        GUI_TEXT_ALIGN_LEFT = 0,
+        GUI_TEXT_ALIGN_CENTER,
+        GUI_TEXT_ALIGN_RIGHT,
+    }
+
     // Gui standard controls
-    enum GuiControlStandard
+    public enum GuiControlStandard
     {
         DEFAULT = 0,
         LABEL,          // LABELBUTTON
@@ -25,13 +40,17 @@ namespace Raylib
         CHECKBOX,
         COMBOBOX,
         DROPDOWNBOX,
-        TEXTBOX,        // VALUEBOX, SPINNER
+        TEXTBOX,        // TEXTBOXMULTI
+        VALUEBOX,
+        SPINNER,
         LISTVIEW,
-        COLORPICKER
+        COLORPICKER,
+        SCROLLBAR,
+        RESERVED
     }
 
     // Gui default properties for every control
-    enum GuiControlProperty
+    public enum GuiControlProperty
     {
         BORDER_COLOR_NORMAL = 0,
         BASE_COLOR_NORMAL,
@@ -47,7 +66,7 @@ namespace Raylib
         TEXT_COLOR_DISABLED,
         BORDER_WIDTH,
         INNER_PADDING,
-        RESERVED01,
+        TEXT_ALIGNMENT,
         RESERVED02
     }
 
@@ -55,57 +74,89 @@ namespace Raylib
     // NOTE: We reserve a fixed size of additional properties per control (8)
 
     // Default properties
-    enum GuiDefaultProperty
+    public enum GuiDefaultProperty
     {
         TEXT_SIZE = 16,
         TEXT_SPACING,
-        LINES_COLOR,
+        LINE_COLOR,
         BACKGROUND_COLOR,
     }
 
     // Toggle / ToggleGroup
-    enum GuiToggleProperty
+    public enum GuiToggleProperty
     {
         GROUP_PADDING = 16,
     }
 
     // Slider / SliderBar
-    enum GuiSliderProperty
+    public enum GuiSliderProperty
     {
         SLIDER_WIDTH = 16,
-        EX_TEXT_PADDING
+        TEXT_PADDING
-    }
-
-    // TextBox / ValueBox / Spinner
-    enum GuiTextBoxProperty
-    {
-        MULTILINE_PADDING = 16,
-        SPINNER_BUTTON_WIDTH,
-        SPINNER_BUTTON_PADDING,
-        SPINNER_BUTTON_BORDER_WIDTH
     }
 
     // CheckBox
-    enum GuiCheckBoxProperty
+    public enum GuiCheckBoxProperty
     {
         CHECK_TEXT_PADDING = 16
     }
 
     // ComboBox
-    enum GuiComboBoxProperty
+    public enum GuiComboBoxProperty
     {
         SELECTOR_WIDTH = 16,
         SELECTOR_PADDING
     }
 
     // DropdownBox
-    enum GuiDropdownBoxProperty
+    public enum GuiDropdownBoxProperty
     {
         ARROW_RIGHT_PADDING = 16,
     }
 
+    // TextBox / TextBoxMulti / ValueBox / Spinner
+    public enum GuiTextBoxProperty
+    {
+        MULTILINE_PADDING = 16,
+        COLOR_SELECTED_FG,
+        COLOR_SELECTED_BG
+    }
+
+    public enum GuiSpinnerProperty
+    {
+        SELECT_BUTTON_WIDTH = 16,
+        SELECT_BUTTON_PADDING,
+        SELECT_BUTTON_BORDER_WIDTH
+    }
+
+    // ScrollBar
+    public enum GuiScrollBarProperty
+    {
+        ARROWS_SIZE = 16,
+        SLIDER_PADDING,
+        SLIDER_SIZE,
+        SCROLL_SPEED,
+        SHOW_SPINNER_BUTTONS
+    }
+
+    // ScrollBar side
+    public enum GuiScrollBarSide
+    {
+        SCROLLBAR_LEFT_SIDE = 0,
+        SCROLLBAR_RIGHT_SIDE
+    }
+
+    // ListView
+    public enum GuiListViewProperty
+    {
+        ELEMENTS_HEIGHT = 16,
+        ELEMENTS_PADDING,
+        SCROLLBAR_WIDTH,
+        SCROLLBAR_SIDE,             // This property defines vertical scrollbar side (SCROLLBAR_LEFT_SIDE or SCROLLBAR_RIGHT_SIDE)
+    }
+
     // ColorPicker
-    enum GuiColorPickerProperty
+    public enum GuiColorPickerProperty
     {
         COLOR_SELECTOR_SIZE = 16,
         BAR_WIDTH,                  // Lateral bar width
@@ -114,17 +165,10 @@ namespace Raylib
         BAR_SELECTOR_PADDING        // Lateral bar selector outer padding
     }
 
-    // ListView
-    enum GuiListViewProperty
-    {
-        ELEMENTS_HEIGHT = 16,
-        ELEMENTS_PADDING,
-        SCROLLBAR_WIDTH,
-    }
-
     public static partial class Raylib
     {
         // Global gui modification functions
+
         // Enable gui controls (global state)
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void GuiEnable();
@@ -154,17 +198,20 @@ namespace Raylib
         public static extern void GuiFade(float alpha);
 
         // Style set/get functions
+
         // Set one style property
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void GuiSetStyle(int control, int property, int value);         
+        public static extern void GuiSetStyle(GuiControlStandard control, GuiControlProperty property, int value);
 
         // Get one style property
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int GuiGetStyle(int control, int property);                     
+        public static extern int GuiGetStyle(GuiControlStandard control, GuiControlProperty property);
 
         // Container/separator controls, useful for controls organization
+
         // Window Box control, shows a window that can be closed
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        [return: MarshalAs(UnmanagedType.I1)]
         public static extern bool GuiWindowBox(Rectangle bounds, string text);
 
         // Group Box control with title name
@@ -173,7 +220,7 @@ namespace Raylib
 
         // Line separator control
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void GuiLine(Rectangle bounds, int thick);                                                    
+        public static extern void GuiLine(Rectangle bounds, string text);
 
         // Panel control, useful to group controls
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
@@ -181,88 +228,88 @@ namespace Raylib
 
         // Scroll Panel control
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern Vector2 GuiScrollPanel(Rectangle bounds, Rectangle content, Vector2 viewScroll);                   
+        public static extern Rectangle GuiScrollPanel(Rectangle bounds, Rectangle content, ref Vector2 scroll);
 
         // Basic controls set
+        
         // Label control, shows text
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void GuiLabel(Rectangle bounds, string text);
 
         // Button control, returns true when clicked
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        [return: MarshalAs(UnmanagedType.I1)]
         public static extern bool GuiButton(Rectangle bounds, string text);
 
         // Label button control, show true when clicked
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        [return: MarshalAs(UnmanagedType.I1)]
         public static extern bool GuiLabelButton(Rectangle bounds, string text);
 
         // Image button control, returns true when clicked
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        [return: MarshalAs(UnmanagedType.I1)]
         public static extern bool GuiImageButton(Rectangle bounds, Texture2D texture);
 
         // Image button extended control, returns true when clicked
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        [return: MarshalAs(UnmanagedType.I1)]
         public static extern bool GuiImageButtonEx(Rectangle bounds, Texture2D texture, Rectangle texSource, string text);
 
         // Toggle Button control, returns true when active
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool GuiToggleButton(Rectangle bounds, string text, bool toggle);                        
+        [return: MarshalAs(UnmanagedType.I1)]
+        public static extern bool GuiToggle(Rectangle bounds, string text, bool active);
 
-        // Toggle Group control, returns toggled button index
+        // Toggle Group control, returns active toggle index
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int GuiToggleGroup(Rectangle bounds, string text, int count, int active);               
+        public static extern int GuiToggleGroup(Rectangle bounds, string text, int active);
 
         // Check Box control, returns true when active
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        [return: MarshalAs(UnmanagedType.I1)]
         public static extern bool GuiCheckBox(Rectangle bounds, bool isChecked);
 
-        // Check Box control with text, returns true when active
-        [DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool GuiCheckBoxEx(Rectangle bounds, bool isChecked, string text);                         
-        
         // Combo Box control, returns selected item index
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int GuiComboBox(Rectangle bounds, string text, int count, int active);                  
+        public static extern int GuiComboBox(Rectangle bounds, string text, int active);
 
         // Dropdown Box control, returns selected item
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int GuiDropdownBox(Rectangle bounds, string[] text, int count, int active);               
+        [return: MarshalAs(UnmanagedType.I1)]
+        public static extern bool GuiDropdownBox(Rectangle bounds, string[] text, ref int active, bool edit);
 
         // Spinner control, returns selected value
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int GuiSpinner(Rectangle bounds, int value, int maxValue, int btnWidth);                      
+        [return: MarshalAs(UnmanagedType.I1)]
+        public static extern bool GuiSpinner(Rectangle bounds, ref int value, int maxValue, int btnWidth);
 
         // Value Box control, updates input text with numbers
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int GuiValueBox(Rectangle bounds, int value, int maxValue);                                   
+        [return: MarshalAs(UnmanagedType.I1)]
+        public static extern bool GuiValueBox(Rectangle bounds, int value, int maxValue);
 
         // Text Box control, updates input text
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        [return: MarshalAs(UnmanagedType.I1)]
         public static extern bool GuiTextBox(Rectangle bounds, StringBuilder text, int textSize, bool freeEdit);
 
         // Text Box control with multiple lines
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        [return: MarshalAs(UnmanagedType.I1)]
         public static extern bool GuiTextBoxMulti(Rectangle bounds, StringBuilder text, int textSize, bool editMode);
 
         // Slider control, returns selected value
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern float GuiSlider(Rectangle bounds, float value, float minValue, float maxValue);               
+        public static extern float GuiSlider(Rectangle bounds, float value, float minValue, float maxValue, bool showValue);
-        
-        // Slider control, returns selected value
-        [DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
-        public static extern float GuiSliderEx(Rectangle bounds, float value, float minValue, float maxValue, string text, bool showValue); 
 
         // Slider Bar control, returns selected value
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern float GuiSliderBar(Rectangle bounds, float value, float minValue, float maxValue);            
+        public static extern float GuiSliderBar(Rectangle bounds, float value, float minValue, float maxValue, bool showValue);
-        
-        // Slider Bar control, returns selected value
-        [DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
-        public static extern float GuiSliderBarEx(Rectangle bounds, float value, float minValue, float maxValue, string text, bool showValue); 
 
         // Progress Bar control, shows current progress value
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern float GuiProgressBar(Rectangle bounds, float value, float minValue, float maxValue);          
+        public static extern float GuiProgressBar(Rectangle bounds, float value, float minValue, float maxValue, bool showValue);
 
         // Progress Bar control, shows current progress value
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
@@ -270,23 +317,66 @@ namespace Raylib
 
         // Status Bar control, shows info text
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void GuiStatusBar(Rectangle bounds, string text, int offsetX);                           
+        public static extern void GuiStatusBar(Rectangle bounds, string text);
 
         // Dummy control for placeholders
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void GuiDummyRec(Rectangle bounds, string text);
 
+        // Scroll Bar control
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void GuiScrollBar(Rectangle bounds, int value, int minValue, int maxValue);
+
+        // Grid
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void GuiGrid(Rectangle bounds, float spacing, int subdivs);
+
         // Advance controls set
+
         // List View control, returns selected list element index
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int GuiListView(Rectangle bounds, string text, int count, int active);                  
+        public static extern int GuiListView(Rectangle bounds, string text, ref int active, ref int scrollIndex, bool editMode);
+
+        // List View with extended parameters
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        public static extern int GuiListViewEx(Rectangle bounds, string text, int count, ref int enabled, ref int active, ref int focus, ref int scrollIndex, bool editMode);
+
+        // Message Box control, displays a message
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        [return: MarshalAs(UnmanagedType.I1)]
+        public static extern bool GuiMessageBox(Rectangle bounds, string windowTitle, string message);
+
+        // Text Input Box control, ask for text
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        [return: MarshalAs(UnmanagedType.I1)]
+        public static extern bool GuiTextInputBox(Rectangle bounds, string windowTitle, string message, string buttons);
 
         // Color Picker control
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Color GuiColorPicker(Rectangle bounds, Color color);
 
-        // Message Box control, displays a message
+        // Styles loading functions
+
+        // Load style file (.rgs)
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool GuiMessageBox(Rectangle bounds, string windowTitle, string message);    
+        public static extern int GuiLoadStyle(string fileName);
+
+        // Load style properties from array
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        [return: MarshalAs(UnmanagedType.I1)]
+        public static extern bool GuiLoadStyleProps(int[] props, int count);
+
+        // Load style default over global style
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        [return: MarshalAs(UnmanagedType.I1)]
+        public static extern bool GuiLoadStyleDefault();
+
+        // Updates full style properties set with default values
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        public static extern Color GuiUpdateStyleComplete();
+
+        // Get text with icon id prepended
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        public static extern string GuiIconText(int iconId, string text);
     }
 }

Bindings/Raymath.cs

@@ -1,71 +1,25 @@
-/* Raylib-cs
+/* Raymath.cs
- * Raymath.cs - Core bindings to raymth
+*
 * Copyright 2019 Chris Dill
 *
 * Release under zLib License.
 * See LICENSE for details.
 */
 
-using System;
 using System.Runtime.InteropServices;
+using Quaternion = Raylib.Vector4;
 
 namespace Raylib
 {
-    // Vector2 type
+    // NOTE: Helper types to be used instead of array return types for *ToFloat functions
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+    public unsafe struct float3
-    public partial struct Vector2
     {
-        public float x;
+        public fixed float v[3];
-        public float y;
     }
 
-    // Vector3 type
+    public unsafe struct float16
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    public partial struct Vector3
     {
-        public float x;
+        public fixed float v[16];
-        public float y;
-        public float z;
-    }
-
-    // Vector4 type
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    public partial struct Vector4
-    {
-        public float x;
-        public float y;
-        public float z;
-        public float w;
-    }
-
-    // Matrix type (OpenGL style 4x4 - right handed, column major)
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    public struct Matrix
-    {
-        public float m0, m4, m8, m12;
-        public float m1, m5, m9, m13;
-        public float m2, m6, m10, m14;
-        public float m3, m7, m11, m15;
-
-        public override string ToString()
-        {
-            return $"Matrix({m0}, {m4}, {m8}, {m12}\n       {m1}, {m5}, {m9}, {m13}\n      {m2}, {m6}, {m10}, {m14}\n      {m3}, {m7}, {m11}, {m15})";
-        }
-    }
-
-    // Quaternion type
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    public struct Quaternion
-    {
-        public float x;
-        public float y;
-        public float z;
-        public float w;
-
-        public override string ToString()
-        {
-            return "Quaternion(" + x + " " + y + " " + z + " " + w + ")";
-        }
     }
 
     public static partial class Raylib
@@ -74,25 +28,9 @@ namespace Raylib
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern float Clamp(float value, float min, float max);
 
-        /// <summary>
+        // Calculate linear interpolation between two vectors
-        /// Linearly interpolates between two values.
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        /// </summary>
+        public static extern float Lerp(float start, float end, float amount);
-        /// <param name="value1">Source value.</param>
-        /// <param name="value2">Source value.</param>
-        /// <param name="amount">
-        /// Value between 0 and 1 indicating the weight of value2.
-        /// </param>
-        /// <returns>Interpolated value.</returns>
-        /// <remarks>
-        /// This method performs the linear interpolation based on the following formula.
-        /// <c>value1 + (value2 - value1) * amount</c>
-        /// Passing amount a value of 0 will cause value1 to be returned, a value of 1 will
-        /// cause value2 to be returned.
-        /// </remarks>
-        public static float Lerp(float value1, float value2, float amount)
-        {
-            return value1 + (value2 - value1) * amount;
-        }
 
         // Vector with components value 0.0f
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
@@ -130,9 +68,9 @@ namespace Raylib
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Vector2 Vector2Scale(Vector2 v, float scale);
 
-        // Multiply vector by a vector
+        // Multiply vector by vector
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern Vector2 Vector2Multiplyv(Vector2 v1, Vector2 v2);
+        public static extern Vector2 Vector2MultiplyV(Vector2 v1, Vector2 v2);
 
         // Negate vector
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
@@ -142,7 +80,7 @@ namespace Raylib
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Vector2 Vector2Divide(Vector2 v, float div);
 
-        // Divide vector by a vector
+        // Divide vector by vector
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Vector2 Vector2DivideV(Vector2 v1, Vector2 v2);
 
@@ -150,6 +88,10 @@ namespace Raylib
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Vector2 Vector2Normalize(Vector2 v);
 
+        // Calculate linear interpolation between two vectors
+        [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
+        public static extern Vector2 Vector2Lerp(Vector2 v1, Vector2 v2, float amount);
+
         // Vector with components value 0.0f
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Vector3 Vector3Zero();
@@ -162,7 +104,7 @@ namespace Raylib
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Vector3 Vector3Add(Vector3 v1, Vector3 v2);
 
-        // Substract two vectors
+        // Subtract two vectors
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Vector3 Vector3Subtract(Vector3 v1, Vector3 v2);
 
@@ -187,6 +129,7 @@ namespace Raylib
         public static extern float Vector3Length(Vector3 v);
 
         // Calculate two vectors dot product
+
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern float Vector3DotProduct(Vector3 v1, Vector3 v2);
 
@@ -195,6 +138,7 @@ namespace Raylib
         public static extern float Vector3Distance(Vector3 v1, Vector3 v2);
 
         // Scale provided vector
+
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Vector3 Vector3Scale(Vector3 v, float scale);
 
@@ -206,7 +150,7 @@ namespace Raylib
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Vector3 Vector3Divide(Vector3 v, float div);
 
-        // Divide vector by a vector
+        // Divide vector by vector
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Vector3 Vector3DivideV(Vector3 v1, Vector3 v2);
 
@@ -218,7 +162,7 @@ namespace Raylib
         // Makes vectors normalized and orthogonal to each other
         // Gram-Schmidt function implementation
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Vector3OrthoNormalize(out Vector3 v1, out Vector3 v2);
+        public static extern void Vector3OrthoNormalize(ref Vector3 v1, ref Vector3 v2);
 
         // Transforms a Vector3 by a given Matrix
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
@@ -251,7 +195,7 @@ namespace Raylib
 
         // Returns Vector3 as float array
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern float[] Vector3ToFloatV(Vector3 v);
+        public static extern float3 Vector3ToFloatV(Vector3 v);
 
         // Compute matrix determinant
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
@@ -281,16 +225,16 @@ namespace Raylib
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Matrix MatrixAdd(Matrix left, Matrix right);
 
-        // Substract two matrices (left - right)
+        // Subtract two matrices (left - right)
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern Matrix MatrixSubstract(Matrix left, Matrix right);
+        public static extern Matrix MatrixSubtract(Matrix left, Matrix right);
 
-        // Create rotation matrix from axis and angle
+        // Returns translation matrix
-        // NOTE: Angle should be provided in radians
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Matrix MatrixTranslate(float x, float y, float z);
 
-        // Returns x-rotation matrix (angle in radians)
+        // Create rotation matrix from axis and angle
+        // NOTE: Angle should be provided in radians
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Matrix MatrixRotate(Vector3 axis, float angle);
 
@@ -334,7 +278,7 @@ namespace Raylib
 
         // Returns float array of matrix data
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern float[] MatrixToFloatV(Matrix mat);
+        public static extern float16 MatrixToFloatV(Matrix mat);
 
         // Returns identity quaternion
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
@@ -387,7 +331,7 @@ namespace Raylib
 
         // Returns the rotation angle and axis for a given quaternion
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void QuaternionToAxisAngle(Quaternion q, out Vector3 outAxis, float[] outAngle);
+        public static extern void QuaternionToAxisAngle(Quaternion q, ref Vector3 outAxis, ref float outAngle);
 
         // Returns he quaternion equivalent to Euler angles
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]