From 9bdd924b2f1be1837d7439d1ffbe5f27eddd32a0 Mon Sep 17 00:00:00 2001 From: kovacsv Date: Tue, 17 Aug 2021 19:28:22 +0200 Subject: [PATCH] Remove mesh isolation by ctrl+click. --- source/viewer/navigation.js | 7 +++---- website/o3dv/js/modeldata.js | 6 +----- website/o3dv/js/website.js | 8 ++------ 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/source/viewer/navigation.js b/source/viewer/navigation.js index 12d634c..a4a290d 100644 --- a/source/viewer/navigation.js +++ b/source/viewer/navigation.js @@ -413,8 +413,7 @@ OV.Navigation = class this.mouse.Up (this.canvas, ev); this.clickDetector.Up (ev); if (this.clickDetector.IsClick ()) { - let isCtrlPressed = (ev.ctrlKey || ev.metaKey); - this.Click (ev.which, isCtrlPressed, ev.clientX, ev.clientY); + this.Click (ev.which, ev.clientX, ev.clientY); } } @@ -551,11 +550,11 @@ OV.Navigation = class } } - Click (button, isCtrlPressed, clientX, clientY) + Click (button, clientX, clientY) { if (this.onClick) { let mouseCoords = OV.GetClientCoordinates (this.canvas, clientX, clientY); - this.onClick (button, isCtrlPressed, mouseCoords); + this.onClick (button, mouseCoords); } } diff --git a/website/o3dv/js/modeldata.js b/website/o3dv/js/modeldata.js index 6e537c1..8f4e551 100644 --- a/website/o3dv/js/modeldata.js +++ b/website/o3dv/js/modeldata.js @@ -63,11 +63,7 @@ OV.MeshData = class this.showHideButton = new OV.TreeViewButton ('assets/images/navigator/visible.svg'); this.showHideButton.OnClick ((ev) => { - if (ev.ctrlKey || ev.metaKey) { - callbacks.onIsolate (this.originalIndex); - } else { - callbacks.onShowHide (this.originalIndex); - } + callbacks.onShowHide (this.originalIndex); }); this.menuItem.AddButton (this.showHideButton); diff --git a/website/o3dv/js/website.js b/website/o3dv/js/website.js index 1f46af5..c745a2b 100644 --- a/website/o3dv/js/website.js +++ b/website/o3dv/js/website.js @@ -138,18 +138,14 @@ OV.Website = class this.FitModelToWindow (true); } - OnModelClicked (button, isCtrlPressed, mouseCoordinates) + OnModelClicked (button, mouseCoordinates) { if (button === 1) { let meshUserData = this.viewer.GetMeshUserDataUnderMouse (mouseCoordinates); if (meshUserData === null) { this.navigator.SetSelection (null); } else { - if (isCtrlPressed) { - this.navigator.IsolateMesh (meshUserData.originalMeshIndex); - } else { - this.navigator.SetSelection (new OV.Selection (OV.SelectionType.Mesh, meshUserData.originalMeshIndex)); - } + this.navigator.SetSelection (new OV.Selection (OV.SelectionType.Mesh, meshUserData.originalMeshIndex)); } } }