Watch
2
0
Fork
You've already forked raylib-cs
0

Fix IsGestureDetected and formatting

This commit is contained in:
Rgebee 2021-12-11 12:15:51 +00:00
commit dc5335038a
6 changed files with 24 additions and 25 deletions

View file

@ -71,7 +71,7 @@ namespace Raylib_cs
var buffer = Marshal.AllocHGlobal(byteLength);
vsprintf(buffer, format, args);
string result = Marshal.PtrToStringUTF8(buffer);
Marshal.FreeHGlobal(buffer);

View file

@ -84,7 +84,7 @@ namespace Raylib_cs
public static void InitWindow(int width, int height, Utf8String title)
{
fixed (byte* p = title)
fixed (byte* p = title)
{
InitWindow(width, height, p);
}
@ -559,7 +559,7 @@ namespace Raylib_cs
/// <summary>Load file data as byte array (read)</summary>
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern byte* LoadFileData(string fileName, ref int bytesRead);
public static extern byte* LoadFileData(string fileName, ref int bytesRead);
/// <summary>Unload file data allocated by LoadFileData()</summary>
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
@ -783,8 +783,7 @@ namespace Raylib_cs
/// <summary>Check if a gesture have been detected</summary>
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
[return: MarshalAs(UnmanagedType.I1)]
public static extern bool IsGestureDetected(Gesture gesture);
public static extern CBool IsGestureDetected(Gesture gesture);
/// <summary>Get latest detected gesture</summary>
@ -1323,7 +1322,7 @@ namespace Raylib_cs
{
fixed (byte* p = text)
{
ImageDrawText(ref dst, p, x,y,fontSize,color);
ImageDrawText(ref dst, p, x, y, fontSize, color);
}
}
@ -1338,7 +1337,7 @@ namespace Raylib_cs
ImageDrawTextEx(ref dst, font, p, position, fontSize, spacing, tint);
}
}
// Texture loading functions
// NOTE: These functions require GPU access
@ -1542,7 +1541,7 @@ namespace Raylib_cs
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void DrawTextEx(Font font, byte* text, Vector2 position, float fontSize, float spacing, Color tint);
public static void DrawTextEx(Font font, Utf8String text, Vector2 position, float fontSize,
public static void DrawTextEx(Font font, Utf8String text, Vector2 position, float fontSize,
float spacing, Color tint)
{
fixed (byte* p = text)
@ -1560,7 +1559,7 @@ namespace Raylib_cs
{
fixed (byte* p = text)
{
DrawTextEx(font, p, position, fontSize, spacing, tint);
DrawTextEx(font, p, position, fontSize, spacing, tint);
}
}
@ -1629,11 +1628,11 @@ namespace Raylib_cs
{
fixed (byte* p2 = append)
{
TextAppend(p1,p2, &position);
TextAppend(p1, p2, &position);
}
}
}
/// <summary>Get Pascal case notation version of provided string</summary>
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
@ -2017,7 +2016,7 @@ namespace Raylib_cs
{
throw new ApplicationException("Failed to load animation");
}
return new ReadOnlySpan<ModelAnimation>(model, animsCount);
}
}

View file

@ -41,7 +41,7 @@ namespace Raylib_cs
public const int RL_TEXTURE_WRAP_CLAMP = 0x812F;
public const int RL_TEXTURE_WRAP_MIRROR_REPEAT = 0x8370;
public const int RL_TEXTURE_WRAP_MIRROR_CLAMP = 0x8742;
// GL equivalent data types
public const int RL_UNSIGNED_BYTE = 0x1401;
@ -737,7 +737,7 @@ namespace Raylib_cs
/// </summary>
QUADS = 0x0007
}
/// <summary>
/// Texture parameters (equivalent to OpenGL defines)
/// </summary>

View file

@ -28,7 +28,7 @@ namespace Raylib_cs
/// Number of channels (1-mono, 2-stereo)
/// </summary>
public uint channels;
//TODO: SPAN<byte> ?
/// <summary>
/// Buffer data pointer

View file

@ -356,7 +356,7 @@ namespace Raylib_cs
/// </summary>
GAMEPAD_BUTTON_RIGHT_THUMB
}
/// <summary>Gesture
/// NOTE: It could be used as flags to enable only some gestures
/// </summary>

View file

@ -90,12 +90,12 @@ namespace Raylib_cs
/// Number of animation frames
/// </summary>
public readonly int frameCount;
/// <summary>
/// Bones information (skeleton, BoneInfo *)
/// </summary>
public readonly BoneInfo* bones;
/// <inheritdoc cref="bones"/>
public ReadOnlySpan<BoneInfo> BoneInfo => new(bones, boneCount);
@ -106,15 +106,15 @@ namespace Raylib_cs
/// <inheritdoc cref="framePoses"/>
public FramePosesCollection FramePoses => new(framePoses, frameCount, boneCount);
public struct FramePosesCollection
{
readonly Transform** framePoses;
readonly int frameCount;
readonly int boneCount;
public FramePoses this[int index]
{
get
@ -122,12 +122,12 @@ namespace Raylib_cs
return new(framePoses[index], boneCount);
}
}
internal FramePosesCollection(Transform** framePoses, int frameCount, int boneCount)
{
this.framePoses = framePoses;
this.frameCount = frameCount;
this.boneCount = boneCount;
this.boneCount = boneCount;
}
}
}
@ -145,7 +145,7 @@ namespace Raylib_cs
return ref poses[index];
}
}
internal FramePoses(Transform* poses, int count)
{
this.poses = poses;