Skip to content
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.

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

bullet: Sync with upstream 3.17 #48299

Merged
merged 2 commits into from
Sep 30, 2021
Merged

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga commented Apr 29, 2021

Includes bulletphysics/bullet3#3799.

Fixes #43868.

The duplicated comments in bullet code are a partial revert of #48187 since I synced with the unchanged 3.17 upstream code. They should be removed upstream if they matter.


Note: The bullet module in the master branch doesn't actually build currently. This PR just serves to keep the code in sync with the 3.x branch for future use.

@akien-mga akien-mga requested a review from a team as a code owner April 29, 2021 13:05
@akien-mga akien-mga added this to the 4.0 milestone Apr 29, 2021
@akien-mga akien-mga force-pushed the bullet-3.09 branch 3 times, most recently from 5920551 to 759e736 Compare April 29, 2021 13:46
@akien-mga akien-mga requested a review from a team as a code owner April 29, 2021 13:46
@@ -187,6 +187,7 @@ if env["builtin_bullet"]:
"LinearMath/btGeometryUtil.cpp",
"LinearMath/btPolarDecomposition.cpp",
"LinearMath/btQuickprof.cpp",
"LinearMath/btReducedVector.cpp",
Copy link
Member Author

@akien-mga akien-mga Apr 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pouleyKetchoupp It seems like you had omitted this .cpp file when updating to 2.90/master a while ago: 3e7db60.

It built and seemed to work fine without it so maybe it's not needed, it seems to be used in:

BulletSoftBody/btDeformableContactProjection.cpp
190:    btReducedVector p(x.size());

But in the #else of an #ifndef USE_MGS (i.e. only used if we pass USE_MGS).

I'm adding it for consistency's sake, it should be optimized out by the linker if we don't actually need it I suppose. There's probably a lot of Bullet components which we wouldn't need to build if we don't use them directly, but not sure how easy that would be to identify to slim down our SCsub.

@akien-mga akien-mga marked this pull request as draft April 29, 2021 15:38
@akien-mga
Copy link
Member Author

Marking as draft for now as the 3.x backport leads to a crash: #48300 (comment)

And I just remembered that bullet is disabled on master so it doesn't make sense to merge this before #47508 is merged (then I'll rebase and we can confirm that the 3.08 -> 3.09 update is fine).

@akien-mga akien-mga changed the title bullet: Sync with upstream 3.09 bullet: Sync with upstream 3.17 May 21, 2021
@akien-mga
Copy link
Member Author

Synced with 3.17 which was released recently: https://github.com/bulletphysics/bullet3/releases/tag/3.17
(Don't trust the release date on GitHub, the actual tag is from 7 May 2021.)

@pouleyKetchoupp
Copy link
Contributor

Now that #48300 is merged, it would be great to update this PR with the same changes in order to keep master in sync, even if Bullet is disabled for now.

akien-mga and others added 2 commits September 30, 2021 10:45
Stop include Bullet headers using `-isystem` for GCC/Clang as it misleads
SCons into not properly rebuilding all files when headers change.

This means we also need to make sure Bullet builds without warning, and
current version fares fairly well, there were just a couple to fix (patch
included).

Increase minimum version for distro packages to 2.90 (this was never released
as the "next" version after 2.89 was 3.05... but that covers it too).

Fixes godotengine#43868.

(cherry picked from commit b7901c7)
@akien-mga
Copy link
Member Author

Synced with #48300, and includes a cherry-pick of #53183.

@akien-mga akien-mga merged commit b8c9282 into godotengine:master Sep 30, 2021
@akien-mga akien-mga deleted the bullet-3.09 branch September 30, 2021 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bullet] [Needs Bullet Update] Crashing asserts in debug when using Bullet Physics with CCD enabled
3 participants