diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-16 11:59:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-16 11:59:38 +0200 |
| commit | c1277c2183eaacb9ae49f9fef0c57443b934b72b (patch) | |
| tree | 434b526eb286850ebccc6d2c998a7d90fdb8b5e2 /servers/physics_server_2d.h | |
| parent | 396def9b66c476f7834604adb7136ca903ed01be (diff) | |
| parent | 746dddc0673d7261f19b1e056e90e6e3a49ef33a (diff) | |
Merge pull request #60999 from reduz/replace-rbhash-by-hashmap
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 2f70b88e30..bd53764932 100644 --- a/servers/physics_server_2d.h +++ b/servers/physics_server_2d.h @@ -127,7 +127,7 @@ public: struct RayParameters { Vector2 from; Vector2 to; - Set<RID> exclude; + RBSet<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; - Set<RID> exclude; + RBSet<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; - Set<RID> exclude; + RBSet<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; - Set<RID> exclude_bodies; - Set<ObjectID> exclude_objects; + RBSet<RID> exclude_bodies; + RBSet<ObjectID> exclude_objects; MotionParameters() {} |