Don't override OrbitControls for Mac

OpenBuilds · Aug 14, 2018 · bf7eeb8 · bf7eeb8
1 parent 95ee90b
commit bf7eeb8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/index.html b/index.html
@@ -580,7 +580,7 @@ <h6>Calculating Toolpaths...</h6>
 		<div oncontextmenu="return false;" id="viewerContext"></div> -->
 		<!-- avoiding popup when right mouse is clicked -->
 
-		<div class="dialog" data-overlay-click-close="true" data-role="dialog" id="statusmodal" data-to-top="true" data-to-top="true">
+		<div class="dialog" data-overlay-click-close="true" data-role="dialog" id="statusmodal" data-to-top="true">
 			<div class="dialog-title" id="statusTitle">Status title </div>
 			<div class="dialog-content">
 				<div id="statusBody"></div>

diff --git a/js/advanced-cam-viewer-mouse.js b/js/advanced-cam-viewer-mouse.js
@@ -12,11 +12,21 @@ function mouseSelectMode() {
   if (dragcontrols) {
     dragcontrols.dispose();
   }
-  if (controls.enableRotate) {
-    helpoverlay.innerHTML = "<kbd>Left Mouse</kbd> = Select / <kbd>Middle Mouse</kbd> = Orbit / <kbd>Right Mouse</kbd> = Pan / <kbd>Wheel</kbd> = Zoom / <kbd>Ctrl</kbd> = Multiple Select / <kbd>Del</kbd> = Delete Selected"
+  var isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
+  if (!isMac) {
+    if (controls.enableRotate) {
+      helpoverlay.innerHTML = "<kbd>Left Mouse</kbd> = Select / <kbd>Middle Mouse</kbd> = Orbit / <kbd>Right Mouse</kbd> = Pan / <kbd>Wheel</kbd> = Zoom / <kbd>Ctrl</kbd> = Multiple Select / <kbd>Del</kbd> = Delete Selected"
+    } else {
+      helpoverlay.innerHTML = "<kbd>Left Mouse</kbd> = Select / <kbd>Right Mouse</kbd> = Pan / <kbd>Wheel</kbd> = Zoom / <kbd>Ctrl</kbd> = Multiple Select / <kbd>Del</kbd> = Delete Selected"
+    }
   } else {
-    helpoverlay.innerHTML = "<kbd>Left Mouse</kbd> = Select / <kbd>Right Mouse</kbd> = Pan / <kbd>Wheel</kbd> = Zoom / <kbd>Ctrl</kbd> = Multiple Select / <kbd>Del</kbd> = Delete Selected"
+    if (controls.enableRotate) {
+      helpoverlay.innerHTML = "<kbd>Left Mouse</kbd> = Select / <kbd>Middle Mouse</kbd> = Orbit / <kbd>Right Mouse</kbd> = Pan / <kbd>Wheel</kbd> = Zoom / <kbd>Ctrl</kbd> = Multiple Select / <kbd>Del</kbd> = Delete Selected"
+    } else {
+      helpoverlay.innerHTML = "<kbd>Ctrl</kbd> = Multiple Select / <kbd>Del</kbd> = Delete Selected"
+    }
   }
+
 };
 
 // move mode

diff --git a/js/viewer.js b/js/viewer.js
@@ -292,11 +292,15 @@ function init3D() {
 
   controls = new THREE.OrbitControls(camera, renderer.domElement);
   controls.target.set(0, 0, 0); // view direction perpendicular to XY-plane
-  controls.mouseButtons = {
-    ORBIT: THREE.MOUSE.MIDDLE,
-    ZOOM: false,
-    PAN: THREE.MOUSE.RIGHT
-  };
+  var isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
+  if (!isMac) {
+    controls.mouseButtons = {
+      ORBIT: THREE.MOUSE.MIDDLE,
+      ZOOM: false,
+      PAN: THREE.MOUSE.RIGHT
+    };
+  }
+
 
   controls.enableRotate = true;
   controls.enableZoom = true; // optional