diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-21 01:06:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-21 01:06:21 +0200 |
| commit | 8adf04804550957f43c810b13fcce66dd76e5fd8 (patch) | |
| tree | 2ee58365f1092587277770ceaedfc1e35454acfd /servers/physics_server_2d.h | |
| parent | f4126cc902b0cbb100bcf1b37ee15df5a8430d21 (diff) | |
| parent | 45af29da8095af16729955117a165d23e77cd740 (diff) | |
Merge pull request #61194 from reduz/new-hash-set
Add a new HashSet template
Diffstat (limited to 'servers/physics_server_2d.h')
| -rw-r--r-- | servers/physics_server_2d.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/servers/physics_server_2d.h b/servers/physics_server_2d.h index 745ee38ee1..7a821c64e6 100644 --- a/servers/physics_server_2d.h +++ b/servers/physics_server_2d.h @@ -127,7 +127,7 @@ public: struct RayParameters { Vector2 from; Vector2 to; - RBSet<RID> exclude; + HashSet<RID> exclude; uint32_t collision_mask = UINT32_MAX; bool collide_with_bodies = true; @@ -157,7 +157,7 @@ public: struct PointParameters { Vector2 position; ObjectID canvas_instance_id; - RBSet<RID> exclude; + HashSet<RID> exclude; uint32_t collision_mask = UINT32_MAX; bool collide_with_bodies = true; @@ -173,7 +173,7 @@ public: Transform2D transform; Vector2 motion; real_t margin = 0.0; - RBSet<RID> exclude; + HashSet<RID> exclude; uint32_t collision_mask = UINT32_MAX; bool collide_with_bodies = true; @@ -483,8 +483,8 @@ public: Vector2 motion; real_t margin = 0.08; bool collide_separation_ray = false; - RBSet<RID> exclude_bodies; - RBSet<ObjectID> exclude_objects; + HashSet<RID> exclude_bodies; + HashSet<ObjectID> exclude_objects; bool recovery_as_collision = false; MotionParameters() {} |