@lv-x-software-house/x_view 1.2.6-dev.46 → 1.2.6-dev.48

package/dist/index.js

@@ -14575,20 +14575,20 @@ function XViewScene({
   };
   const tweenToTarget = (0, import_react31.useCallback)(
     (target, zoomFactor = 1, forcedDirection = null) => {
-      const { camera, controls, tweenGroup } = stateRef.current;
-      if (!camera || !controls || !tweenGroup) return;
+      const { camera: sceneCamera, controls: sceneControls, tweenGroup } = stateRef.current;
+      if (!sceneCamera || !sceneControls || !tweenGroup) return;
       const targetPos = target instanceof THREE3.Mesh ? target.getWorldPosition(new THREE3.Vector3()) : target;
-      const controlsTween = new import_tween2.Tween(controls.target).to(targetPos, 1500).easing(import_tween2.Easing.Cubic.Out);
+      const controlsTween = new import_tween2.Tween(sceneControls.target).to(targetPos, 1500).easing(import_tween2.Easing.Cubic.Out);
       tweenGroup.add(controlsTween);
       controlsTween.start();
       let offset;
       if (forcedDirection) {
         offset = forcedDirection.clone().normalize().multiplyScalar(x_view_config.CAMERA_ZOOM_DISTANCE / zoomFactor);
       } else {
-        offset = camera.position.clone().sub(controls.target).normalize().multiplyScalar(x_view_config.CAMERA_ZOOM_DISTANCE / zoomFactor);
+        offset = sceneCamera.position.clone().sub(sceneControls.target).normalize().multiplyScalar(x_view_config.CAMERA_ZOOM_DISTANCE / zoomFactor);
       }
       const targetCameraPos = targetPos.clone().add(offset);
-      const cameraTween = new import_tween2.Tween(camera.position).to(targetCameraPos, 1500).easing(import_tween2.Easing.Cubic.Out);
+      const cameraTween = new import_tween2.Tween(sceneCamera.position).to(targetCameraPos, 1500).easing(import_tween2.Easing.Cubic.Out);
       tweenGroup.add(cameraTween);
       cameraTween.start();
     },
@@ -15334,14 +15334,14 @@ function XViewScene({
       });
     });
     if (questCount > 0) {
-      const { camera, controls } = stateRef.current;
+      const { camera: sceneCamera, controls: sceneControls } = stateRef.current;
       const centerX = sumX / questCount;
       const centerY = sumY / questCount;
       const targetFocus = new THREE3.Vector3(centerX, centerY, 0);
-      const targetTween = new import_tween2.Tween(controls.target).to({ x: targetFocus.x, y: targetFocus.y, z: targetFocus.z }, 1500).easing(import_tween2.Easing.Cubic.InOut);
+      const targetTween = new import_tween2.Tween(sceneControls.target).to({ x: targetFocus.x, y: targetFocus.y, z: targetFocus.z }, 1500).easing(import_tween2.Easing.Cubic.InOut);
       tweenGroup.add(targetTween);
       targetTween.start();
-      const camTween = new import_tween2.Tween(camera.position).to({ x: targetFocus.x, y: targetFocus.y, z: 140 }, 1500).easing(import_tween2.Easing.Cubic.InOut);
+      const camTween = new import_tween2.Tween(sceneCamera.position).to({ x: targetFocus.x, y: targetFocus.y, z: 140 }, 1500).easing(import_tween2.Easing.Cubic.InOut);
       tweenGroup.add(camTween);
       camTween.start();
     }
@@ -15899,14 +15899,14 @@ function XViewScene({
           node.position.y += Math.sin(clock.getElapsedTime() * 0.5 + i) * 5e-3;
           const isImageNode = node.userData.useImageAsTexture === true || String(node.userData.useImageAsTexture) === "true";
           if (isImageNode) {
-            node.quaternion.copy(camera2.quaternion);
+            node.quaternion.copy(camera.quaternion);
           }
         });
       } else {
         stateRef.current.clickableNodes.forEach((node) => {
           const isImageNode = node.userData.useImageAsTexture === true || String(node.userData.useImageAsTexture) === "true";
           if (isImageNode) {
-            node.quaternion.copy(camera2.quaternion);
+            node.quaternion.copy(camera.quaternion);
           }
         });
       }
