quartznet/raylib-cs
2
0
Fork 0
mirror of https://github.com/raylib-cs/raylib-cs synced 2025-04-05 11:19:39 -04:00
Code Activity

Merge pull request #10 from msmshazan/pinvoke-fix

Browse Source 
Fix for Pinvoking structs
This commit is contained in:
ChrisDill 2018-10-15 12:25:53 +01:00 committed by GitHub
commit a2b7b0a1ff
2 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bindings/Bindings.csproj
View File

@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{A2B3BBC8-3D48-46DD-B3CF-263F554E4474}</ProjectGuid> <ProjectGuid>{A2B3BBC8-3D48-46DD-B3CF-263F554E4474}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>Raylib</RootNamespace> <RootNamespace>Raylib</RootNamespace>
<AssemblyName>Bindings</AssemblyName> <AssemblyName>Bindings</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>

57
Bindings/Raylib.cs
View File

@ -507,23 +507,28 @@ namespace Raylib
// Vertex data definning a mesh // Vertex data definning a mesh
// NOTE: Data stored in CPU memory (and GPU) // NOTE: Data stored in CPU memory (and GPU)
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
public struct Mesh public unsafe struct Mesh
{ {
public int vertexCount; public int vertexCount;
public int triangleCount; public int triangleCount;
public float[] vertices; public IntPtr vertices;
public float[] texcoords; public IntPtr texcoords;
public float[] texcoords2; public IntPtr texcoords2;
public float[] normals; public IntPtr normals;
public float[] tangents; public IntPtr tangents;
public byte[] colors; public IntPtr colors;
public ushort[] indices; public IntPtr indices;
public IntPtr baseVertices;
public IntPtr baseNormals;
public IntPtr weightBias;
public IntPtr weightId;
public uint vaoId; public uint vaoId;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 7)] // Raylib.PHYSAC_MAX_VERTICES)] public fixed uint vboId[7];
public uint[] vboId;
} }
// Shader type (generic) // Shader type (generic)
@ -548,17 +553,43 @@ namespace Raylib
public Color color; public Color color;
public float value; public float value;
} }
public unsafe struct _MaterialMap_e_FixedBuffer
{
public MaterialMap maps0;
public MaterialMap maps1;
public MaterialMap maps2;
public MaterialMap maps3;
public MaterialMap maps4;
public MaterialMap maps5;
public MaterialMap maps6;
public MaterialMap maps7;
public MaterialMap maps8;
public MaterialMap maps9;
public MaterialMap maps10;
public MaterialMap maps11;
public ref MaterialMap this[int index]
{
get
{
fixed (MaterialMap* e = &maps0)
return ref e[index];
}
}
}
// Material type (generic) // Material type (generic)
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
public struct Material public struct Material
{ {
public Shader shader; public Shader shader;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = Raylib.MAX_MATERIAL_MAPS)] public _MaterialMap_e_FixedBuffer maps;
public MaterialMap[] maps;
public float[] param; public IntPtr param;
} }
// Model type // Model type