Skip to content

Commit 056b71b

Browse files
committed
Regen for latest Box2D commits
1 parent 62aa533 commit 056b71b

8 files changed

Lines changed: 268 additions & 33 deletions

File tree

Box2dNet.Samples/Box2dMeshDrawer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void DrawString(Vector2 p, IntPtr s, b2HexColor color, IntPtr context)
7474

7575
public void DrawWorld(b2WorldId worldId)
7676
{
77-
b2AABB bounds = new(new(-float.MinValue, -float.MaxValue), new(float.MinValue, float.MaxValue));
77+
b2AABB bounds = new(new(float.MinValue, float.MinValue), new(float.MaxValue, float.MaxValue));
7878

7979
var meshHandle = NativeHandle.Alloc(Mesh);
8080

@@ -90,7 +90,7 @@ public void DrawWorld(b2WorldId worldId)
9090
DrawPoint = Marshal.GetFunctionPointerForDelegate((DrawPoint)DrawPoint),
9191
DrawString = Marshal.GetFunctionPointerForDelegate((DrawString)DrawString),
9292
drawingBounds = bounds,
93-
useDrawingBounds = false,
93+
// useDrawingBounds = false,
9494
drawShapes = true,
9595
drawJoints = true,
9696
drawJointExtras = false,

Box2dNet.Samples/Sample.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ public virtual void Step(Box2dMeshDrawer meshDrawer)
155155
m_maxProfile.pairs = MathF.Max(m_maxProfile.pairs, p.pairs);
156156
m_maxProfile.collide = MathF.Max(m_maxProfile.collide, p.collide);
157157
m_maxProfile.solve = MathF.Max(m_maxProfile.solve, p.solve);
158-
m_maxProfile.mergeIslands = MathF.Max(m_maxProfile.mergeIslands, p.mergeIslands);
159158
m_maxProfile.prepareStages = MathF.Max(m_maxProfile.prepareStages, p.prepareStages);
160159
m_maxProfile.solveConstraints = MathF.Max(m_maxProfile.solveConstraints, p.solveConstraints);
161160
m_maxProfile.prepareConstraints = MathF.Max(m_maxProfile.prepareConstraints, p.prepareConstraints);
@@ -179,7 +178,6 @@ public virtual void Step(Box2dMeshDrawer meshDrawer)
179178
m_totalProfile.pairs += p.pairs;
180179
m_totalProfile.collide += p.collide;
181180
m_totalProfile.solve += p.solve;
182-
m_totalProfile.mergeIslands += p.mergeIslands;
183181
m_totalProfile.prepareStages += p.prepareStages;
184182
m_totalProfile.solveConstraints += p.solveConstraints;
185183
m_totalProfile.prepareConstraints += p.prepareConstraints;
@@ -212,7 +210,6 @@ public virtual void Step(Box2dMeshDrawer meshDrawer)
212210
aveProfile.pairs = scale * m_totalProfile.pairs;
213211
aveProfile.collide = scale * m_totalProfile.collide;
214212
aveProfile.solve = scale * m_totalProfile.solve;
215-
aveProfile.mergeIslands = scale * m_totalProfile.mergeIslands;
216213
aveProfile.prepareStages = scale * m_totalProfile.prepareStages;
217214
aveProfile.solveConstraints = scale * m_totalProfile.solveConstraints;
218215
aveProfile.prepareConstraints = scale * m_totalProfile.prepareConstraints;

Box2dNet/Box2dNet.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<RepositoryUrl>https://github.com/thomasvt/Box2D3Net</RepositoryUrl>
1515
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1616
<NoWarn>$(NoWarn);1591</NoWarn> <!-- suppress warnings for missing docs -->
17-
<Version>3.1.8.2</Version>
17+
<Version>3.1.8.3</Version>
1818
</PropertyGroup>
1919

2020
<ItemGroup>

Box2dNet/Interop/B2Api.DebugDraw.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public struct b2DebugDraw
116116
public b2AABB drawingBounds;
117117

118118
/// Option to restrict drawing to a rectangular region. May suffer from unstable depth sorting.
119-
[MarshalAs(UnmanagedType.U1)] public bool useDrawingBounds;
119+
//[MarshalAs(UnmanagedType.U1)] public bool useDrawingBounds;
120120

121121
/// Option to draw shapes
122122
[MarshalAs(UnmanagedType.U1)] public bool drawShapes;

0 commit comments

Comments
 (0)