Merge branch 'master' into master
This commit is contained in:
commit
205e602080
3 changed files with 7 additions and 7 deletions
|
|
@ -1424,7 +1424,7 @@ public static unsafe partial class Raylib
|
||||||
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
||||||
public static extern Image LoadImageAnim(sbyte* fileName, int* frames);
|
public static extern Image LoadImageAnim(sbyte* fileName, int* frames);
|
||||||
|
|
||||||
/// <summary>Load image from memory buffer, fileType refers to extension: i.e. "png"</summary>
|
/// <summary>Load image from memory buffer, fileType refers to extension: i.e. ".png"</summary>
|
||||||
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
||||||
public static extern Image LoadImageFromMemory(sbyte* fileType, byte* fileData, int dataSize);
|
public static extern Image LoadImageFromMemory(sbyte* fileType, byte* fileData, int dataSize);
|
||||||
|
|
||||||
|
|
@ -1976,7 +1976,7 @@ public static unsafe partial class Raylib
|
||||||
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
||||||
public static extern Font LoadFontFromImage(Image image, Color key, int firstChar);
|
public static extern Font LoadFontFromImage(Image image, Color key, int firstChar);
|
||||||
|
|
||||||
/// <summary>Load font from memory buffer, fileType refers to extension: i.e. "ttf"</summary>
|
/// <summary>Load font from memory buffer, fileType refers to extension: i.e. ".ttf"</summary>
|
||||||
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
||||||
public static extern Font LoadFontFromMemory(
|
public static extern Font LoadFontFromMemory(
|
||||||
sbyte* fileType,
|
sbyte* fileType,
|
||||||
|
|
@ -2694,7 +2694,7 @@ public static unsafe partial class Raylib
|
||||||
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
||||||
public static extern Wave LoadWave(sbyte* fileName);
|
public static extern Wave LoadWave(sbyte* fileName);
|
||||||
|
|
||||||
/// <summary>Load wave from memory buffer, fileType refers to extension: i.e. "wav"</summary>
|
/// <summary>Load wave from memory buffer, fileType refers to extension: i.e. ".wav"</summary>
|
||||||
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
[DllImport(NativeLibName, CallingConvention = CallingConvention.Cdecl)]
|
||||||
public static extern Wave LoadWaveFromMemory(sbyte* fileType, byte* fileData, int dataSize);
|
public static extern Wave LoadWaveFromMemory(sbyte* fileType, byte* fileData, int dataSize);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -130,7 +130,7 @@ public static unsafe partial class Raylib
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Load image from managed memory, fileType refers to extension: i.e. "png"
|
/// Load image from managed memory, fileType refers to extension: i.e. ".png"
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static Image LoadImageFromMemory(string fileType, byte[] fileData)
|
public static Image LoadImageFromMemory(string fileType, byte[] fileData)
|
||||||
{
|
{
|
||||||
|
|
@ -1011,7 +1011,7 @@ public static unsafe partial class Raylib
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Load font from managed memory, fileType refers to extension: i.e. "ttf"
|
/// Load font from managed memory, fileType refers to extension: i.e. ".ttf"
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static Font LoadFontFromMemory(
|
public static Font LoadFontFromMemory(
|
||||||
string fileType,
|
string fileType,
|
||||||
|
|
@ -1327,7 +1327,7 @@ public static unsafe partial class Raylib
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Load wave from managed memory, fileType refers to extension: i.e. "wav"
|
/// Load wave from managed memory, fileType refers to extension: i.e. ".wav"
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static Wave LoadWaveFromMemory(string fileType, byte[] fileData)
|
public static Wave LoadWaveFromMemory(string fileType, byte[] fileData)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue