2
0
mirror of https://github.com/raylib-cs/raylib-cs synced 2025-06-30 19:03:42 -04:00

Merge remote-tracking branch 'ChrisDill/master'

This commit is contained in:
Mikael Rasmussen
2018-10-26 17:47:23 +02:00
5 changed files with 21 additions and 25 deletions

View File

@ -696,7 +696,7 @@ namespace Raylib
public int format;
public uint source;
public uint[] buffers = new uint[2];
public IntPtr buffers;
}
// Head-Mounted-Display device parameters
@ -710,10 +710,9 @@ namespace Raylib
public float vScreenCenter;
public float eyeToScreenDistance;
public float lensSeparationDistance;
public float interpupillaryDistance;
public float[] lensDistortionValues = new float[4];
public float[] chromaAbCorrection = new float[4];
public IntPtr lensDistortionValues;
public IntPtr chromaAbCorrection;
}
#endregion
@ -1619,7 +1618,7 @@ namespace Raylib
// Get pixel data from image as a Color struct array
[DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
public static extern Color[] GetImageData(Image image);
public static extern IntPtr GetImageData(Image image);
// Get pixel data from image as Vector4 array (float normalized)
[DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
@ -1635,7 +1634,7 @@ namespace Raylib
// Update GPU texture with new data
[DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
public static extern void UpdateTexture(Texture2D texture, Color[] pixels);
public static extern void UpdateTexture(Texture2D texture, IntPtr pixels);
// Image manipulation functions
// Create an image duplicate (useful for transformations)
@ -1840,11 +1839,11 @@ namespace Raylib
// Load font data for further use
[DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
public static extern CharInfo[] LoadFontData(string fileName, int fontSize, int[] fontChars, int charsCount, bool sdf);
public static extern IntPtr LoadFontData(string fileName, int fontSize, int[] fontChars, int charsCount, bool sdf);
// Generate image font atlas using chars info
[DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]
public static extern Image GenImageFontAtlas(CharInfo[] chars, int fontSize, int charsCount, int padding, int packMethod);
public static extern Image GenImageFontAtlas(IntPtr chars, int fontSize, int charsCount, int padding, int packMethod);
// Unload Font from GPU memory (VRAM)
[DllImport(nativeLibName,CallingConvention = CallingConvention.Cdecl)]