Skip to content

Update to Box2d 3.1 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
scatterlogical wants to merge 3 commits into from
Closed

Update to Box2d 3.1 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7be4148
Updated box2d to 3.1
scatterlogical May 4, 2025
30be869
forgot Mover.c in build.zig
scatterlogical May 6, 2025
cf5f33e
fix(submodules): box2d
scatterlogical May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
876 changes: 536 additions & 340 deletions Box2D.NET.Bindings/B2.g.cs
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions Box2D.NET.Bindings/Box2D.NET.Bindings.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<PropertyGroup>
<IsPackable>true</IsPackable>
<IncludeContentInPack>true</IncludeContentInPack>

<Version>3.0.0</Version>
<Version>3.1.0</Version>
<Title Condition="'$(Configuration)' == 'Debug'">Box2D.NET.Bindings.Debug</Title>
<Title Condition="'$(Configuration)' == 'Release'">Box2D.NET.Bindings.Release</Title>
<Authors>BeanCheeseBurrito</Authors>
<Authors>BeanCheeseBurrito, Scatterlogical</Authors>
<Copyright>BeanCheeseBurrito</Copyright>
<Description>Raw C# bindings for Box2D 3.0</Description>
<Description>Raw C# bindings for Box2D 3.1</Description>
<PackageId>$(Title)</PackageId>
<PackageProjectUrl>https://github.com/BeanCheeseBurrito/Box2D.NET</PackageProjectUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
Expand Down
2 changes: 1 addition & 1 deletion Box2D.NET.Examples/CSharp/HelloWorld.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public static void Main()
// Create a shape
B2.Polygon box = B2.MakeBox(1, 1);
B2.ShapeDef shapeDef = B2.DefaultShapeDef();
shapeDef.friction = 0.6f;
shapeDef.material.friction = 0.6f;
shapeDef.density = 1.0f;

B2.ShapeId shapeId = B2.CreatePolygonShape(bodyId, &shapeDef, &box);
Expand Down
7 changes: 4 additions & 3 deletions Box2D.NET.Native/Box2D.NET.Native.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@
<PropertyGroup>
<TargetFramework>netstandard1.0</TargetFramework>
<NoWarn>$(NoWarn);NU5128</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<PropertyGroup>
<IsPackable>true</IsPackable>
<IncludeContentInPack>true</IncludeContentInPack>
<IncludeBuildOutput>false</IncludeBuildOutput>

<Version>3.0.0</Version>
<Version>3.1.0</Version>
<Title Condition="'$(Configuration)' == 'Debug'">Box2D.NET.Native.Debug</Title>
<Title Condition="'$(Configuration)' == 'Release'">Box2D.NET.Native.Release</Title>
<Authors>BeanCheeseBurrito</Authors>
<Authors>BeanCheeseBurrito, Scatterlogical</Authors>
<Copyright>BeanCheeseBurrito</Copyright>
<Description>Native libraries for Box2D 3.0</Description>
<Description>Native libraries for Box2D 3.1</Description>
<PackageId>$(Title)</PackageId>
<PackageProjectUrl>https://github.com/BeanCheeseBurrito/Box2D.NET</PackageProjectUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
Expand Down
6 changes: 3 additions & 3 deletions Box2D.NET.Native/build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ pub fn build(b: *Build) void {
lib.addCSourceFiles(.{
.files = &.{
"../native/box2d/src/aabb.c",
"../native/box2d/src/allocate.c",
"../native/box2d/src/arena_allocator.c",
"../native/box2d/src/array.c",
"../native/box2d/src/bitset.c",
"../native/box2d/src/block_array.c",
"../native/box2d/src/body.c",
"../native/box2d/src/broad_phase.c",
"../native/box2d/src/constraint_graph.c",
Expand All @@ -48,12 +47,13 @@ pub fn build(b: *Build) void {
"../native/box2d/src/math_functions.c",
"../native/box2d/src/motor_joint.c",
"../native/box2d/src/mouse_joint.c",
"../native/box2d/src/mover.c",
"../native/box2d/src/prismatic_joint.c",
"../native/box2d/src/revolute_joint.c",
"../native/box2d/src/sensor.c",
"../native/box2d/src/shape.c",
"../native/box2d/src/solver.c",
"../native/box2d/src/solver_set.c",
"../native/box2d/src/stack_allocator.c",
"../native/box2d/src/table.c",
"../native/box2d/src/timer.c",
"../native/box2d/src/types.c",
Expand Down
2 changes: 1 addition & 1 deletion Box2D.NET.Tests/WorldTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void HelloWorld()
shapeDef.density = 1.0f;

// Override the default friction.
shapeDef.friction = 0.3f;
shapeDef.material.friction = 0.3f;

// Add the shape to the body.
B2.CreatePolygonShape(bodyId, &shapeDef, &dynamicBox);
Expand Down
7 changes: 4 additions & 3 deletions Box2D.NET/Box2D.NET.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
<Nullable>enable</Nullable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<PropertyGroup>
<IsPackable>true</IsPackable>
<IncludeContentInPack>true</IncludeContentInPack>

<Version>3.0.0</Version>
<Version>3.1.0</Version>
<Title Condition="'$(Configuration)' == 'Debug'">Box2D.NET.Debug</Title>
<Title Condition="'$(Configuration)' == 'Release'">Box2D.NET.Release</Title>
<Authors>BeanCheeseBurrito</Authors>
<Authors>BeanCheeseBurrito, Scatterlogical</Authors>
<Copyright>BeanCheeseBurrito</Copyright>
<Description>Raw C# bindings for Box2D 3.0</Description>
<Description>Raw C# bindings for Box2D 3.1</Description>
<PackageId>$(Title)</PackageId>
<PackageProjectUrl>https://github.com/BeanCheeseBurrito/Box2D.NET</PackageProjectUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
Expand Down
2 changes: 1 addition & 1 deletion native/box2d
Open in desktop
Submodule box2d updated 228 files