godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix uninitialized members in physics query results

Browse Source 
(cherry picked from commit c6bd0fd0f7)
This commit is contained in:
PouleyKetchoupp
2021-06-07 10:40:15 -07:00
committed by Rémi Verschelde
parent 089fde5c59
commit fab9c19d2e
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
servers/physics_2d_server.h
View File

@@ -164,9 +164,9 @@ public:
Vector2 position; Vector2 position;
Vector2 normal; Vector2 normal;
RID rid; RID rid;
ObjectID collider_id; ObjectID collider_id = 0;
Object *collider; Object *collider = nullptr;
int shape; int shape = 0;
Variant metadata; Variant metadata;
}; };
@@ -175,9 +175,9 @@ public:
struct ShapeResult { struct ShapeResult {
RID rid; RID rid;
ObjectID collider_id; ObjectID collider_id = 0;
Object *collider; Object *collider = nullptr;
int shape; int shape = 0;
Variant metadata; Variant metadata;
}; };
@@ -195,8 +195,8 @@ public:
Vector2 point; Vector2 point;
Vector2 normal; Vector2 normal;
RID rid; RID rid;
ObjectID collider_id; ObjectID collider_id = 0;
int shape; int shape = 0;
Vector2 linear_velocity; //velocity at contact point Vector2 linear_velocity; //velocity at contact point
Variant metadata; Variant metadata;
}; };

16
servers/physics_server.h
View File

@@ -158,9 +158,9 @@ public:
struct ShapeResult { struct ShapeResult {
RID rid; RID rid;
ObjectID collider_id; ObjectID collider_id = 0;
Object *collider; Object *collider = nullptr;
int shape; int shape = 0;
}; };
virtual int intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false) = 0; virtual int intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false) = 0;
@@ -170,9 +170,9 @@ public:
Vector3 position; Vector3 position;
Vector3 normal; Vector3 normal;
RID rid; RID rid;
ObjectID collider_id; ObjectID collider_id = 0;
Object *collider; Object *collider = nullptr;
int shape; int shape = 0;
}; };
virtual bool intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false, bool p_pick_ray = false) = 0; virtual bool intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false, bool p_pick_ray = false) = 0;
@@ -184,8 +184,8 @@ public:
Vector3 point; Vector3 point;
Vector3 normal; Vector3 normal;
RID rid; RID rid;
ObjectID collider_id; ObjectID collider_id = 0;
int shape; int shape = 0;
Vector3 linear_velocity; //velocity at contact point Vector3 linear_velocity; //velocity at contact point
}; };