@@ -15976,8 +15976,8 @@ function XViewScene({
         const srcMesh = stateRef.current.nodeObjects[String(connection.sourceNodeData.id)];
         if (srcMesh) {
           const raycaster2 = new THREE3.Raycaster();
-          raycaster2.setFromCamera(mouse, camera2);
-          camera2.getWorldDirection(plane.normal);
+          raycaster2.setFromCamera(mouse, camera);
+          camera.getWorldDirection(plane.normal);
           plane.setFromNormalAndCoplanarPoint(plane.normal, srcMesh.position);
           if (raycaster2.ray.intersectPlane(plane, intersectionPoint))
             connection.line.geometry.setPositions([
@@ -15990,8 +15990,8 @@ function XViewScene({
         const fixedMesh = stateRef.current.nodeObjects[String(relink.fixedNodeId)];
         if (fixedMesh) {
           const raycaster2 = new THREE3.Raycaster();
-          raycaster2.setFromCamera(mouse, camera2);
-          camera2.getWorldDirection(plane.normal);
+          raycaster2.setFromCamera(mouse, camera);
+          camera.getWorldDirection(plane.normal);
           plane.setFromNormalAndCoplanarPoint(plane.normal, fixedMesh.position);
           if (raycaster2.ray.intersectPlane(plane, intersectionPoint))
             relink.line.geometry.setPositions([
@@ -16014,46 +16014,52 @@ function XViewScene({
         tooltipEl: tooltipRef.current,
         hoveredNode: stateRef.current.hoveredNode,
         hoveredLink: stateRef.current.hoveredLink,
-        camera: camera2,
+        camera,
         mountEl: currentMount,
         isSceneBusy: stateRef.current.isDragging || creation.isActive || connection.isActive || relink.isActive || ancestryMode.isActive,
         parentData: parentDataRef.current,
         ancestryData: ancestryDataRef.current
       });
       (_b2 = stateRef.current.tweenGroup) == null ? void 0 : _b2.update(time);
-      const { keysPressed, controls: controls2, camera: camera2 } = stateRef.current;
-      if (controls2 && keysPressed) {
-        const panSpeed = 0.8;
-        const rotateSpeed = 0.025;
-        const zoomSpeed = 1.025;
+      const { keysPressed, controls: sceneControls, camera: sceneCamera } = stateRef.current;
+      if (sceneControls && keysPressed) {
+        const panSpeed = 0.5;
+        const rotateSpeed = 0.02;
+        const zoomInFactor = 0.98;
+        const zoomOutFactor = 1.02;
         const isShift = !!keysPressed["shiftKey"];
         const isCtrl = !!keysPressed["ctrlKey"];
         if (isCtrl) {
-          if (keysPressed["ArrowLeft"]) controls2._rotateLeft(rotateSpeed);
-          if (keysPressed["ArrowRight"]) controls2._rotateLeft(-rotateSpeed);
-          if (keysPressed["ArrowUp"]) controls2._rotateUp(rotateSpeed);
-          if (keysPressed["ArrowDown"]) controls2._rotateUp(-rotateSpeed);
+          const offset = sceneCamera.position.clone().sub(sceneControls.target);
+          const spherical = new THREE3.Spherical().setFromVector3(offset);
+          if (keysPressed["ArrowLeft"]) spherical.theta += rotateSpeed;
+          if (keysPressed["ArrowRight"]) spherical.theta -= rotateSpeed;
+          if (keysPressed["ArrowUp"]) spherical.phi -= rotateSpeed;
+          if (keysPressed["ArrowDown"]) spherical.phi += rotateSpeed;
+          spherical.makeSafe();
+          offset.setFromSpherical(spherical);
+          sceneCamera.position.copy(sceneControls.target).add(offset);
         } else if (isShift) {
-          if (keysPressed["ArrowUp"]) controls2._dollyIn(zoomSpeed);
-          if (keysPressed["ArrowDown"]) controls2._dollyOut(zoomSpeed);
+          if (keysPressed["ArrowUp"]) sceneControls.dollyIn(zoomInFactor);
+          if (keysPressed["ArrowDown"]) sceneControls.dollyOut(zoomOutFactor);
         } else {
-          if (keysPressed["ArrowLeft"]) controls2.panLeft(panSpeed, camera2.matrix);
-          if (keysPressed["ArrowRight"]) controls2.panLeft(-panSpeed, camera2.matrix);
-          if (keysPressed["ArrowUp"]) controls2.panUp(panSpeed, camera2.matrix);
-          if (keysPressed["ArrowDown"]) controls2.panUp(-panSpeed, camera2.matrix);
+          if (keysPressed["ArrowLeft"]) sceneControls.panLeft(panSpeed, sceneCamera.matrix);
+          if (keysPressed["ArrowRight"]) sceneControls.panLeft(-panSpeed, sceneCamera.matrix);
+          if (keysPressed["ArrowUp"]) sceneControls.panUp(panSpeed, sceneCamera.matrix);
+          if (keysPressed["ArrowDown"]) sceneControls.panUp(-panSpeed, sceneCamera.matrix);
         }
       }
       stateRef.current.controls.update();
       renderer.autoClear = false;
       renderer.clear();
       scene.background = originalBackground;
-      camera2.layers.set(GHOST_BLOOM_LAYER);
+      camera.layers.set(GHOST_BLOOM_LAYER);
       composer.render();
       renderer.clearDepth();
       scene.background = null;
-      camera2.layers.set(DEFAULT_LAYER);
-      renderer.render(scene, camera2);
-      camera2.layers.enableAll();
+      camera.layers.set(DEFAULT_LAYER);
+      renderer.render(scene, camera);
+      camera.layers.enableAll();
     }
     animate();
     function handleResize() {
@@ -18518,9 +18524,9 @@ function XViewScene({
         if (isUiClear) {
           const isView = ((_c2 = viewParams == null ? void 0 : viewParams.type) == null ? void 0 : _c2.toLowerCase()) === "view";
           if (!isView) return;
-          const { graphGroup, glowTexture, controls, nodeObjects } = stateRef.current;
+          const { graphGroup, glowTexture, controls: sceneControls, nodeObjects } = stateRef.current;
           if (graphGroup) {
-            let ghostPosition = controls.target.clone();
+            let ghostPosition = sceneControls.target.clone();
             const existingNodes = Object.values(nodeObjects);
             let isOccupied = true;
             let radius = 18;
@@ -18532,9 +18538,9 @@ function XViewScene({
                 (mesh) => mesh.position.distanceTo(ghostPosition) < MIN_CLEARANCE
               );
               if (isOccupied) {
-                ghostPosition.x = controls.target.x + Math.cos(angle) * radius;
-                ghostPosition.y = controls.target.y + (Math.random() - 0.5) * 8;
-                ghostPosition.z = controls.target.z + Math.sin(angle) * radius;
+                ghostPosition.x = sceneControls.target.x + Math.cos(angle) * radius;
+                ghostPosition.y = sceneControls.target.y + (Math.random() - 0.5) * 8;
+                ghostPosition.z = sceneControls.target.z + Math.sin(angle) * radius;
                 angle += Math.PI / 3;
                 radius += 2.5;
                 attempts++;

package/dist/index.mjs

@@ -14631,20 +14631,20 @@ function XViewScene({
   };
   const tweenToTarget = useCallback6(
     (target, zoomFactor = 1, forcedDirection = null) => {
-      const { camera, controls, tweenGroup } = stateRef.current;
-      if (!camera || !controls || !tweenGroup) return;
+      const { camera: sceneCamera, controls: sceneControls, tweenGroup } = stateRef.current;
+      if (!sceneCamera || !sceneControls || !tweenGroup) return;
       const targetPos = target instanceof THREE3.Mesh ? target.getWorldPosition(new THREE3.Vector3()) : target;
-      const controlsTween = new Tween2(controls.target).to(targetPos, 1500).easing(Easing2.Cubic.Out);
+      const controlsTween = new Tween2(sceneControls.target).to(targetPos, 1500).easing(Easing2.Cubic.Out);
       tweenGroup.add(controlsTween);
       controlsTween.start();
       let offset;
       if (forcedDirection) {
         offset = forcedDirection.clone().normalize().multiplyScalar(x_view_config.CAMERA_ZOOM_DISTANCE / zoomFactor);
       } else {
-        offset = camera.position.clone().sub(controls.target).normalize().multiplyScalar(x_view_config.CAMERA_ZOOM_DISTANCE / zoomFactor);
+        offset = sceneCamera.position.clone().sub(sceneControls.target).normalize().multiplyScalar(x_view_config.CAMERA_ZOOM_DISTANCE / zoomFactor);
       }
       const targetCameraPos = targetPos.clone().add(offset);
-      const cameraTween = new Tween2(camera.position).to(targetCameraPos, 1500).easing(Easing2.Cubic.Out);
+      const cameraTween = new Tween2(sceneCamera.position).to(targetCameraPos, 1500).easing(Easing2.Cubic.Out);
       tweenGroup.add(cameraTween);
       cameraTween.start();
     },
@@ -15390,14 +15390,14 @@ function XViewScene({
       });
     });
     if (questCount > 0) {
-      const { camera, controls } = stateRef.current;
+      const { camera: sceneCamera, controls: sceneControls } = stateRef.current;
       const centerX = sumX / questCount;
       const centerY = sumY / questCount;
       const targetFocus = new THREE3.Vector3(centerX, centerY, 0);
-      const targetTween = new Tween2(controls.target).to({ x: targetFocus.x, y: targetFocus.y, z: targetFocus.z }, 1500).easing(Easing2.Cubic.InOut);
+      const targetTween = new Tween2(sceneControls.target).to({ x: targetFocus.x, y: targetFocus.y, z: targetFocus.z }, 1500).easing(Easing2.Cubic.InOut);
       tweenGroup.add(targetTween);
       targetTween.start();
-      const camTween = new Tween2(camera.position).to({ x: targetFocus.x, y: targetFocus.y, z: 140 }, 1500).easing(Easing2.Cubic.InOut);
+      const camTween = new Tween2(sceneCamera.position).to({ x: targetFocus.x, y: targetFocus.y, z: 140 }, 1500).easing(Easing2.Cubic.InOut);
       tweenGroup.add(camTween);
       camTween.start();
     }
@@ -15955,14 +15955,14 @@ function XViewScene({
           node.position.y += Math.sin(clock.getElapsedTime() * 0.5 + i) * 5e-3;
           const isImageNode = node.userData.useImageAsTexture === true || String(node.userData.useImageAsTexture) === "true";
           if (isImageNode) {
-            node.quaternion.copy(camera2.quaternion);
+            node.quaternion.copy(camera.quaternion);
           }
         });
       } else {
         stateRef.current.clickableNodes.forEach((node) => {
           const isImageNode = node.userData.useImageAsTexture === true || String(node.userData.useImageAsTexture) === "true";
           if (isImageNode) {
-            node.quaternion.copy(camera2.quaternion);
+            node.quaternion.copy(camera.quaternion);
           }
         });
       }
@@ -16032,8 +16032,8 @@ function XViewScene({
         const srcMesh = stateRef.current.nodeObjects[String(connection.sourceNodeData.id)];
         if (srcMesh) {
           const raycaster2 = new THREE3.Raycaster();
-          raycaster2.setFromCamera(mouse, camera2);
-          camera2.getWorldDirection(plane.normal);
+          raycaster2.setFromCamera(mouse, camera);
+          camera.getWorldDirection(plane.normal);
           plane.setFromNormalAndCoplanarPoint(plane.normal, srcMesh.position);
           if (raycaster2.ray.intersectPlane(plane, intersectionPoint))
             connection.line.geometry.setPositions([
@@ -16046,8 +16046,8 @@ function XViewScene({
         const fixedMesh = stateRef.current.nodeObjects[String(relink.fixedNodeId)];
         if (fixedMesh) {
           const raycaster2 = new THREE3.Raycaster();
-          raycaster2.setFromCamera(mouse, camera2);
-          camera2.getWorldDirection(plane.normal);
+          raycaster2.setFromCamera(mouse, camera);
+          camera.getWorldDirection(plane.normal);
           plane.setFromNormalAndCoplanarPoint(plane.normal, fixedMesh.position);
           if (raycaster2.ray.intersectPlane(plane, intersectionPoint))
             relink.line.geometry.setPositions([
@@ -16070,46 +16070,52 @@ function XViewScene({
         tooltipEl: tooltipRef.current,
         hoveredNode: stateRef.current.hoveredNode,
         hoveredLink: stateRef.current.hoveredLink,
-        camera: camera2,
+        camera,
         mountEl: currentMount,
         isSceneBusy: stateRef.current.isDragging || creation.isActive || connection.isActive || relink.isActive || ancestryMode.isActive,
         parentData: parentDataRef.current,
         ancestryData: ancestryDataRef.current
       });
       (_b2 = stateRef.current.tweenGroup) == null ? void 0 : _b2.update(time);
-      const { keysPressed, controls: controls2, camera: camera2 } = stateRef.current;
-      if (controls2 && keysPressed) {
-        const panSpeed = 0.8;
-        const rotateSpeed = 0.025;
-        const zoomSpeed = 1.025;
+      const { keysPressed, controls: sceneControls, camera: sceneCamera } = stateRef.current;
+      if (sceneControls && keysPressed) {
+        const panSpeed = 0.5;
+        const rotateSpeed = 0.02;
+        const zoomInFactor = 0.98;
+        const zoomOutFactor = 1.02;
         const isShift = !!keysPressed["shiftKey"];
         const isCtrl = !!keysPressed["ctrlKey"];
         if (isCtrl) {
-          if (keysPressed["ArrowLeft"]) controls2._rotateLeft(rotateSpeed);
-          if (keysPressed["ArrowRight"]) controls2._rotateLeft(-rotateSpeed);
-          if (keysPressed["ArrowUp"]) controls2._rotateUp(rotateSpeed);
-          if (keysPressed["ArrowDown"]) controls2._rotateUp(-rotateSpeed);
+          const offset = sceneCamera.position.clone().sub(sceneControls.target);
+          const spherical = new THREE3.Spherical().setFromVector3(offset);
+          if (keysPressed["ArrowLeft"]) spherical.theta += rotateSpeed;
+          if (keysPressed["ArrowRight"]) spherical.theta -= rotateSpeed;
+          if (keysPressed["ArrowUp"]) spherical.phi -= rotateSpeed;
+          if (keysPressed["ArrowDown"]) spherical.phi += rotateSpeed;
+          spherical.makeSafe();
+          offset.setFromSpherical(spherical);
+          sceneCamera.position.copy(sceneControls.target).add(offset);
         } else if (isShift) {
-          if (keysPressed["ArrowUp"]) controls2._dollyIn(zoomSpeed);
-          if (keysPressed["ArrowDown"]) controls2._dollyOut(zoomSpeed);
+          if (keysPressed["ArrowUp"]) sceneControls.dollyIn(zoomInFactor);
+          if (keysPressed["ArrowDown"]) sceneControls.dollyOut(zoomOutFactor);
         } else {
-          if (keysPressed["ArrowLeft"]) controls2.panLeft(panSpeed, camera2.matrix);
-          if (keysPressed["ArrowRight"]) controls2.panLeft(-panSpeed, camera2.matrix);
-          if (keysPressed["ArrowUp"]) controls2.panUp(panSpeed, camera2.matrix);
-          if (keysPressed["ArrowDown"]) controls2.panUp(-panSpeed, camera2.matrix);
+          if (keysPressed["ArrowLeft"]) sceneControls.panLeft(panSpeed, sceneCamera.matrix);
+          if (keysPressed["ArrowRight"]) sceneControls.panLeft(-panSpeed, sceneCamera.matrix);
+          if (keysPressed["ArrowUp"]) sceneControls.panUp(panSpeed, sceneCamera.matrix);
+          if (keysPressed["ArrowDown"]) sceneControls.panUp(-panSpeed, sceneCamera.matrix);
         }
       }
       stateRef.current.controls.update();
       renderer.autoClear = false;
       renderer.clear();
       scene.background = originalBackground;
-      camera2.layers.set(GHOST_BLOOM_LAYER);
+      camera.layers.set(GHOST_BLOOM_LAYER);
       composer.render();
       renderer.clearDepth();
       scene.background = null;
-      camera2.layers.set(DEFAULT_LAYER);
-      renderer.render(scene, camera2);
-      camera2.layers.enableAll();
+      camera.layers.set(DEFAULT_LAYER);
+      renderer.render(scene, camera);
+      camera.layers.enableAll();
     }
     animate();
     function handleResize() {
@@ -18574,9 +18580,9 @@ function XViewScene({
         if (isUiClear) {
           const isView = ((_c2 = viewParams == null ? void 0 : viewParams.type) == null ? void 0 : _c2.toLowerCase()) === "view";
           if (!isView) return;
-          const { graphGroup, glowTexture, controls, nodeObjects } = stateRef.current;
+          const { graphGroup, glowTexture, controls: sceneControls, nodeObjects } = stateRef.current;
           if (graphGroup) {
-            let ghostPosition = controls.target.clone();
+            let ghostPosition = sceneControls.target.clone();
             const existingNodes = Object.values(nodeObjects);
             let isOccupied = true;
             let radius = 18;
@@ -18588,9 +18594,9 @@ function XViewScene({
                 (mesh) => mesh.position.distanceTo(ghostPosition) < MIN_CLEARANCE
               );
               if (isOccupied) {
-                ghostPosition.x = controls.target.x + Math.cos(angle) * radius;
-                ghostPosition.y = controls.target.y + (Math.random() - 0.5) * 8;
-                ghostPosition.z = controls.target.z + Math.sin(angle) * radius;
+                ghostPosition.x = sceneControls.target.x + Math.cos(angle) * radius;
+                ghostPosition.y = sceneControls.target.y + (Math.random() - 0.5) * 8;
+                ghostPosition.z = sceneControls.target.z + Math.sin(angle) * radius;
                 angle += Math.PI / 3;
                 radius += 2.5;
                 attempts++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lv-x-software-house/x_view",
-  "version": "1.2.6-dev.46",
+  "version": "1.2.6-dev.48",
   "description": "Pacote privado contendo os componentes e lógica de renderização 3D do X View.",
   "author": "iv.x - Engenharia de Software - ivxsoftwarehouse@gmail.com",
   "license": "UNLICENSED",