Skip to content
This repository has been archived by the owner on Jun 29, 2024. It is now read-only.

Commit

Permalink
add basic impl for force_integration_callback
Browse files Browse the repository at this point in the history
update signing

Update macos_builds.yml

Update README.md

Update README.md

update readme

add thirdparty.txtf ile

update thirdparty

update path

try sign verify with verbose

list files

try again to sign using an action this time

remove exit

update signing

Update macos_builds.yml

Update macos_builds.yml

sign manually

upd

upd

try without timestamp

copy license in addons export also

try with timestamp again

use debug and release target to reduze binary size.

disable ios build for now

add info.plist

Update linux_builds.yml

Update CHANGELOG.md

Update README.md

Update README.md

Update README.md

Update README.md

export again both

Update CHANGELOG.md

Update CHANGELOG.md
  • Loading branch information
Ughuuu committed Jul 25, 2023
1 parent 1c9685b commit 925284a
Show file tree
Hide file tree
Showing 18 changed files with 406 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .github/actions/upload/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ runs:
- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
name: Physics Server Box2D
name: Godot Box2D
path: |
${{ github.workspace }}/dist/**
retention-days: 14
4 changes: 2 additions & 2 deletions .github/workflows/linux_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ env:
SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no

jobs:
ios:
runs-on: "ubuntu-20.04"
linux:
runs-on: ubuntu-20.04
name: Linux Build ${{ matrix.target }} ${{ matrix.arch }}
strategy:
fail-fast: false
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/macos_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
arch: ${{ matrix.arch }}
platform: macos
target: ${{ matrix.target }}

- name: Sign frameworks
shell: pwsh
env:
Expand All @@ -38,7 +38,8 @@ jobs:
APPLE_DEV_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
APPLE_DEV_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
APPLE_DEV_PASSWORD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
run: gci -R ./dist/addons/*.framework | ./scripts/ci-sign-macos.ps1
APPLE_DEV_APP_ID: ${{ secrets.PROD_MACOS_APPLE_DEV_APP_ID }}
run: ./scripts/ci-sign-macos.ps1 dist/addons/godot-box2d/bin/libgodot-box2d.macos.${{ matrix.target }}.framework
if: ${{ env.APPLE_DEV_ID }}

- name: Upload ${{ matrix.target }} ${{ matrix.arch }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
needs: static-checks
uses: ./.github/workflows/android_builds.yml

ios-build:
name: 🍏 iOS
needs: static-checks
uses: ./.github/workflows/ios_builds.yml
#ios-build:
# name: 🍏 iOS
# needs: static-checks
# uses: ./.github/workflows/ios_builds.yml

linux-build:
name: 🐧 Linux
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/windows_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@ jobs:

- name: Upload ${{ matrix.target }} ${{ matrix.arch }}
uses: ./.github/actions/upload

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
*.dblite

# Generated directories with binaries
dist/addons/godot-box2d/bin/**
dist/addons/godot-box2d/bin/libgodot-box2d.macos.template_debug.framework/libgodot-box2d.macos.template_debug
dist/addons/godot-box2d/bin/libgodot-box2d.macos.template_release.framework/libgodot-box2d.macos.template_release

.DS_Store
.vscode
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## [v0.3](https://github.com/godot-box2d/godot-box2d/releases/tag/v0.3)

- Fix mac binary signing
- Add basic implementation for force_integration_callback

## [v0.2](https://github.com/godot-box2d/godot-box2d/releases/tag/v0.2)

- Fix CharacterController2D to correctly work(passing 19/20 tests)
Expand Down
33 changes: 21 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,37 @@
# Godot Box2D
[![🔗 Build Status](https://github.com/godot-box2d/godot-box2d/actions/workflows/runner.yml/badge.svg)](https://github.com/godot-box2d/godot-box2d/actions/workflows/runner.yml)


A [box2D](https://github.com/erincatto/box2d) physics server for [Godot Engine](https://github.com/godotengine/godot) 4.1, implemented as a GDExtension.

Based of [rburing/physics_server_box2d](https://github.com/rburing/physics_server_box2d).
## Limitations

- Having non symetrical physics mask/layers results in no collision. Eg. if we had the following:

|object|mask|category|
|---|---|---|
|object A|1|2|
|object B|2|2|

In godot would result a collision, but would be very weird, as only one of the objects would receive collision restution.

## Missing/Not implemented

- Skewed shapes
- Scaled shapes
- Constant speed on static bodies
- Collision layers and masks don't work exactly the same (having non symetric layer/mask)
- Body pickable
- Torque uses wrong values

## Install from binaries
## Install

Currently it's built automatically for:
### From Godot Asset Store

- Windows (x86-64, x86)
- Linux (x86-64)
- macOS (x86-64 + Apple Silicon)
- iOS (arm64)
- Android (arm64 + x86_64)
[Godot Asset Library](https://godotengine.org/asset-library/asset/2007)

Go to any action workflow on this project: [Actions List](https://github.com/rburing/physics_server_box2d/actions)
### From Github Releases

1. [Download latest release](https://github.com/godot-box2d/godot-box2d/releases/latest) from github job
1. Download from [Github Releases](https://github.com/godot-box2d/godot-box2d/releases/latest)
2. Extract the ZIP archive and move the `addons/` folder it contains into your project folder
3. Open your project settings
4. Make sure "Advanced Settings" is enabled
Expand All @@ -38,7 +43,7 @@ Go to any action workflow on this project: [Actions List](https://github.com/rbu

## Building from source

1. Clone the git repository, including its `box2d` and `godot-cpp` submodules.
1. Clone the git repository, including its submodules.

2. Open a terminal application and change its working directory to the `godot-box2d` git repository.

Expand All @@ -57,3 +62,7 @@ Go to any action workflow on this project: [Actions List](https://github.com/rbu
## Lint

Run `scripts/clang-tidy.sh` in order to lint.

## Credits

Based of [rburing/physics_server_box2d](https://github.com/rburing/physics_server_box2d). Many thanks to you for starting implementation on this!
117 changes: 117 additions & 0 deletions THIRDPARTY.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
Godot Box2D incorporates third-party material from the projects listed below.

Godot Engine (https://github.com/godotengine/godot)

Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md).
Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.

godot-cpp (https://github.com/godot-jolt/godot-cpp)

Copyright (c) 2017-present Godot Engine contributors.
Copyright (c) 2022-present Mikael Hermansson.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.

box2d (https://github.com/erincatto/box2d)

MIT License

Copyright (c) 2019 Erin Catto

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


Godot Jolt (https://github.com/godot-jolt/godot-jolt)

Copyright (c) Mikael Hermansson and Godot Jolt contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


godot_box2d (https://github.com/briansemrau/godot_box2d)
MIT License

Copyright (c) 2020 Brian Semrau

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
21 changes: 21 additions & 0 deletions dist/addons/godot-box2d/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2022-present Ricardo Buring and Dragos Daian

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading

0 comments on commit 925284a

Please sign in to comment.