Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Prevent setting too big or too small Collision Mask and Layer

Browse source
This commit is contained in:
Rafał Mikrut 2021-04-30 17:19:04 +02:00
parent 66f696c2c1
commit efcb097674
14 changed files with 48 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
servers/physics_server_2d.cpp
View file

@ -176,11 +176,11 @@ real_t PhysicsShapeQueryParameters2D::get_margin() const {
return margin;
}
void PhysicsShapeQueryParameters2D::set_collision_mask(int p_collision_mask) {
void PhysicsShapeQueryParameters2D::set_collision_mask(uint32_t p_collision_mask) {
collision_mask = p_collision_mask;
}
int PhysicsShapeQueryParameters2D::get_collision_mask() const {
uint32_t PhysicsShapeQueryParameters2D::get_collision_mask() const {
return collision_mask;
}

4
servers/physics_server_2d.h
View file

@ -128,8 +128,8 @@ public:
void set_margin(real_t p_margin);
real_t get_margin() const;
void set_collision_mask(int p_collision_mask);
int get_collision_mask() const;
void set_collision_mask(uint32_t p_mask);
uint32_t get_collision_mask() const;
void set_collide_with_bodies(bool p_enable);
bool is_collide_with_bodies_enabled() const;

4
servers/physics_server_3d.cpp
View file

@ -172,11 +172,11 @@ real_t PhysicsShapeQueryParameters3D::get_margin() const {
return margin;
}
void PhysicsShapeQueryParameters3D::set_collision_mask(int p_collision_mask) {
void PhysicsShapeQueryParameters3D::set_collision_mask(uint32_t p_collision_mask) {
collision_mask = p_collision_mask;
}
int PhysicsShapeQueryParameters3D::get_collision_mask() const {
uint32_t PhysicsShapeQueryParameters3D::get_collision_mask() const {
return collision_mask;
}

4
servers/physics_server_3d.h
View file

@ -125,8 +125,8 @@ public:
void set_margin(real_t p_margin);
real_t get_margin() const;
void set_collision_mask(int p_collision_mask);
int get_collision_mask() const;
void set_collision_mask(uint32_t p_collision_mask);
uint32_t get_collision_mask() const;
void set_exclude(const Vector<RID> &p_exclude);
Vector<RID> get_exclude() const;