From 6e98c4cd502949fc3659c882ac671a69457251b4 Mon Sep 17 00:00:00 2001
From: reduz <reduzio@gmail.com>
Date: Wed, 16 Jun 2021 15:43:02 -0300
Subject: Refactor VisibilityNotifier3D

* This is the 3D counterpart to #49632
* Implemented a bit different as 3D works using instancing

After merged, both 2D and 3D classes will most likely be renamed in a separate PR to DisplayNotifier2D/3D.
---
 doc/classes/RenderingServer.xml      |  2 +-
 doc/classes/Viewport.xml             |  7 -------
 doc/classes/VisibilityEnabler3D.xml  | 35 +++++------------------------------
 doc/classes/VisibilityNotifier3D.xml | 16 +---------------
 4 files changed, 7 insertions(+), 53 deletions(-)

(limited to 'doc/classes')

diff --git a/doc/classes/RenderingServer.xml b/doc/classes/RenderingServer.xml
index 9b9644093f..300108ff77 100644
--- a/doc/classes/RenderingServer.xml
+++ b/doc/classes/RenderingServer.xml
@@ -3702,7 +3702,7 @@
 		</constant>
 		<constant name="INSTANCE_OCCLUDER" value="11" enum="InstanceType">
 		</constant>
-		<constant name="INSTANCE_MAX" value="12" enum="InstanceType">
+		<constant name="INSTANCE_MAX" value="13" enum="InstanceType">
 			Represents the size of the [enum InstanceType] enum.
 		</constant>
 		<constant name="INSTANCE_GEOMETRY_MASK" value="30" enum="InstanceType">
diff --git a/doc/classes/Viewport.xml b/doc/classes/Viewport.xml
index 96d63b27ad..292be34a0d 100644
--- a/doc/classes/Viewport.xml
+++ b/doc/classes/Viewport.xml
@@ -179,13 +179,6 @@
 			<description>
 			</description>
 		</method>
-		<method name="update_worlds">
-			<return type="void">
-			</return>
-			<description>
-				Forces update of the 2D and 3D worlds.
-			</description>
-		</method>
 		<method name="warp_mouse">
 			<return type="void">
 			</return>
diff --git a/doc/classes/VisibilityEnabler3D.xml b/doc/classes/VisibilityEnabler3D.xml
index d78ebb55f2..4614859a44 100644
--- a/doc/classes/VisibilityEnabler3D.xml
+++ b/doc/classes/VisibilityEnabler3D.xml
@@ -12,44 +12,19 @@
 	<tutorials>
 	</tutorials>
 	<methods>
-		<method name="is_enabler_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="enabler" type="int" enum="VisibilityEnabler3D.Enabler">
-			</argument>
-			<description>
-				Returns whether the enabler identified by given [enum Enabler] constant is active.
-			</description>
-		</method>
-		<method name="set_enabler">
-			<return type="void">
-			</return>
-			<argument index="0" name="enabler" type="int" enum="VisibilityEnabler3D.Enabler">
-			</argument>
-			<argument index="1" name="enabled" type="bool">
-			</argument>
-			<description>
-				Sets active state of the enabler identified by given [enum Enabler] constant.
-			</description>
-		</method>
 	</methods>
 	<members>
-		<member name="freeze_bodies" type="bool" setter="set_enabler" getter="is_enabler_enabled" default="true">
-			If [code]true[/code], [RigidBody3D] nodes will be paused.
+		<member name="enable_mode" type="int" setter="set_enable_mode" getter="get_enable_mode" enum="VisibilityEnabler3D.EnableMode" default="0">
 		</member>
-		<member name="pause_animations" type="bool" setter="set_enabler" getter="is_enabler_enabled" default="true">
-			If [code]true[/code], [AnimationPlayer] nodes will be paused.
+		<member name="enable_node_path" type="NodePath" setter="set_enable_node_path" getter="get_enable_node_path" default="NodePath(&quot;..&quot;)">
 		</member>
 	</members>
 	<constants>
-		<constant name="ENABLER_PAUSE_ANIMATIONS" value="0" enum="Enabler">
-			This enabler will pause [AnimationPlayer] nodes.
+		<constant name="ENABLE_MODE_INHERIT" value="0" enum="EnableMode">
 		</constant>
-		<constant name="ENABLER_FREEZE_BODIES" value="1" enum="Enabler">
-			This enabler will freeze [RigidBody3D] nodes.
+		<constant name="ENABLE_MODE_ALWAYS" value="1" enum="EnableMode">
 		</constant>
-		<constant name="ENABLER_MAX" value="2" enum="Enabler">
-			Represents the size of the [enum Enabler] enum.
+		<constant name="ENABLE_MODE_WHEN_PAUSED" value="2" enum="EnableMode">
 		</constant>
 	</constants>
 </class>
diff --git a/doc/classes/VisibilityNotifier3D.xml b/doc/classes/VisibilityNotifier3D.xml
index e5d3116612..bd6c03ea20 100644
--- a/doc/classes/VisibilityNotifier3D.xml
+++ b/doc/classes/VisibilityNotifier3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VisibilityNotifier3D" inherits="Node3D" version="4.0">
+<class name="VisibilityNotifier3D" inherits="VisualInstance3D" version="4.0">
 	<brief_description>
 		Detects approximately when the node is visible on screen.
 	</brief_description>
@@ -26,20 +26,6 @@
 		</member>
 	</members>
 	<signals>
-		<signal name="camera_entered">
-			<argument index="0" name="camera" type="Camera3D">
-			</argument>
-			<description>
-				Emitted when the VisibilityNotifier3D enters a [Camera3D]'s view.
-			</description>
-		</signal>
-		<signal name="camera_exited">
-			<argument index="0" name="camera" type="Camera3D">
-			</argument>
-			<description>
-				Emitted when the VisibilityNotifier3D exits a [Camera3D]'s view.
-			</description>
-		</signal>
 		<signal name="screen_entered">
 			<description>
 				Emitted when the VisibilityNotifier3D enters the screen.
-- 
cgit v1.2.3