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

Rename collision_friction to friction in TileMap #18191

Closed
wants to merge 1 commit into from
Closed

Rename collision_friction to friction in TileMap #18191

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
2 changes: 1 addition & 1 deletion doc/classes/TileMap.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@
<member name="collision_bounce" type="float" setter="set_collision_bounce" getter="get_collision_bounce">
Bounce value for static body collisions (see [code]collision_use_kinematic[/code]). Default value: 0.
</member>
<member name="collision_friction" type="float" setter="set_collision_friction" getter="get_collision_friction">
<member name="friction" type="float" setter="set_friction" getter="get_friction">
Friction value for static body collisions (see [code]collision_use_kinematic[/code]). Default value: 1.
</member>
<member name="collision_layer" type="int" setter="set_collision_layer" getter="get_collision_layer">
Expand Down
22 changes: 18 additions & 4 deletions scene/2d/tile_map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,7 +1171,7 @@ void TileMap::set_collision_use_kinematic(bool p_use_kinematic) {
_recreate_quadrants();
}

void TileMap::set_collision_friction(float p_friction) {
void TileMap::set_friction(float p_friction) {

friction = p_friction;
for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) {
Expand All @@ -1181,11 +1181,21 @@ void TileMap::set_collision_friction(float p_friction) {
}
}

float TileMap::get_collision_friction() const {
float TileMap::get_friction() const {

return friction;
}

void TileMap::set_collision_friction(float p_friction) {

set_friction(p_friction);
}

float TileMap::get_collision_friction() const {

return get_friction();
}

void TileMap::set_collision_bounce(float p_bounce) {

bounce = p_bounce;
Expand Down Expand Up @@ -1567,8 +1577,11 @@ void TileMap::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_collision_mask_bit", "bit", "value"), &TileMap::set_collision_mask_bit);
ClassDB::bind_method(D_METHOD("get_collision_mask_bit", "bit"), &TileMap::get_collision_mask_bit);

ClassDB::bind_method(D_METHOD("set_collision_friction", "value"), &TileMap::set_collision_friction);
ClassDB::bind_method(D_METHOD("get_collision_friction"), &TileMap::get_collision_friction);
ClassDB::bind_method(D_METHOD("set_collision_friction", "value"), &TileMap::set_friction);
ClassDB::bind_method(D_METHOD("get_collision_friction"), &TileMap::get_friction);

ClassDB::bind_method(D_METHOD("set_friction", "value"), &TileMap::set_friction);
ClassDB::bind_method(D_METHOD("get_friction"), &TileMap::get_friction);

ClassDB::bind_method(D_METHOD("set_collision_bounce", "value"), &TileMap::set_collision_bounce);
ClassDB::bind_method(D_METHOD("get_collision_bounce"), &TileMap::get_collision_bounce);
Expand Down Expand Up @@ -1618,6 +1631,7 @@ void TileMap::_bind_methods() {

ADD_GROUP("Collision", "collision_");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "collision_use_kinematic", PROPERTY_HINT_NONE, ""), "set_collision_use_kinematic", "get_collision_use_kinematic");
ADD_PROPERTY(PropertyInfo(Variant::REAL, "friction", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_friction", "get_friction");
ADD_PROPERTY(PropertyInfo(Variant::REAL, "collision_friction", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_collision_friction", "get_collision_friction");
ADD_PROPERTY(PropertyInfo(Variant::REAL, "collision_bounce", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_collision_bounce", "get_collision_bounce");
ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_layer", PROPERTY_HINT_LAYERS_2D_PHYSICS), "set_collision_layer", "get_collision_layer");
Expand Down
3 changes: 3 additions & 0 deletions scene/2d/tile_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,9 @@ class TileMap : public Node2D {
void set_collision_use_kinematic(bool p_use_kinematic);
bool get_collision_use_kinematic() const;

void set_friction(float p_friction);
float get_friction() const;

void set_collision_friction(float p_friction);
float get_collision_friction() const;

Expand Down