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

Fixing physac issues

Browse Source 
- Trying to fix marshall issues withh physac. Comparing struct size compared to c etc.
This commit is contained in:
ChrisDill 2018-11-30 10:12:55 +00:00
parent 7c0eb670b5
commit a0b5be8df5
2 changed files with 86 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
Bindings/Physac.cs
View File

@ -20,74 +20,100 @@ namespace Raylib
// Mat2 type (used for polygon shape rotation matrix) // Mat2 type (used for polygon shape rotation matrix)
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
public struct Mat2 public struct Mat2
{ {
public float m00; public float m00;
public float m01; public float m01;
public float m10; public float m10;
public float m11; public float m11;
} }
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] // [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
public struct PolygonData [StructLayout(LayoutKind.Explicit, Size = 388)]
public unsafe struct PolygonData
{ {
public uint vertexCount; // Current used vertex and normals count [FieldOffset(0)]
public uint vertexCount; // Current used vertex and normals count
//[MarshalAs(UnmanagedType.ByValArray, ArraySubType = UnmanagedType.Struct, SizeConst = Raylib.PHYSAC_MAX_VERTICES)] [FieldOffset(4)]
//public Vector2[] positions; // Polygon vertex positions vectors
public unsafe Vector2* positions; public unsafe Vector2* positions;
[FieldOffset(196)]
//[MarshalAs(UnmanagedType.ByValArray, ArraySubType = UnmanagedType.Struct, SizeConst = Raylib.PHYSAC_MAX_VERTICES)]
//public Vector2[] normals; // Polygon vertex normals vectors
public unsafe Vector2* normals; public unsafe Vector2* normals;
} }
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] // [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
[StructLayout(LayoutKind.Explicit, Size = 424)]
public struct PhysicsShape public struct PhysicsShape
{ {
public PhysicsShapeType type; // Physics shape type (circle or polygon) [FieldOffset(0)]
public IntPtr body; // Shape physics body reference public PhysicsShapeType type; // Physics shape type (circle or polygon)
public float radius; // Circle shape radius (used for circle shapes) [FieldOffset(8)]
public Mat2 transform; // Vertices transform matrix 2x2 public IntPtr body; // Shape physics body reference
[FieldOffset(16)]
public float radius; // Circle shape radius (used for circle shapes)
[FieldOffset(20)]
public Mat2 transform; // Vertices transform matrix 2x2
[FieldOffset(36)]
public PolygonData vertexData; // Polygon shape vertices position and normals data (just used for polygon shapes) public PolygonData vertexData; // Polygon shape vertices position and normals data (just used for polygon shapes)
} }
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
public struct PhysicsBodyData public partial struct PhysicsBodyData
{ {
public uint id; // Reference unique identifier public uint id;
public bool enabled; // Enabled dynamics state (collisions are calculated anyway) public bool enabled;
public Vector2 position; // Physics body shape pivot public Vector2 position;
public Vector2 velocity; // Current linear velocity applied to position public Vector2 velocity;
public Vector2 force; // Current linear force (reset to 0 every step) public Vector2 force;
public float angularVelocity; // Current angular velocity applied to orient public float angularVelocity;
public float torque; // Current angular force (reset to 0 every step) public float torque;
public float orient; // Rotation in radians public float orient;
public float inertia; // Moment of inertia public float inertia;
public float inverseInertia; // Inverse value of inertia public float inverseInertia;
public float mass; // Physics body mass public float mass;
public float inverseMass; // Inverse value of mass public float inverseMass;
public float staticFriction; // Friction when the body has not movement (0 to 1) public float staticFriction;
public float dynamicFriction; // Friction when the body has movement (0 to 1) public float dynamicFriction;
public float restitution; // Restitution coefficient of the body (0 to 1) public float restitution;
public bool useGravity; // Apply gravity force to dynamics public bool useGravity;
public bool isGrounded; // Physics grounded on other body state public bool isGrounded;
public bool freezeOrient; // Physics rotation constraint public bool freezeOrient;
public PhysicsShape shape; // Physics body shape information (type, radius, vertices, normals) public PhysicsShape shape;
// convert c bool(stored as byte) to bool
/*public bool enabled
{
get { return Convert.ToBoolean(bEnabled); }
set {
bEnabled = Convert.ToByte(value); }
}
public bool useGravity
{
get { return Convert.ToBoolean(bUseGravity); }
set { bUseGravity = Convert.ToByte(value); }
}
public bool isGrounded
{
get { return bIsGrounded != 0; }
set { bIsGrounded = (byte)(value ? 1 : 0); }
}
public bool freezeOrient
{
get { return Convert.ToBoolean(bFreezeOrient); }
set { bFreezeOrient = Convert.ToByte(value); }
}*/
} }
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
public unsafe struct PhysicsManifoldData public unsafe struct PhysicsManifoldData
{ {
public uint id; // Reference unique identifier public uint id; // Reference unique identifier
public PhysicsBodyData bodyA; // Manifold first physics body reference public IntPtr bodyA; // Manifold first physics body reference
public PhysicsBodyData bodyB; // Manifold second physics body reference public IntPtr bodyB; // Manifold second physics body reference
public float penetration; // Depth of penetration from collision public float penetration; // Depth of penetration from collision
public Vector2 normal; // Normal direction vector from 'a' to 'b' public Vector2 normal; // Normal direction vector from 'a' to 'b'
public unsafe Vector2* contacts; // Points of contact during collision
//[MarshalAs(UnmanagedType.ByValArray, ArraySubType = UnmanagedType.Struct, SizeConst = 2)]
// public fixed Vector2[] contacts; // Points of contact during collision
public unsafe Vector2* contacts;
public uint contactsCount; // Current collision number of contacts public uint contactsCount; // Current collision number of contacts
public float restitution; // Mixed restitution during collision public float restitution; // Mixed restitution during collision
public float dynamicFriction; // Mixed dynamic friction during collision public float dynamicFriction; // Mixed dynamic friction during collision
@ -100,8 +126,6 @@ namespace Raylib
{ {
#region Raylib-cs Variables #region Raylib-cs Variables
// Used by DllImport to load the native library.
// private const string nativeLibName = "raylib.dll";
public const int PHYSAC_MAX_BODIES = 64; public const int PHYSAC_MAX_BODIES = 64;
public const int PHYSAC_MAX_MANIFOLDS = 4096; public const int PHYSAC_MAX_MANIFOLDS = 4096;
public const int PHYSAC_MAX_VERTICES = 24; public const int PHYSAC_MAX_VERTICES = 24;
@ -138,7 +162,6 @@ namespace Raylib
// Creates a new circle physics body with generic parameters // Creates a new circle physics body with generic parameters
[DllImport(nativeLibName, EntryPoint = "CreatePhysicsBodyCircle")] [DllImport(nativeLibName, EntryPoint = "CreatePhysicsBodyCircle")]
// [return: MarshalAs(UnmanagedType.LPStruct)]
private static extern IntPtr CreatePhysicsBodyCircleImport(Vector2 pos, float radius, float density); private static extern IntPtr CreatePhysicsBodyCircleImport(Vector2 pos, float radius, float density);
public static PhysicsBodyData CreatePhysicsBodyCircle(Vector2 pos, float radius, float density) public static PhysicsBodyData CreatePhysicsBodyCircle(Vector2 pos, float radius, float density)
{ {

20
Examples/physac/physics_demo.cs
View File

@ -1,6 +1,9 @@
using Raylib; using Raylib;
using static Raylib.Raylib; using static Raylib.Raylib;
using System;
using System.Runtime.InteropServices;
public partial class physics_demo public partial class physics_demo
{ {
/******************************************************************************************* /*******************************************************************************************
@ -18,9 +21,7 @@ public partial class physics_demo
* Copyright (c) 2016-2018 Victor Fisac * Copyright (c) 2016-2018 Victor Fisac
* *
********************************************************************************************/ ********************************************************************************************/
public static int Main() public static int Main()
{ {
// Initialization // Initialization
@ -40,8 +41,14 @@ public partial class physics_demo
InitPhysics(); InitPhysics();
// Create floor rectangle physics body // Create floor rectangle physics body
var floor = CreatePhysicsBodyRectangle(new Vector2( screenWidth/2, screenHeight ), 500, 100, 10); var floor = CreatePhysicsBodyRectangle(new Vector2(screenWidth / 2, screenHeight), 500, 100, 10);
floor.enabled = false; // Disable body state to convert it to static (no dynamics, but collisions) floor.enabled = false; // Disable body state to convert it to static (no dynamics, but collisions)
floor.isGrounded = true;
Console.WriteLine(Marshal.SizeOf<PhysicsBodyData>());
Console.WriteLine(Marshal.SizeOf<PhysicsShape>());
Console.WriteLine(Marshal.SizeOf<PolygonData>());
Console.WriteLine(Marshal.SizeOf<bool>());
// Create obstacle circle physics body // Create obstacle circle physics body
var circle = CreatePhysicsBodyCircle(new Vector2( screenWidth/2, screenHeight/2 ), 45, 10); var circle = CreatePhysicsBodyCircle(new Vector2( screenWidth/2, screenHeight/2 ), 45, 10);
@ -56,6 +63,8 @@ public partial class physics_demo
// Update // Update
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Delay initialization of variables due to physics reset async // Delay initialization of variables due to physics reset async
RunPhysicsStep();
if (needsReset) if (needsReset)
{ {
floor = CreatePhysicsBodyRectangle(new Vector2( screenWidth/2, screenHeight ), 500, 100, 10); floor = CreatePhysicsBodyRectangle(new Vector2( screenWidth/2, screenHeight ), 500, 100, 10);
@ -81,7 +90,8 @@ public partial class physics_demo
for (int i = bodiesCount - 1; i >= 0; i--) for (int i = bodiesCount - 1; i >= 0; i--)
{ {
var body = GetPhysicsBody(i); var body = GetPhysicsBody(i);
if (body.id != 0 && (body.position.y > screenHeight*2)) DestroyPhysicsBody(body); if (!body.Equals(default(PhysicsBodyData)) && (body.position.y > screenHeight*2))
DestroyPhysicsBody(body);
} }
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------