mirror of
https://github.com/raylib-cs/raylib-cs
synced 2025-04-05 11:19:39 -04:00
No longer require unsafe option
- Change unsafe/fixed to use IntPtr or MarshallAs instead. - Added methods in physac to marshall IntPtr returns to PhysicsBodyData.
This commit is contained in:
parent
4652f1fa6d
commit
f880241ee4
@ -36,7 +36,7 @@
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
@ -84,8 +84,6 @@
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="core_basic_window.cs" />
|
||||
<Compile Include="Program.cs" />
|
||||
<Compile Include="RayForm.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
|
||||
@ -135,16 +135,35 @@ namespace Raylib
|
||||
public static extern void SetPhysicsGravity(float x, float y);
|
||||
|
||||
// Creates a new circle physics body with generic parameters
|
||||
[DllImport(nativeLibName)]
|
||||
public static extern PhysicsBodyData CreatePhysicsBodyCircle(Vector2 pos, float radius, float density);
|
||||
[DllImport(nativeLibName, EntryPoint = "CreatePhysicsBodyCircle")]
|
||||
// [return: MarshalAs(UnmanagedType.LPStruct)]
|
||||
private static extern IntPtr CreatePhysicsBodyCircleImport(Vector2 pos, float radius, float density);
|
||||
public static PhysicsBodyData CreatePhysicsBodyCircle(Vector2 pos, float radius, float density)
|
||||
{
|
||||
var body = CreatePhysicsBodyCircleImport(pos, radius, density);
|
||||
var data = (PhysicsBodyData)Marshal.PtrToStructure(body, typeof(PhysicsBodyData));
|
||||
return data;
|
||||
}
|
||||
|
||||
// Creates a new rectangle physics body with generic parameters
|
||||
[DllImport(nativeLibName)]
|
||||
public static extern PhysicsBodyData CreatePhysicsBodyRectangle(Vector2 pos, float width, float height, float density);
|
||||
[DllImport(nativeLibName, EntryPoint = "CreatePhysicsBodyRectangle")]
|
||||
private static extern IntPtr CreatePhysicsBodyRectangleImport(Vector2 pos, float width, float height, float density);
|
||||
public static PhysicsBodyData CreatePhysicsBodyRectangle(Vector2 pos, float width, float height, float density)
|
||||
{
|
||||
var body = CreatePhysicsBodyRectangleImport(pos, width, height, density);
|
||||
var data = (PhysicsBodyData)Marshal.PtrToStructure(body, typeof(PhysicsBodyData));
|
||||
return data;
|
||||
}
|
||||
|
||||
// Creates a new polygon physics body with generic parameters
|
||||
[DllImport(nativeLibName)]
|
||||
public static extern PhysicsBodyData CreatePhysicsBodyPolygon(Vector2 pos, float radius, int sides, float density);
|
||||
[DllImport(nativeLibName, EntryPoint = "CreatePhysicsBodyPolygon")]
|
||||
private static extern IntPtr CreatePhysicsBodyPolygonImport(Vector2 pos, float radius, int sides, float density);
|
||||
public static PhysicsBodyData CreatePhysicsBodyPolygon(Vector2 pos, float radius, int sides, float density)
|
||||
{
|
||||
var body = CreatePhysicsBodyPolygonImport(pos, radius, sides, density);
|
||||
var data = (PhysicsBodyData)Marshal.PtrToStructure(body, typeof(PhysicsBodyData));
|
||||
return data;
|
||||
}
|
||||
|
||||
// Adds a force to a physics body
|
||||
[DllImport(nativeLibName)]
|
||||
@ -163,8 +182,14 @@ namespace Raylib
|
||||
public static extern int GetPhysicsBodiesCount();
|
||||
|
||||
// Returns a physics body of the bodies pool at a specific index
|
||||
[DllImport(nativeLibName)]
|
||||
public static extern IntPtr GetPhysicsBody(int index);
|
||||
[DllImport(nativeLibName, EntryPoint = "GetPhysicsBody")]
|
||||
public static extern IntPtr GetPhysicsBodyImport(int index);
|
||||
public static PhysicsBodyData GetPhysicsBody(int index)
|
||||
{
|
||||
var body = GetPhysicsBodyImport(index);
|
||||
var data = (PhysicsBodyData)Marshal.PtrToStructure(body, typeof(PhysicsBodyData));
|
||||
return data;
|
||||
}
|
||||
|
||||
// Returns the physics body shape type (PHYSICS_CIRCLE or PHYSICS_POLYGON)
|
||||
[DllImport(nativeLibName)]
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
|
||||
namespace Bindings
|
||||
{
|
||||
static class Program
|
||||
{
|
||||
static void Main(string[] args)
|
||||
{
|
||||
Examples.core_basic_window();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -443,7 +443,10 @@ namespace Raylib
|
||||
public int offsetX;
|
||||
public int offsetY;
|
||||
public int advanceX;
|
||||
public unsafe void* data;
|
||||
|
||||
// [MarshalAs(UnmanagedType.ByValArray, ArraySubType = UnmanagedType.Struct, SizeConst = Raylib.PHYSAC_MAX_VERTICES)]
|
||||
// public unsafe void* data;
|
||||
public IntPtr data;
|
||||
}
|
||||
|
||||
// Font type, includes texture and charSet array data
|
||||
@ -453,7 +456,11 @@ namespace Raylib
|
||||
public Texture2D texture;
|
||||
public int baseSize;
|
||||
public int charsCount;
|
||||
public unsafe CharInfo* chars;
|
||||
|
||||
// [MarshalAs(UnmanagedType.ByValArray, ArraySubType = UnmanagedType.Struct, SizeConst = Raylib.PHYSAC_MAX_VERTICES)]
|
||||
// public unsafe CharInfo* data;
|
||||
//public CharInfo[] chars;
|
||||
public IntPtr data;
|
||||
}
|
||||
|
||||
// Camera type, defines a camera position/orientation in 3d space
|
||||
@ -514,15 +521,19 @@ namespace Raylib
|
||||
public ushort[] indices;
|
||||
|
||||
public uint vaoId;
|
||||
public unsafe fixed uint vboId[7];
|
||||
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 7)] // Raylib.PHYSAC_MAX_VERTICES)]
|
||||
public uint[] vboId;
|
||||
}
|
||||
|
||||
// Shader type (generic)
|
||||
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
|
||||
public unsafe struct Shader
|
||||
public struct Shader
|
||||
{
|
||||
public uint id;
|
||||
public fixed int locs[Raylib.MAX_SHADER_LOCATIONS];
|
||||
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = Raylib.MAX_SHADER_LOCATIONS)]
|
||||
public int[] locs;
|
||||
}
|
||||
|
||||
// Material texture map
|
||||
@ -539,7 +550,10 @@ namespace Raylib
|
||||
public struct Material
|
||||
{
|
||||
public Shader shader;
|
||||
// public MaterialMap[] maps = new MaterialMap[rl.MAX_MATERIAL_MAPS];
|
||||
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = Raylib.MAX_MATERIAL_MAPS)]
|
||||
public MaterialMap[] maps;
|
||||
|
||||
public float[] param;
|
||||
}
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
@ -54,6 +54,9 @@
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ApplicationIcon>raylib-cs.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
@ -65,23 +68,26 @@
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Examples\audio\audio_module_playing.cs" />
|
||||
<Compile Include="Examples\audio\audio_music_stream.cs" />
|
||||
<Compile Include="Examples\core\core_basic_window.cs" />
|
||||
<Compile Include="Examples\physac\physics_demo.cs" />
|
||||
<Compile Include="Examples\text\text_bmfont_ttf.cs" />
|
||||
<Compile Include="Program.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="App.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="raylib-cs.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Bindings\Bindings.csproj">
|
||||
<Project>{a2b3bbc8-3d48-46dd-b3cf-263f554e4474}</Project>
|
||||
<Name>Bindings</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Examples\core\core_basic_window.png" />
|
||||
<Content Include="Examples\core\resources\ps3.png" />
|
||||
<Content Include="Examples\core\resources\xbox.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
Loading…
x
Reference in New Issue
Block a user