Add touch keymap

armorpaint/Assets/keymap_presets/touch.json

@@ -0,0 +1,65 @@
+{
+	"action_paint": "left",
+	"action_rotate": "left",
+	"action_pan": "right",
+	"action_zoom": "",
+	"rotate_light": "shift+middle",
+	"rotate_envmap": "ctrl+middle",
+	"set_clone_source": "alt",
+	"stencil_transform": "ctrl",
+	"stencil_hide": "z",
+	"decal_mask": "ctrl",
+	"select_material": "shift+number",
+	"select_layer": "alt+number",
+	"brush_radius": "f",
+	"brush_radius_decrease": "[",
+	"brush_radius_increase": "]",
+	"brush_opacity": "shift+f",
+	"brush_angle": "alt+f",
+	"brush_ruler": "shift",
+	"file_new": "ctrl+n",
+	"file_open": "ctrl+o",
+	"file_open_recent": "ctrl+shift+o",
+	"file_save": "ctrl+s",
+	"file_save_as": "ctrl+shift+s",
+	"file_reimport_mesh": "ctrl+r",
+	"file_reimport_textures": "ctrl+shift+r",
+	"file_import_assets": "ctrl+i",
+	"file_export_textures": "ctrl+e",
+	"file_export_textures_as": "ctrl+shift+e",
+	"edit_undo": "ctrl+z",
+	"edit_redo": "ctrl+shift+z",
+	"edit_prefs": "ctrl+k",
+	"view_reset": "0",
+	"view_front": "1",
+	"view_back": "ctrl+1",
+	"view_right": "3",
+	"view_left": "ctrl+3",
+	"view_top": "7",
+	"view_bottom": "ctrl+7",
+	"view_camera_type": "5",
+	"view_orbit_left": "4",
+	"view_orbit_right": "6",
+	"view_orbit_up": "8",
+	"view_orbit_down": "2",
+	"view_orbit_opposite": "9",
+	"view_zoom_in": "",
+	"view_zoom_out": "",
+	"view_distract_free": "f11",
+	"viewport_mode": "ctrl+m",
+	"tool_brush": "b",
+	"tool_eraser": "e",
+	"tool_fill": "g",
+	"tool_decal": "d",
+	"tool_text": "t",
+	"tool_clone": "l",
+	"tool_blur": "u",
+	"tool_particle": "p",
+	"tool_colorid": "c",
+	"tool_picker": "v",
+	"swap_brush_eraser": "",
+	"toggle_2d_view": "shift+tab",
+	"toggle_node_editor": "tab",
+	"toggle_browser": "`",
+	"node_search": "space"
+}

base/Sources/arm/Camera.hx

@@ -60,6 +60,7 @@ class Camera {
 
 			var modifKey = kb.down("alt") || kb.down("shift") || kb.down("control");
 			var modif = modifKey || Config.keymap.action_rotate == "middle";
+			var defaultKeymap = Config.raw.keymap == "default.json";
 
 			if (Operator.shortcut(Config.keymap.action_rotate, ShortcutStarted) ||
 				Operator.shortcut(Config.keymap.action_zoom, ShortcutStarted) ||
@@ -92,7 +93,7 @@ class Camera {
 			}
 
 			var controls = Context.raw.cameraControls;
-			if (controls == ControlsOrbit && (Operator.shortcut(Config.keymap.action_rotate, ShortcutDown) || (mouse.down("right") && !modif))) {
+			if (controls == ControlsOrbit && (Operator.shortcut(Config.keymap.action_rotate, ShortcutDown) || (mouse.down("right") && !modif && defaultKeymap))) {
 				redraws = 2;
 				var dist = distance();
 				camera.transform.move(camera.lookWorld(), dist);
@@ -103,7 +104,7 @@ class Camera {
 				}
 				camera.transform.move(camera.lookWorld(), -dist);
 			}
-			else if (controls == ControlsRotate && (Operator.shortcut(Config.keymap.action_rotate, ShortcutDown) || (mouse.down("right") && !modif))) {
+			else if (controls == ControlsRotate && (Operator.shortcut(Config.keymap.action_rotate, ShortcutDown) || (mouse.down("right") && !modif && defaultKeymap))) {
 				redraws = 2;
 				var t = Context.mainObject().transform;
 				var up = t.up().normalize();
@@ -117,7 +118,7 @@ class Camera {
 			}
 			
 			if (controls == ControlsRotate || controls == ControlsOrbit) {
-				panAction(modif);
+				panAction(modif, defaultKeymap);
 
 				if (Operator.shortcut(Config.keymap.action_zoom, ShortcutDown)) {
 					redraws = 2;
@@ -229,10 +230,10 @@ class Camera {
 		}
 	}
 
-	function panAction(modif: Bool) {
+	function panAction(modif: Bool, defaultKeymap: Bool) {
 		var camera = iron.Scene.active.camera;
 		var mouse = Input.getMouse();
-		if (Operator.shortcut(Config.keymap.action_pan, ShortcutDown) || (mouse.down("middle") && !modif)) {
+		if (Operator.shortcut(Config.keymap.action_pan, ShortcutDown) || (mouse.down("middle") && !modif && defaultKeymap)) {
 			redraws = 2;
 			var look = camera.transform.look().normalize().mult(mouse.movementY / 150 * Config.raw.camera_pan_speed);
 			var right = camera.transform.right().normalize().mult(-mouse.movementX / 150 * Config.raw.camera_pan_speed);