From 07543e1fb500ea4c27895246de551f01ff342e0e Mon Sep 17 00:00:00 2001 From: finscn Date: Mon, 29 Jan 2018 05:48:29 +0800 Subject: [PATCH 1/2] Support shift + MouseLeftButton to move camera There is no MouseMiddleButton on MacBook . This PR could Support shift + MouseLeftButton to move camera --- src/editor/editor/systems/CameraSystem.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/editor/editor/systems/CameraSystem.js b/src/editor/editor/systems/CameraSystem.js index 3c695575..5b52840f 100644 --- a/src/editor/editor/systems/CameraSystem.js +++ b/src/editor/editor/systems/CameraSystem.js @@ -39,7 +39,9 @@ b3e.editor.CameraSystem = function(editor) { }; this.onMouseDown = function(e) { - if (e.nativeEvent.which !== 2) return; + var middle = e.nativeEvent.which === 2; + var leftShift = e.nativeEvent.which === 1 && e.nativeEvent.shiftKey; + if (!middle && !leftShift) return; var project = editor.project.get(); if (!project) return; @@ -66,7 +68,9 @@ b3e.editor.CameraSystem = function(editor) { tree.y = editor._game.mouse.y - offsetY; }; this.onMouseUp = function(e) { - if (e.nativeEvent.which !== 2) return; + var middle = e.nativeEvent.which === 2; + var leftShift = e.nativeEvent.which === 1 && e.nativeEvent.shiftKey; + if (!middle && !leftShift) return; var project = editor.project.get(); if (!project) return; From 46331f37cef37413830994925a3f87ab411852f6 Mon Sep 17 00:00:00 2001 From: finscn Date: Mon, 29 Jan 2018 06:05:13 +0800 Subject: [PATCH 2/2] support ctrl + -/+ to zoomIn/Out camera on macOS , ctrl + up/down is system shortcut, this PR could support ctrl + -/+ to zoomIn/Out camera --- src/editor/editor/systems/CameraSystem.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/editor/editor/systems/CameraSystem.js b/src/editor/editor/systems/CameraSystem.js index 5b52840f..0e776f70 100644 --- a/src/editor/editor/systems/CameraSystem.js +++ b/src/editor/editor/systems/CameraSystem.js @@ -16,9 +16,9 @@ b3e.editor.CameraSystem = function(editor) { var k = tine.keys; if (kb.isDown(k.CTRL)) { - if (kb.isPressed(k.UP)) { + if (kb.isPressed(k.UP) || kb.isPressed(k.EQUAL)) { tree.view.zoomIn(); - } else if (kb.isPressed(k.DOWN)) { + } else if (kb.isPressed(k.DOWN) || kb.isPressed(k.DASH)) { tree.view.zoomOut(); } }