mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49397 from nekomatata/query-uninitialized-members

Browse Source 
Fix uninitialized members in physics query results
This commit is contained in:
Rémi Verschelde 2021-06-07 20:40:19 +02:00 committed by GitHub
commit bf7dedb9e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
servers/physics_server_2d.h
View File

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

10
servers/physics_server_3d.h
View File

@ -157,8 +157,8 @@ public:
struct ShapeResult {
RID rid;
ObjectID collider_id;
Object *collider;
int shape;
Object *collider = nullptr;
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;
@ -168,8 +168,8 @@ public:
Vector3 normal;
RID rid;
ObjectID collider_id;
Object *collider;
int shape;
Object *collider = nullptr;
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;
@ -181,7 +181,7 @@ public:
Vector3 normal;
RID rid;
ObjectID collider_id;
int shape;
int shape = 0;
Vector3 linear_velocity; //velocity at contact point
};