quartznet/raylib-cs
Watch
2
0
Fork
You've already forked raylib-cs
 0
Code Wiki Activity

Merge branch 'master' into native

Browse source
This commit is contained in:
Rgebee 2024-06-08 07:19:56 +01:00 • committed by GitHub
commit aa2b67716d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 52 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Examples/Core/StorageValues.cs
View file

@ -93,13 +93,13 @@ public class StorageValues
// Save integer value to storage file (to defined position)
// NOTE: Storage positions is directly related to file memory layout (4 bytes each integer)
private static unsafe bool SaveStorageValue(string fileName, uint position, int value)
private static unsafe bool SaveStorageValue(string fileName, int position, int value)
{
using var fileNameBuffer = fileName.ToUtf8Buffer();
bool success = false;
uint dataSize = 0;
uint newDataSize = 0;
int dataSize = 0;
int newDataSize = 0;
byte* fileData = LoadFileData(fileNameBuffer.AsPointer(), &dataSize);
byte* newFileData = null;
@ -110,7 +110,7 @@ public class StorageValues
{
// Increase data size up to position and store value
newDataSize = (position + 1) * sizeof(int);
newFileData = (byte*)MemRealloc(fileData, (int)newDataSize);
newFileData = (byte*)MemRealloc(fileData, (uint)newDataSize);
if (newFileData != null)
{
@ -121,7 +121,7 @@ public class StorageValues
else
{
// RL_REALLOC failed
uint positionInBytes = position * sizeof(int);
int positionInBytes = position * sizeof(int);
TraceLog(
TraceLogLevel.Warning,
@$"FILEIO: [{fileName}] Failed to realloc data ({dataSize}),
@ -154,7 +154,7 @@ public class StorageValues
TraceLog(TraceLogLevel.Info, $"FILEIO: [{fileName}] File created successfully");
dataSize = (position + 1) * sizeof(int);
fileData = (byte*)MemAlloc((int)dataSize);
fileData = (byte*)MemAlloc((uint)dataSize);
int* dataPtr = (int*)fileData;
dataPtr[position] = value;
@ -174,7 +174,7 @@ public class StorageValues
using var fileNameBuffer = fileName.ToUtf8Buffer();
int value = 0;
uint dataSize = 0;
int dataSize = 0;
byte* fileData = LoadFileData(fileNameBuffer.AsPointer(), &dataSize);
if (fileData != null)

2
Examples/Models/AnimationDemo.cs
View file

@ -47,7 +47,7 @@ public class AnimationDemo
Vector3 position = new(0.0f, 0.0f, 0.0f);
// Load animation data
uint animsCount = 0;
int animsCount = 0;
var anims = LoadModelAnimations("resources/models/iqm/guyanim.iqm", ref animsCount);
int animFrameCounter = 0;

2
Examples/Text/FontSdf.cs
View file

@ -31,7 +31,7 @@ public class FontSdf
string msg = "Signed Distance Fields";
// Loading file to memory
uint fileSize = 0;
int fileSize = 0;
byte* fileData = LoadFileData("resources/fonts/anonymous_pro_bold.ttf", ref fileSize);
// Default font generation from TTF font

2
Examples/Textures/RawData.cs
View file

@ -44,7 +44,7 @@ public class RawData
int height = 480;
// Store pixel data
Color* pixels = (Color*)Raylib.MemAlloc(width * height * sizeof(Color));
Color* pixels = (Color*)Raylib.MemAlloc((uint)(width * height * sizeof(Color)));
for (int y = 0; y < height; y++)
{
for (int x = 0; x < width; x++)

36
Raylib-cs/interop/Raylib.cs
View file

@ -464,11 +464,11 @@ public static unsafe partial class Raylib
/// <summary>Load random values sequence, no values repeated</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern int* LoadRandomSequence(int count, int min, int max);
public static extern int* LoadRandomSequence(uint count, int min, int max);
/// <summary>Unload random values sequence</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void UnloadRandomSequence(int *sequence);
public static extern void UnloadRandomSequence(int* sequence);
/// <summary>Takes a screenshot of current screen (saved a .png)</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
@ -488,11 +488,11 @@ public static unsafe partial class Raylib
/// <summary>Internal memory allocator</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void* MemAlloc(int size);
public static extern void* MemAlloc(uint size);
/// <summary>Internal memory reallocator</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void* MemRealloc(void* ptr, int size);
public static extern void* MemRealloc(void* ptr, uint size);
/// <summary>Internal memory free</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
@ -508,12 +508,12 @@ public static unsafe partial class Raylib
/// <summary>Set custom file binary data loader</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void SetLoadFileDataCallback(delegate* unmanaged[Cdecl]<sbyte*, uint*, byte*> callback);
public static extern void SetLoadFileDataCallback(delegate* unmanaged[Cdecl]<sbyte*, int*, byte*> callback);
/// <summary>Set custom file binary data saver</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void SetSaveFileDataCallback(
delegate* unmanaged[Cdecl]<sbyte*, void*, uint, CBool> callback
delegate* unmanaged[Cdecl]<sbyte*, void*, int, CBool> callback
);
/// <summary>Set custom file text data loader</summary>
@ -529,7 +529,7 @@ public static unsafe partial class Raylib
/// <summary>Load file data as byte array (read)</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern byte* LoadFileData(sbyte* fileName, uint* bytesRead);
public static extern byte* LoadFileData(sbyte* fileName, int* dataSize);
/// <summary>Unload file data allocated by LoadFileData()</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
@ -537,11 +537,11 @@ public static unsafe partial class Raylib
/// <summary>Save data to file from byte array (write), returns true on success</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern CBool SaveFileData(sbyte* fileName, void* data, uint bytesToWrite);
public static extern CBool SaveFileData(sbyte* fileName, void* data, int dataSize);
/// <summary>Export data to code (.h), returns true on success</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern CBool ExportDataAsCode(byte* data, uint size, sbyte* fileName);
public static extern CBool ExportDataAsCode(byte* data, int dataSize, sbyte* fileName);
// Load text data from file (read), returns a '\0' terminated string
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
@ -1195,23 +1195,23 @@ public static unsafe partial class Raylib
/// <summary>Draw spline: Linear, minimum 2 points</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void DrawSplineLinear(Vector2 *points, int pointCount, float thick, Color color);
public static extern void DrawSplineLinear(Vector2* points, int pointCount, float thick, Color color);
/// <summary>Draw spline: B-Spline, minimum 4 points</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void DrawSplineBasis(Vector2 *points, int pointCount, float thick, Color color);
public static extern void DrawSplineBasis(Vector2* points, int pointCount, float thick, Color color);
/// <summary>Draw spline: Catmull-Rom, minimum 4 points</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void DrawSplineCatmullRom(Vector2 *points, int pointCount, float thick, Color color);
public static extern void DrawSplineCatmullRom(Vector2* points, int pointCount, float thick, Color color);
/// <summary>Draw spline: Quadratic Bezier, minimum 3 points (1 control point): [p1, c2, p3, c4...]</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void DrawSplineBezierQuadratic(Vector2 *points, int pointCount, float thick, Color color);
public static extern void DrawSplineBezierQuadratic(Vector2* points, int pointCount, float thick, Color color);
/// <summary>Draw spline: Cubic Bezier, minimum 4 points (2 control points): [p1, c2, c3, p4, c5, c6...]</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void DrawSplineBezierCubic(Vector2 *points, int pointCount, float thick, Color color);
public static extern void DrawSplineBezierCubic(Vector2* points, int pointCount, float thick, Color color);
/// <summary>Draw spline segment: Linear, 2 points</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
@ -1368,7 +1368,7 @@ public static unsafe partial class Raylib
/// <summary>Export image to memory buffer</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern char* ExportImageToMemory(Image image, sbyte* fileType, int *fileSize);
public static extern byte* ExportImageToMemory(Image image, sbyte* fileType, int* fileSize);
/// <summary>Export image as code file defining an array of bytes</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
@ -1519,7 +1519,7 @@ public static unsafe partial class Raylib
/// <summary>Rotate image by input angle in degrees (-359 to 359)</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void ImageRotate(Image *image, int degrees);
public static extern void ImageRotate(Image* image, int degrees);
/// <summary>Rotate image clockwise 90deg</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
@ -2452,7 +2452,7 @@ public static unsafe partial class Raylib
/// <summary>Load model animations from file</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern ModelAnimation* LoadModelAnimations(sbyte* fileName, uint* animCount);
public static extern ModelAnimation* LoadModelAnimations(sbyte* fileName, int* animCount);
/// <summary>Update model animation pose</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
@ -2464,7 +2464,7 @@ public static unsafe partial class Raylib
/// <summary>Unload animation array data</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void UnloadModelAnimations(ModelAnimation* animations, uint animCount);
public static extern void UnloadModelAnimations(ModelAnimation* animations, int animCount);
/// <summary>Check model animation skeleton match</summary>
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]

6
Raylib-cs/interop/Rlgl.cs
View file

@ -613,9 +613,9 @@ public static unsafe partial class Rlgl
[DllImport(NativeLibName, EntryPoint = "rlGetGlTextureFormats", CallingConvention = CallingConvention.Cdecl)]
public static extern void GetGlTextureFormats(
PixelFormat format,
int* glInternalFormat,
int* glFormat,
int* glType
uint* glInternalFormat,
uint* glFormat,
uint* glType
);
/// <summary>Get OpenGL internal formats</summary>

14
Raylib-cs/types/Mesh.cs
View file

@ -71,7 +71,7 @@ public unsafe partial struct Mesh
/// </summary>
public void AllocVertices()
{
Vertices = Raylib.New<float>(3 * VertexCount);
Vertices = Raylib.New<float>(3 * (uint)VertexCount);
}
/// <summary>
@ -79,7 +79,7 @@ public unsafe partial struct Mesh
/// </summary>
public void AllocTexCoords()
{
TexCoords = Raylib.New<float>(2 * VertexCount);
TexCoords = Raylib.New<float>(2 * (uint)VertexCount);
}
/// <summary>
@ -87,7 +87,7 @@ public unsafe partial struct Mesh
/// </summary>
public void AllocTexCoords2()
{
TexCoords2 = Raylib.New<float>(2 * VertexCount);
TexCoords2 = Raylib.New<float>(2 * (uint)VertexCount);
}
/// <summary>
@ -95,7 +95,7 @@ public unsafe partial struct Mesh
/// </summary>
public void AllocNormals()
{
Normals = Raylib.New<float>(3 * VertexCount);
Normals = Raylib.New<float>(3 * (uint)VertexCount);
}
/// <summary>
@ -103,7 +103,7 @@ public unsafe partial struct Mesh
/// </summary>
public void AllocTangents()
{
Tangents = Raylib.New<float>(4 * VertexCount);
Tangents = Raylib.New<float>(4 * (uint)VertexCount);
}
/// <summary>
@ -111,7 +111,7 @@ public unsafe partial struct Mesh
/// </summary>
public void AllocColors()
{
Colors = Raylib.New<byte>(4 * VertexCount);
Colors = Raylib.New<byte>(4 * (uint)VertexCount);
}
/// <summary>
@ -119,7 +119,7 @@ public unsafe partial struct Mesh
/// </summary>
public void AllocIndices()
{
Indices = Raylib.New<ushort>(3 * TriangleCount);
Indices = Raylib.New<ushort>(3 * (uint)TriangleCount);
}
/// <summary>

12
Raylib-cs/types/Raylib.Utils.cs
View file

@ -230,16 +230,16 @@ public static unsafe partial class Raylib
}
/// <summary>C++ style memory allocator</summary>
public static T* New<T>(int count) where T : unmanaged
public static T* New<T>(uint count) where T : unmanaged
{
return (T*)MemAlloc(count * sizeof(T));
return (T*)MemAlloc(count * (uint)sizeof(T));
}
/// <summary>Load file data as byte array (read)</summary>
public static byte* LoadFileData(string fileName, ref uint bytesRead)
public static byte* LoadFileData(string fileName, ref int bytesRead)
{
using var str1 = fileName.ToAnsiBuffer();
fixed (uint* p = &bytesRead)
fixed (int* p = &bytesRead)
{
return LoadFileData(str1.AsPointer(), p);
}
@ -930,10 +930,10 @@ public static unsafe partial class Raylib
}
/// <summary>Load model animations from file</summary>
public static ModelAnimation* LoadModelAnimations(string fileName, ref uint animCount)
public static ModelAnimation* LoadModelAnimations(string fileName, ref int animCount)
{
using var str1 = fileName.ToAnsiBuffer();
fixed (uint* p = &animCount)
fixed (int* p = &animCount)
{
return LoadModelAnimations(str1.AsPointer(), p);
}

10
Raylib-cs/types/Rectangle.cs
View file

@ -48,7 +48,10 @@ public partial struct Rectangle
public Vector2 Position
{
readonly get { return new Vector2(X,Y); }
readonly get
{
return new Vector2(X, Y);
}
set
{
X = value.X;
@ -58,7 +61,10 @@ public partial struct Rectangle
public Vector2 Size
{
readonly get { return new Vector2(Width,Height); }
readonly get
{
return new Vector2(Width, Height);
}
set
{
Width = value.X;