Fix *Camera components' add_helper logic (#153)

Analog `*Light` components.
vatro · Nov 19, 2022 · 3206309 · 3206309
1 parent d43a6a8
commit 3206309
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 16 deletions.
diff --git a/src/lib/components/OrthographicCamera.svelte b/src/lib/components/OrthographicCamera.svelte
@@ -611,18 +611,25 @@ If you use this approach you'll see a warning in the console if you define left,
 	/** Creates and adds a `CameraHelper` (_no `helperParams`_). */
 	export let helper: boolean | undefined = undefined
 
-	$: camera && !camera.userData.helper && helper === true ? add_helper() : null
-	$: camera && camera.userData.helper && !helper ? remove_helper() : null
+	$: camera && helper === true ? add_helper() : null
+	$: camera && helper !== undefined && !helper ? remove_helper() : null
 
 	function add_helper(): void {
 		if (camera) {
-			camera.userData.helper = new CameraHelper(camera)
-			if (scene) {
-				scene.add(camera.userData.helper)
+			if (!camera.userData.helper) {
+				camera.userData.helper = new CameraHelper(camera)
+				if (scene) {
+					scene.add(camera.userData.helper)
+				} else {
+					console.error(
+						`SVELTHREE > ${c_name} > add_helper : Couldn't add helper to unavailable 'scene' instance!`,
+						{ scene }
+					)
+				}
 			} else {
-				console.error(
-					`SVELTHREE > ${c_name} > add_helper : Couldn't add helper to unavailable 'scene' instance!`,
-					{ scene }
+				console.debug(
+					`SVELTHREE > ${c_name} > add_helper : Didn't create new helper, 'camera.userData.helper' instance already available!`,
+					{ camera, helper: camera.userData.helper }
 				)
 			}
 		} else {

diff --git a/src/lib/components/PerspectiveCamera.svelte b/src/lib/components/PerspectiveCamera.svelte
@@ -687,18 +687,25 @@ svelthree uses svelte-accmod, where accessors are always `true`, regardless of `
 	/** Creates and adds a `CameraHelper` (_no `helperParams`_). */
 	export let helper: boolean | undefined = undefined
 
-	$: camera && !camera.userData.helper && helper === true ? add_helper() : null
-	$: camera && camera.userData.helper && !helper ? remove_helper() : null
+	$: camera && helper === true ? add_helper() : null
+	$: camera && helper !== undefined && !helper ? remove_helper() : null
 
 	function add_helper(): void {
 		if (camera) {
-			camera.userData.helper = new CameraHelper(camera)
-			if (scene) {
-				scene.add(camera.userData.helper)
+			if (!camera.userData.helper) {
+				camera.userData.helper = new CameraHelper(camera)
+				if (scene) {
+					scene.add(camera.userData.helper)
+				} else {
+					console.error(
+						`SVELTHREE > ${c_name} > add_helper : Couldn't add helper to unavailable 'scene' instance!`,
+						{ scene }
+					)
+				}
 			} else {
-				console.error(
-					`SVELTHREE > ${c_name} > add_helper : Couldn't add helper to unavailable 'scene' instance!`,
-					{ scene }
+				console.debug(
+					`SVELTHREE > ${c_name} > add_helper : Didn't create new helper, 'camera.userData.helper' instance already available!`,
+					{ camera, helper: camera.userData.helper }
 				)
 			}
 		} else {