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.

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

Jump to bottom

[3.x] Enable setting of collision iterations in Physics2DServer #38387

Merged
merged 1 commit into from
May 19, 2021
Merged

[3.x] Enable setting of collision iterations in Physics2DServer #38387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions doc/classes/Physics2DServer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,6 +1002,15 @@
Activates or deactivates the 2D physics engine.
</description>
</method>
<method name="set_collision_iterations">
<return type="void">
</return>
<argument index="0" name="iterations" type="int">
</argument>
<description>
Sets the amount of iterations for calculating velocities of colliding bodies. The greater the amount, the more accurate the collisions, but with a performance loss.
</description>
</method>
<method name="shape_get_data" qualifiers="const">
<return type="Variant">
</return>
Expand Down
4 changes: 4 additions & 0 deletions servers/physics_2d/physics_2d_server_sw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,6 +1315,10 @@ void Physics2DServerSW::set_active(bool p_active) {
active = p_active;
};

void Physics2DServerSW::set_collision_iterations(int p_iterations) {
iterations = p_iterations;
};

void Physics2DServerSW::init() {

doing_sync = false;
Expand Down
2 changes: 2 additions & 0 deletions servers/physics_2d/physics_2d_server_sw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,8 @@ class Physics2DServerSW : public Physics2DServer {
virtual void end_sync();
virtual void finish();

virtual void set_collision_iterations(int p_iterations);

virtual bool is_flushing_queries() const { return flushing_queries; }

int get_process_info(ProcessInfo p_info);
Expand Down
1 change: 1 addition & 0 deletions servers/physics_2d/physics_2d_server_wrap_mt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ class Physics2DServerWrapMT : public Physics2DServer {

FUNC1(free, RID);
FUNC1(set_active, bool);
FUNC1(set_collision_iterations, int);

virtual void init();
virtual void step(real_t p_step);
Expand Down
2 changes: 2 additions & 0 deletions servers/physics_2d_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,8 @@ void Physics2DServer::_bind_methods() {

ClassDB::bind_method(D_METHOD("set_active", "active"), &Physics2DServer::set_active);

ClassDB::bind_method(D_METHOD("set_collision_iterations", "iterations"), &Physics2DServer::set_collision_iterations);

ClassDB::bind_method(D_METHOD("get_process_info", "process_info"), &Physics2DServer::get_process_info);

BIND_ENUM_CONSTANT(SPACE_PARAM_CONTACT_RECYCLE_RADIUS);
Expand Down
2 changes: 2 additions & 0 deletions servers/physics_2d_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,8 @@ class Physics2DServer : public Object {

virtual bool is_flushing_queries() const = 0;

virtual void set_collision_iterations(int iterations) = 0;

enum ProcessInfo {

INFO_ACTIVE_OBJECTS,
Expand Down