From d7bdb7a20a2b487da362332ca8ca9295d02b78c3 Mon Sep 17 00:00:00 2001 From: ChrisDill Date: Fri, 22 Oct 2021 18:50:42 +0100 Subject: [PATCH] Update types in Raylib.cs to 4.0 --- Raylib-cs/Raylib.cs | 73 +++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/Raylib-cs/Raylib.cs b/Raylib-cs/Raylib.cs index 4dc33af..50eb22f 100644 --- a/Raylib-cs/Raylib.cs +++ b/Raylib-cs/Raylib.cs @@ -184,32 +184,32 @@ namespace Raylib_cs public struct NPatchInfo { /// - /// Region in the texture + /// Texture source rectangle /// - public Rectangle sourceRec; + public Rectangle source; /// - /// left border offset + /// Left border offset /// public int left; /// - /// top border offset + /// Top border offset /// public int top; /// - /// right border offset + /// Right border offset /// public int right; /// - /// bottom border offset + /// Bottom border offset /// public int bottom; /// - /// layout of the n-patch: 3x3, 1x3 or 3x1 + /// Layout of the n-patch: 3x3, 1x3 or 3x1 /// public NPatchLayout layout; } @@ -247,7 +247,7 @@ namespace Raylib_cs } /// - /// Font type, includes texture and charSet array data + /// Font, font texture and GlyphInfo array data /// [StructLayout(LayoutKind.Sequential)] public struct Font @@ -260,31 +260,31 @@ namespace Raylib_cs /// /// Number of characters /// - public int charsCount; + public int glyphCount; /// - /// Padding around the chars + /// Padding around the glyph characters /// - public int charsPadding; + public int glyphPadding; /// - /// Characters texture atals + /// Texture atlas containing the glyphs /// public Texture2D texture; /// - /// Characters rectangles in texture (Rectangle *) + /// Rectangles in texture for the glyphs /// public IntPtr recs; /// - /// Characters info data (CharInfo *) + /// Glyphs info data /// - public IntPtr chars; + public IntPtr glyphs; } /// - /// Camera type, defines a camera position/orientation in 3d space + /// Camera3D, defines position/orientation in 3d space /// [StructLayout(LayoutKind.Sequential)] public struct Camera3D @@ -324,7 +324,7 @@ namespace Raylib_cs } } - /// Camera2D type, defines a 2d camera + /// Camera2D, defines position/orientation in 2d space [StructLayout(LayoutKind.Sequential)] public struct Camera2D { @@ -514,7 +514,7 @@ namespace Raylib_cs } /// - /// Transformation properties + /// Transform, vectex transformation data /// [StructLayout(LayoutKind.Sequential)] public struct Transform @@ -629,7 +629,7 @@ namespace Raylib_cs public IntPtr framePoses; } - /// Ray type (useful for raycast) + /// Ray, ray for raycasting [StructLayout(LayoutKind.Sequential)] public struct Ray { @@ -762,9 +762,9 @@ namespace Raylib_cs public AudioStream stream; /// - /// Total number of samples + /// Total number of frames (considering channels) /// - public uint sampleCount; + public uint frameCount; } /// Music stream type (audio file streaming from memory) @@ -780,7 +780,7 @@ namespace Raylib_cs /// /// Total number of samples /// - public uint sampleCount; + public uint frameCount; /// /// Music looping enable @@ -1175,6 +1175,26 @@ namespace Raylib_cs /// Mouse button middle (pressed wheel) /// MOUSE_BUTTON_MIDDLE = 2, + + /// + /// Mouse button side (advanced mouse device) + /// + MOUSE_BUTTON_SIDE = 3, + + /// + /// Mouse button extra (advanced mouse device) + /// + MOUSE_BUTTON_EXTRA = 4, + + /// + /// Mouse button fordward (advanced mouse device) + /// + MOUSE_BUTTON_FORWARD = 5, + + /// + /// Mouse button back (advanced mouse device) + /// + MOUSE_BUTTON_BACK = 6, } /// Mouse cursor @@ -1440,6 +1460,15 @@ namespace Raylib_cs SHADER_UNIFORM_SAMPLER2D } + // Shader attribute data types + public enum ShaderAttributeDataType + { + SHADER_ATTRIB_FLOAT = 0, + SHADER_ATTRIB_VEC2, + SHADER_ATTRIB_VEC3, + SHADER_ATTRIB_VEC4 + } + /// Pixel formats /// NOTE: Support depends on OpenGL version and platform public enum PixelFormat