diff --git a/app/src/modules/collaboration/threads/threadsGroup.tsx b/app/src/modules/collaboration/threads/threadsGroup.tsx index 5b66193..5182860 100644 --- a/app/src/modules/collaboration/threads/threadsGroup.tsx +++ b/app/src/modules/collaboration/threads/threadsGroup.tsx @@ -50,6 +50,7 @@ function ThreadsGroup() { !intersect.object.name.includes("SelectionGroupBoundingBoxLine") && !intersect.object.name.includes("SelectionGroupBoundingBox") && !intersect.object.name.includes("SelectionGroupBoundingLine") && + intersect.object.type !== "TransformControlsPlane" && intersect.object.type !== "GridHelper" ); @@ -78,6 +79,7 @@ function ThreadsGroup() { !intersect.object.name.includes("SelectionGroupBoundingBoxLine") && !intersect.object.name.includes("SelectionGroupBoundingBox") && !intersect.object.name.includes("SelectionGroupBoundingLine") && + intersect.object.type !== "TransformControlsPlane" && intersect.object.type !== "GridHelper" ); if (intersects.length > 0) { diff --git a/app/src/modules/scene/controls/selectionControls/selection3D/selectionControls3D.tsx b/app/src/modules/scene/controls/selectionControls/selection3D/selectionControls3D.tsx index 111170d..9c88e81 100644 --- a/app/src/modules/scene/controls/selectionControls/selection3D/selectionControls3D.tsx +++ b/app/src/modules/scene/controls/selectionControls/selection3D/selectionControls3D.tsx @@ -149,8 +149,10 @@ const SelectionControls3D: React.FC = () => { !intersect.object.name.includes("SelectionGroupBoundingBoxLine") && !intersect.object.name.includes("SelectionGroupBoundingBox") && !intersect.object.name.includes("SelectionGroupBoundingLine") && + intersect.object.type !== "TransformControlsPlane" && intersect.object.type !== "GridHelper" ); + console.log("intersects: ", intersects); if (intersects.length > 0) { const intersect = intersects[0]; const intersectObject = intersect.object; diff --git a/app/src/modules/scene/tools/measurementTool.tsx b/app/src/modules/scene/tools/measurementTool.tsx index 632639e..6bbfae8 100644 --- a/app/src/modules/scene/tools/measurementTool.tsx +++ b/app/src/modules/scene/tools/measurementTool.tsx @@ -111,6 +111,7 @@ const MeasurementTool = () => { !intersect.object.name.includes("SelectionGroupBoundingBoxLine") && !intersect.object.name.includes("SelectionGroupBoundingBox") && !intersect.object.name.includes("SelectionGroupBoundingLine") && + intersect.object.type !== "TransformControlsPlane" && intersect.object.type !== "GridHelper" ); @@ -176,6 +177,7 @@ const MeasurementTool = () => { !intersect.object.name.includes("SelectionGroupBoundingBoxLine") && !intersect.object.name.includes("SelectionGroupBoundingBox") && !intersect.object.name.includes("SelectionGroupBoundingLine") && + intersect.object.type !== "TransformControlsPlane" && intersect.object.type !== "GridHelper" ); diff --git a/app/src/modules/simulation/events/triggerConnections/triggerConnector.tsx b/app/src/modules/simulation/events/triggerConnections/triggerConnector.tsx index 18aa143..e53a1df 100644 --- a/app/src/modules/simulation/events/triggerConnections/triggerConnector.tsx +++ b/app/src/modules/simulation/events/triggerConnections/triggerConnector.tsx @@ -23,7 +23,8 @@ function TriggerConnector() { const { gl, raycaster, scene, pointer, camera } = useThree(); const { subModule } = useSubModuleStore(); const { eventStore, productStore, versionStore } = useSceneContext(); - const { products, getPointByUuid, getIsEventInProduct, getActionByUuid, addTrigger, removeTrigger, addEvent, getEventByModelUuid, getPointUuidByActionUuid, getProductById, selectedProduct } = productStore(); + const { products, getPointByUuid, getIsEventInProduct, getActionByUuid, addTrigger, removeTrigger, addEvent, getEventByModelUuid, getPointUuidByActionUuid, getProductById, selectedProduct } = + productStore(); const { selectedAsset, clearSelectedAsset } = useSelectedAsset(); const [hoveredLineKey, setHoveredLineKey] = useState(null); const groupRefs = useRef>({}); @@ -370,7 +371,25 @@ function TriggerConnector() { useFrame(() => { if (firstSelectedPoint) { raycaster.setFromCamera(pointer, camera); - const intersects = raycaster.intersectObjects(scene.children, true).filter((intersect) => !intersect.object.name.includes("Roof") && !intersect.object.name.includes("MeasurementReference") && !intersect.object.name.includes("agv-collider") && !intersect.object.name.includes("zonePlane") && !intersect.object.name.includes("SelectionGroup") && !intersect.object.name.includes("selectionAssetGroup") && !intersect.object.name.includes("SelectionGroupBoundingBoxLine") && !intersect.object.name.includes("SelectionGroupBoundingBox") && !intersect.object.name.includes("SelectionGroupBoundingLine") && intersect.object.type !== "GridHelper" && !intersect.object.name.includes("ArrowWithTube") && !intersect.object.parent?.name.includes("Zone") && intersect.object.type !== "Line2"); + const intersects = raycaster + .intersectObjects(scene.children, true) + .filter( + (intersect) => + !intersect.object.name.includes("Roof") && + !intersect.object.name.includes("MeasurementReference") && + !intersect.object.name.includes("agv-collider") && + !intersect.object.name.includes("zonePlane") && + !intersect.object.name.includes("SelectionGroup") && + !intersect.object.name.includes("selectionAssetGroup") && + !intersect.object.name.includes("SelectionGroupBoundingBoxLine") && + !intersect.object.name.includes("SelectionGroupBoundingBox") && + !intersect.object.name.includes("SelectionGroupBoundingLine") && + intersect.object.type !== "GridHelper" && + !intersect.object.name.includes("ArrowWithTube") && + !intersect.object.parent?.name.includes("Zone") && + intersect.object.type !== "TransformControlsPlane" && + intersect.object.type !== "Line2" + ); let point: THREE.Vector3 | null = null; @@ -476,7 +495,16 @@ function TriggerConnector() { {currentLine && ( <> - + )} diff --git a/app/src/modules/visualization/widgets/3d/Dropped3dWidget.tsx b/app/src/modules/visualization/widgets/3d/Dropped3dWidget.tsx index 3938654..0cde6f1 100644 --- a/app/src/modules/visualization/widgets/3d/Dropped3dWidget.tsx +++ b/app/src/modules/visualization/widgets/3d/Dropped3dWidget.tsx @@ -124,6 +124,7 @@ export default function Dropped3dWidgets() { !intersect.object.name.includes("SelectionGroupBoundingBoxLine") && !intersect.object.name.includes("SelectionGroupBoundingBox") && !intersect.object.name.includes("SelectionGroupBoundingLine") && + intersect.object.type !== "TransformControlsPlane" && intersect.object.type !== "GridHelper" ); @@ -166,6 +167,7 @@ export default function Dropped3dWidgets() { !intersect.object.name.includes("SelectionGroupBoundingBoxLine") && !intersect.object.name.includes("SelectionGroupBoundingBox") && !intersect.object.name.includes("SelectionGroupBoundingLine") && + intersect.object.type !== "TransformControlsPlane" && intersect.object.type !== "GridHelper" ); // Update widget's position in memory