From 3c2f30ed2378a3c2228da82e37d5dae5f5f5e7f0 Mon Sep 17 00:00:00 2001 From: clayjohn Date: Thu, 22 Feb 2024 12:35:24 -0800 Subject: [PATCH] Implement VisibilityNotifier3D in the compatibility backend --- drivers/gles3/storage/utilities.cpp | 46 +++++++++++++++++++++- drivers/gles3/storage/utilities.h | 19 +++++++++ scene/3d/visible_on_screen_notifier_3d.cpp | 10 ----- scene/3d/visible_on_screen_notifier_3d.h | 2 - 4 files changed, 63 insertions(+), 14 deletions(-) diff --git a/drivers/gles3/storage/utilities.cpp b/drivers/gles3/storage/utilities.cpp index 793b3f64f0fc..c4fbe098cde8 100644 --- a/drivers/gles3/storage/utilities.cpp +++ b/drivers/gles3/storage/utilities.cpp @@ -160,6 +160,8 @@ RS::InstanceType Utilities::get_base_type(RID p_rid) const { return RS::INSTANCE_PARTICLES; } else if (GLES3::ParticlesStorage::get_singleton()->owns_particles_collision(p_rid)) { return RS::INSTANCE_PARTICLES_COLLISION; + } else if (owns_visibility_notifier(p_rid)) { + return RS::INSTANCE_VISIBLITY_NOTIFIER; } return RS::INSTANCE_NONE; } @@ -207,6 +209,9 @@ bool Utilities::free(RID p_rid) { } else if (GLES3::MeshStorage::get_singleton()->owns_skeleton(p_rid)) { GLES3::MeshStorage::get_singleton()->skeleton_free(p_rid); return true; + } else if (owns_visibility_notifier(p_rid)) { + visibility_notifier_free(p_rid); + return true; } else { return false; } @@ -233,32 +238,69 @@ void Utilities::base_update_dependency(RID p_base, DependencyTracker *p_instance } else if (ParticlesStorage::get_singleton()->owns_particles_collision(p_base)) { Dependency *dependency = ParticlesStorage::get_singleton()->particles_collision_get_dependency(p_base); p_instance->update_dependency(dependency); + } else if (owns_visibility_notifier(p_base)) { + VisibilityNotifier *vn = get_visibility_notifier(p_base); + p_instance->update_dependency(&vn->dependency); } } /* VISIBILITY NOTIFIER */ RID Utilities::visibility_notifier_allocate() { - return RID(); + return visibility_notifier_owner.allocate_rid(); } void Utilities::visibility_notifier_initialize(RID p_notifier) { + visibility_notifier_owner.initialize_rid(p_notifier, VisibilityNotifier()); } void Utilities::visibility_notifier_free(RID p_notifier) { + VisibilityNotifier *vn = visibility_notifier_owner.get_or_null(p_notifier); + vn->dependency.deleted_notify(p_notifier); + visibility_notifier_owner.free(p_notifier); } void Utilities::visibility_notifier_set_aabb(RID p_notifier, const AABB &p_aabb) { + VisibilityNotifier *vn = visibility_notifier_owner.get_or_null(p_notifier); + ERR_FAIL_NULL(vn); + vn->aabb = p_aabb; + vn->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_AABB); } void Utilities::visibility_notifier_set_callbacks(RID p_notifier, const Callable &p_enter_callbable, const Callable &p_exit_callable) { + VisibilityNotifier *vn = visibility_notifier_owner.get_or_null(p_notifier); + ERR_FAIL_NULL(vn); + vn->enter_callback = p_enter_callbable; + vn->exit_callback = p_exit_callable; } AABB Utilities::visibility_notifier_get_aabb(RID p_notifier) const { - return AABB(); + const VisibilityNotifier *vn = visibility_notifier_owner.get_or_null(p_notifier); + ERR_FAIL_NULL_V(vn, AABB()); + return vn->aabb; } void Utilities::visibility_notifier_call(RID p_notifier, bool p_enter, bool p_deferred) { + VisibilityNotifier *vn = visibility_notifier_owner.get_or_null(p_notifier); + ERR_FAIL_NULL(vn); + + if (p_enter) { + if (!vn->enter_callback.is_null()) { + if (p_deferred) { + vn->enter_callback.call_deferred(); + } else { + vn->enter_callback.call(); + } + } + } else { + if (!vn->exit_callback.is_null()) { + if (p_deferred) { + vn->exit_callback.call_deferred(); + } else { + vn->exit_callback.call(); + } + } + } } /* TIMING */ diff --git a/drivers/gles3/storage/utilities.h b/drivers/gles3/storage/utilities.h index b9603b972e41..7c3b08717e2d 100644 --- a/drivers/gles3/storage/utilities.h +++ b/drivers/gles3/storage/utilities.h @@ -39,10 +39,25 @@ namespace GLES3 { +/* VISIBILITY NOTIFIER */ + +struct VisibilityNotifier { + AABB aabb; + Callable enter_callback; + Callable exit_callback; + Dependency dependency; +}; + class Utilities : public RendererUtilities { private: static Utilities *singleton; + /* VISIBILITY NOTIFIER */ + + mutable RID_Owner visibility_notifier_owner; + + /* MISC */ + struct ResourceAllocation { #ifdef DEV_ENABLED String name; @@ -149,6 +164,10 @@ class Utilities : public RendererUtilities { virtual void base_update_dependency(RID p_base, DependencyTracker *p_instance) override; /* VISIBILITY NOTIFIER */ + + VisibilityNotifier *get_visibility_notifier(RID p_rid) { return visibility_notifier_owner.get_or_null(p_rid); }; + bool owns_visibility_notifier(RID p_rid) const { return visibility_notifier_owner.owns(p_rid); }; + virtual RID visibility_notifier_allocate() override; virtual void visibility_notifier_initialize(RID p_notifier) override; virtual void visibility_notifier_free(RID p_notifier) override; diff --git a/scene/3d/visible_on_screen_notifier_3d.cpp b/scene/3d/visible_on_screen_notifier_3d.cpp index be86872a591d..272852e8fa09 100644 --- a/scene/3d/visible_on_screen_notifier_3d.cpp +++ b/scene/3d/visible_on_screen_notifier_3d.cpp @@ -79,16 +79,6 @@ void VisibleOnScreenNotifier3D::_notification(int p_what) { } } -PackedStringArray VisibleOnScreenNotifier3D::get_configuration_warnings() const { - PackedStringArray warnings = VisualInstance3D::get_configuration_warnings(); - - if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") { - warnings.push_back(RTR("VisibleOnScreenNotifier3D nodes are not supported when using the GL Compatibility backend yet. Support will be added in a future release.")); - } - - return warnings; -} - void VisibleOnScreenNotifier3D::_bind_methods() { ClassDB::bind_method(D_METHOD("set_aabb", "rect"), &VisibleOnScreenNotifier3D::set_aabb); ClassDB::bind_method(D_METHOD("is_on_screen"), &VisibleOnScreenNotifier3D::is_on_screen); diff --git a/scene/3d/visible_on_screen_notifier_3d.h b/scene/3d/visible_on_screen_notifier_3d.h index 85156c256e9b..7115de536f3a 100644 --- a/scene/3d/visible_on_screen_notifier_3d.h +++ b/scene/3d/visible_on_screen_notifier_3d.h @@ -57,8 +57,6 @@ class VisibleOnScreenNotifier3D : public VisualInstance3D { virtual AABB get_aabb() const override; bool is_on_screen() const; - virtual PackedStringArray get_configuration_warnings() const override; - VisibleOnScreenNotifier3D(); ~VisibleOnScreenNotifier3D(); };