diff options
| author | Juan Linietsky <juan@godotengine.org> | 2020-02-12 14:24:06 -0300 |
|---|---|---|
| committer | Juan Linietsky <juan@godotengine.org> | 2020-02-12 14:24:54 -0300 |
| commit | cf8c679a23b21d6c6f29cba6a54eaa2eed88bf92 (patch) | |
| tree | 52aca947b395362b2addec4843915b15947c32ca /servers/visual | |
| parent | 4aa31a2851e3dd5b67193194f899850239b2669d (diff) | |
ObjectID converted to a structure, fixes many bugs where used incorrectly as 32 bits.
Diffstat (limited to 'servers/visual')
| -rw-r--r-- | servers/visual/visual_server_scene.cpp | 6 | ||||
| -rw-r--r-- | servers/visual/visual_server_scene.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/servers/visual/visual_server_scene.cpp b/servers/visual/visual_server_scene.cpp index 0df8853f12..61c885cba3 100644 --- a/servers/visual/visual_server_scene.cpp +++ b/servers/visual/visual_server_scene.cpp @@ -805,7 +805,7 @@ Vector<ObjectID> VisualServerScene::instances_cull_aabb(const AABB &p_aabb, RID Instance *instance = cull[i]; ERR_CONTINUE(!instance); - if (instance->object_id == 0) + if (instance->object_id.is_null()) continue; instances.push_back(instance->object_id); @@ -827,7 +827,7 @@ Vector<ObjectID> VisualServerScene::instances_cull_ray(const Vector3 &p_from, co for (int i = 0; i < culled; i++) { Instance *instance = cull[i]; ERR_CONTINUE(!instance); - if (instance->object_id == 0) + if (instance->object_id.is_null()) continue; instances.push_back(instance->object_id); @@ -851,7 +851,7 @@ Vector<ObjectID> VisualServerScene::instances_cull_convex(const Vector<Plane> &p Instance *instance = cull[i]; ERR_CONTINUE(!instance); - if (instance->object_id == 0) + if (instance->object_id.is_null()) continue; instances.push_back(instance->object_id); diff --git a/servers/visual/visual_server_scene.h b/servers/visual/visual_server_scene.h index a811e8b27a..8dbd60d3ff 100644 --- a/servers/visual/visual_server_scene.h +++ b/servers/visual/visual_server_scene.h @@ -162,7 +162,7 @@ public: AABB *custom_aabb; // <Zylann> would using aabb directly with a bool be better? float extra_margin; - uint32_t object_id; + ObjectID object_id; float lod_begin; float lod_end; @@ -203,7 +203,6 @@ public: extra_margin = 0; - object_id = 0; visible = true; lod_begin = 0; |