-
-
Notifications
You must be signed in to change notification settings - Fork 21k
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
Fix Bullet Physics Server #47508
Closed
Closed
Fix Bullet Physics Server #47508
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
3533372
Add bullet 2 physics to godot 4
kalysti 3618a6a
remove set_static_global_body
kalysti 4023dc5
Add the right ref to documentation
kalysti 52c55cb
Remove lock, unlock and is_locked
kalysti 3e1bc78
remove _3D_DISABLED, and singletonbullet
kalysti File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -85,6 +85,7 @@ class AreaBullet : public RigidCollisionObjectBullet { | |
btGhostObject *btGhost = nullptr; | ||
Vector<OverlappingObjectData> overlappingObjects; | ||
bool monitorable = true; | ||
int priority = 0; | ||
|
||
PhysicsServer3D::AreaSpaceOverrideMode spOv_mode = PhysicsServer3D::AREA_SPACE_OVERRIDE_DISABLED; | ||
bool spOv_gravityPoint = false; | ||
|
@@ -139,6 +140,9 @@ class AreaBullet : public RigidCollisionObjectBullet { | |
_FORCE_INLINE_ void set_spOv_priority(int p_priority) { spOv_priority = p_priority; } | ||
_FORCE_INLINE_ int get_spOv_priority() { return spOv_priority; } | ||
|
||
_FORCE_INLINE_ void set_priority(int p_priority) { priority = p_priority; } | ||
_FORCE_INLINE_ int get_priority() const { return priority; } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These methods and the |
||
|
||
virtual void main_shape_changed(); | ||
virtual void reload_body(); | ||
virtual void set_space(SpaceBullet *p_space); | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.write
doesn't seem to be needed here and is going to cause unnecessary copies.