Skip to content

Guards for redundant calls and cached lookup. #1040

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+45 −2
Open

Guards for redundant calls and cached lookup. #1040

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
5 changes: 3 additions & 2 deletions modules/godot_physics_3d/godot_physics_server_3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,9 @@ ObjectID GodotPhysicsServer3D::area_get_object_instance_id(RID p_area) const {
}

void GodotPhysicsServer3D::area_set_param(RID p_area, AreaParameter p_param, const Variant &p_value) {
if (space_owner.owns(p_area)) {
GodotSpace3D *space = space_owner.get_or_null(p_area);
// caching prevents multiple lookups.
GodotSpace3D *space = space_owner.get_or_null(p_area);
if (space) {
p_area = space->get_default_area()->get_self();
}
GodotArea3D *area = area_owner.get_or_null(p_area);
Expand Down
42 changes: 42 additions & 0 deletions scene/3d/physics/area_3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
#include "servers/audio_server.h"

void Area3D::set_gravity_space_override_mode(SpaceOverride p_mode) {
if (gravity_space_override == p_mode) {
return;
}
gravity_space_override = p_mode;
PhysicsServer3D::get_singleton()->area_set_param(get_rid(), PhysicsServer3D::AREA_PARAM_GRAVITY_OVERRIDE_MODE, p_mode);
}
Expand All @@ -44,6 +47,9 @@ Area3D::SpaceOverride Area3D::get_gravity_space_override_mode() const {
}

void Area3D::set_gravity_is_point(bool p_enabled) {
if (gravity_is_point == p_enabled) {
return;
}
gravity_is_point = p_enabled;
PhysicsServer3D::get_singleton()->area_set_param(get_rid(), PhysicsServer3D::AREA_PARAM_GRAVITY_IS_POINT, p_enabled);
}
Expand All @@ -53,6 +59,9 @@ bool Area3D::is_gravity_a_point() const {
}

void Area3D::set_gravity_point_unit_distance(real_t p_scale) {
if (gravity_point_unit_distance == p_scale) {
return;
}
gravity_point_unit_distance = p_scale;
PhysicsServer3D::get_singleton()->area_set_param(get_rid(), PhysicsServer3D::AREA_PARAM_GRAVITY_POINT_UNIT_DISTANCE, p_scale);
}
Expand All @@ -62,6 +71,9 @@ real_t Area3D::get_gravity_point_unit_distance() const {
}

void Area3D::set_gravity_point_center(const Vector3 &p_center) {
if (gravity_vec == p_center) {
return;
}
gravity_vec = p_center;
PhysicsServer3D::get_singleton()->area_set_param(get_rid(), PhysicsServer3D::AREA_PARAM_GRAVITY_VECTOR, p_center);
}
Expand All @@ -71,6 +83,9 @@ const Vector3 &Area3D::get_gravity_point_center() const {
}

void Area3D::set_gravity_direction(const Vector3 &p_direction) {
if (gravity_vec == p_direction) {
return;
}
gravity_vec = p_direction;
PhysicsServer3D::get_singleton()->area_set_param(get_rid(), PhysicsServer3D::AREA_PARAM_GRAVITY_VECTOR, p_direction);
}
Expand All @@ -80,6 +95,9 @@ const Vector3 &Area3D::get_gravity_direction() const {
}

void Area3D::set_gravity(real_t p_gravity) {
if (gravity == p_gravity) {
return;
}
gravity = p_gravity;
PhysicsServer3D::get_singleton()->area_set_param(get_rid(), PhysicsServer3D::AREA_PARAM_GRAVITY, p_gravity);
}
Expand All @@ -89,6 +107,9 @@ real_t Area3D::get_gravity() const {
}

void Area3D::set_linear_damp_space_override_mode(SpaceOverride p_mode) {
if (linear_damp_space_override == p_mode) {
return;
}
linear_damp_space_override = p_mode;
PhysicsServer3D::get_singleton()->area_set_param(get_rid(), PhysicsServer3D::AREA_PARAM_LINEAR_DAMP_OVERRIDE_MODE, p_mode);
}
Expand All @@ -98,6 +119,9 @@ Area3D::SpaceOverride Area3D::get_linear_damp_space_override_mode() const {
}

void Area3D::set_angular_damp_space_override_mode(SpaceOverride p_mode) {
if (angular_damp_space_override == p_mode) {
return;
}
angular_damp_space_override = p_mode;
PhysicsServer3D::get_singleton()->area_set_param(get_rid(), PhysicsServer3D::AREA_PARAM_ANGULAR_DAMP_OVERRIDE_MODE, p_mode);
}
Expand All @@ -107,6 +131,9 @@ Area3D::SpaceOverride Area3D::get_angular_damp_space_override_mode() const {
}

void Area3D::set_linear_damp(real_t p_linear_damp) {
if (linear_damp == p_linear_damp) {
return;
}
linear_damp = p_linear_damp;
PhysicsServer3D::get_singleton()->area_set_param(get_rid(), PhysicsServer3D::AREA_PARAM_LINEAR_DAMP, p_linear_damp);
}
Expand All @@ -116,6 +143,9 @@ real_t Area3D::get_linear_damp() const {
}

void Area3D::set_angular_damp(real_t p_angular_damp) {
if (angular_damp == p_angular_damp) {
return;
}
angular_damp = p_angular_damp;
PhysicsServer3D::get_singleton()->area_set_param(get_rid(), PhysicsServer3D::AREA_PARAM_ANGULAR_DAMP, p_angular_damp);
}
Expand All @@ -125,6 +155,9 @@ real_t Area3D::get_angular_damp() const {
}

void Area3D::set_priority(int p_priority) {
if (priority == p_priority) {
return;
}
priority = p_priority;
PhysicsServer3D::get_singleton()->area_set_param(get_rid(), PhysicsServer3D::AREA_PARAM_PRIORITY, p_priority);
}
Expand All @@ -134,6 +167,9 @@ int Area3D::get_priority() const {
}

void Area3D::set_wind_force_magnitude(real_t p_wind_force_magnitude) {
if (wind_force_magnitude == p_wind_force_magnitude) {
return;
}
wind_force_magnitude = p_wind_force_magnitude;
if (is_inside_tree()) {
_initialize_wind();
Expand All @@ -145,6 +181,9 @@ real_t Area3D::get_wind_force_magnitude() const {
}

void Area3D::set_wind_attenuation_factor(real_t p_wind_force_attenuation_factor) {
if (wind_attenuation_factor == p_wind_force_attenuation_factor) {
return;
}
wind_attenuation_factor = p_wind_force_attenuation_factor;
if (is_inside_tree()) {
_initialize_wind();
Expand All @@ -156,6 +195,9 @@ real_t Area3D::get_wind_attenuation_factor() const {
}

void Area3D::set_wind_source_path(const NodePath &p_wind_source_path) {
if (wind_source_path == p_wind_source_path) {
return;
}
wind_source_path = p_wind_source_path;
if (is_inside_tree()) {
_initialize_wind();
Expand Down
Loading