Make touch keymap work

armorpaint/Sources/arm/App.hx

@@ -196,6 +196,7 @@ class App {
 					iron.App.notifyOnRender2D(UINodes.inst.render);
 					iron.App.notifyOnUpdate(UISidebar.inst.update);
 					iron.App.notifyOnRender2D(UISidebar.inst.render);
+					iron.App.notifyOnUpdate(Camera.inst.update);
 					iron.App.notifyOnRender2D(render);
 					appx = UIToolbar.inst.toolbarw;
 					appy = UIHeader.inst.headerh * 2;

armorpaint/Sources/arm/ui/UISidebar.hx

@@ -17,6 +17,7 @@ import iron.Scene;
 import arm.shader.MakeMaterial;
 import arm.Viewport;
 import arm.util.UVUtil;
+import arm.util.RenderUtil;
 import arm.data.LayerSlot;
 import arm.data.BrushSlot;
 import arm.data.FontSlot;
@@ -40,6 +41,7 @@ class UISidebar {
 	public var hminimize = Id.handle();
 	var borderStarted = 0;
 	var borderHandle: Handle = null;
+	var action_paint_remap = "";
 
 	public function new() {
 		inst = this;
@@ -562,6 +564,27 @@ class UISidebar {
 		var mouse = Input.getMouse();
 		var kb = Input.getKeyboard();
 
+		// Same mapping for paint and rotate
+		if (mouse.started() && Config.keymap.action_paint == Config.keymap.action_rotate) {
+			action_paint_remap = Config.keymap.action_paint;
+			RenderUtil.pickPosNorTex();
+			// World sphere picked - disable paint
+			if (Math.abs(Context.raw.posXPicked) > 50 || Math.abs(Context.raw.posYPicked) > 50 || Math.abs(Context.raw.posZPicked) > 50) {
+				Config.keymap.action_paint = "";
+				Config.keymap.action_rotate = action_paint_remap;
+			}
+			// Mesh picked - disable rotate
+			else {
+				Config.keymap.action_rotate = "";
+				Config.keymap.action_paint = action_paint_remap;
+			}
+		}
+		else if (action_paint_remap != "") {
+			Config.keymap.action_rotate = action_paint_remap;
+			Config.keymap.action_paint = action_paint_remap;
+			action_paint_remap = "";
+		}
+
 		if (Context.raw.brushStencilImage != null && Operator.shortcut(Config.keymap.stencil_transform, ShortcutDown)) {
 			var r = getBrushStencilRect();
 			if (mouse.started("left")) {

base/Sources/arm/Camera.hx

@@ -19,187 +19,187 @@ class Camera {
 
 	public function new() {
 		inst = this;
+	}
+
+	public function update() {
 		var mouse = Input.getMouse();
 		var kb = Input.getKeyboard();
 		var camera = iron.Scene.active.camera;
 
-		iron.App.notifyOnUpdate(function() {
-
-			if (first) {
-				first = false;
-				reset();
-			}
+		if (first) {
+			first = false;
+			reset();
+		}
 
-			if (mouse.viewX < 0 ||
-				mouse.viewX > iron.App.w() ||
-				mouse.viewY < 0 ||
-				mouse.viewY > iron.App.h()) {
+		if (mouse.viewX < 0 ||
+			mouse.viewX > iron.App.w() ||
+			mouse.viewY < 0 ||
+			mouse.viewY > iron.App.h()) {
 
-				if (Config.raw.wrap_mouse && controlsDown) {
-					if (mouse.viewX < 0) {
-						@:privateAccess mouse.x = mouse.lastX = iron.App.x() + iron.App.w();
-						Krom.setMousePosition(0, Std.int(mouse.x), Std.int(mouse.y));
-					}
-					else if (mouse.viewX > iron.App.w()) {
-						@:privateAccess mouse.x = mouse.lastX = iron.App.x();
-						Krom.setMousePosition(0, Std.int(mouse.x), Std.int(mouse.y));
-					}
-					else if (mouse.viewY < 0) {
-						@:privateAccess mouse.y = mouse.lastY = iron.App.y() + iron.App.h();
-						Krom.setMousePosition(0, Std.int(mouse.x), Std.int(mouse.y));
-					}
-					else if (mouse.viewY > iron.App.h()) {
-						@:privateAccess mouse.y = mouse.lastY = iron.App.y();
-						Krom.setMousePosition(0, Std.int(mouse.x), Std.int(mouse.y));
-					}
+			if (Config.raw.wrap_mouse && controlsDown) {
+				if (mouse.viewX < 0) {
+					@:privateAccess mouse.x = mouse.lastX = iron.App.x() + iron.App.w();
+					Krom.setMousePosition(0, Std.int(mouse.x), Std.int(mouse.y));
 				}
-				else {
-					return;
+				else if (mouse.viewX > iron.App.w()) {
+					@:privateAccess mouse.x = mouse.lastX = iron.App.x();
+					Krom.setMousePosition(0, Std.int(mouse.x), Std.int(mouse.y));
 				}
-			}
-
-			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) ||
-				Operator.shortcut(Config.keymap.action_pan, ShortcutStarted) ||
-				Operator.shortcut(Config.keymap.rotate_envmap, ShortcutStarted) ||
-				Operator.shortcut(Config.keymap.rotate_light, ShortcutStarted) ||
-				(mouse.started("right") && !modif) ||
-				(mouse.started("middle") && !modif) ||
-				(mouse.wheelDelta != 0 && !modifKey)) {
-				controlsDown = true;
-			}
-			else if (!Operator.shortcut(Config.keymap.action_rotate, ShortcutDown) &&
-				!Operator.shortcut(Config.keymap.action_zoom, ShortcutDown) &&
-				!Operator.shortcut(Config.keymap.action_pan, ShortcutDown) &&
-				!Operator.shortcut(Config.keymap.rotate_envmap, ShortcutDown) &&
-				!Operator.shortcut(Config.keymap.rotate_light, ShortcutDown) &&
-				!(mouse.down("right") && !modif) &&
-				!(mouse.down("middle") && !modif) &&
-				(mouse.wheelDelta == 0 && !modifKey)) {
-				controlsDown = false;
-			}
-
-			if (Input.occupied ||
-				!App.uiEnabled ||
-				App.isDragging ||
-				App.isScrolling() ||
-				App.isComboSelected() ||
-				!controlsDown) {
-				return;
-			}
-
-			var controls = Context.raw.cameraControls;
-			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);
-				camera.transform.rotate(Vec4.zAxis(), -mouse.movementX / 100 * Config.raw.camera_rotation_speed);
-				camera.transform.rotate(camera.rightWorld(), -mouse.movementY / 100 * Config.raw.camera_rotation_speed);
-				if (camera.upWorld().z < 0) {
-					camera.transform.rotate(camera.rightWorld(), mouse.movementY / 100 * Config.raw.camera_rotation_speed);
+				else if (mouse.viewY < 0) {
+					@:privateAccess mouse.y = mouse.lastY = iron.App.y() + iron.App.h();
+					Krom.setMousePosition(0, Std.int(mouse.x), Std.int(mouse.y));
 				}
-				camera.transform.move(camera.lookWorld(), -dist);
-			}
-			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();
-				t.rotate(up, mouse.movementX / 100 * Config.raw.camera_rotation_speed);
-				var right = camera.rightWorld().normalize();
-				t.rotate(right, mouse.movementY / 100 * Config.raw.camera_rotation_speed);
-				t.buildMatrix();
-				if (t.up().z < 0) {
-					t.rotate(right, -mouse.movementY / 100 * Config.raw.camera_rotation_speed);
+				else if (mouse.viewY > iron.App.h()) {
+					@:privateAccess mouse.y = mouse.lastY = iron.App.y();
+					Krom.setMousePosition(0, Std.int(mouse.x), Std.int(mouse.y));
 				}
 			}
-			
-			if (controls == ControlsRotate || controls == ControlsOrbit) {
-				panAction(modif, defaultKeymap);
+			else {
+				return;
+			}
+		}
 
-				if (Operator.shortcut(Config.keymap.action_zoom, ShortcutDown)) {
-					redraws = 2;
-					var f = getZoomDelta() / 150;
-					f *= getCameraZoomSpeed();
-					camera.transform.move(camera.look(), f);
-				}
+		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 (mouse.wheelDelta != 0 && !modifKey) {
-					redraws = 2;
-					var f = mouse.wheelDelta * (-0.1);
-					f *= getCameraZoomSpeed();
-					camera.transform.move(camera.look(), f);
-				}
-			}
-			else if (controls == ControlsFly && mouse.down("right")) {
-				var moveForward = kb.down("w") || kb.down("up") || mouse.wheelDelta < 0;
-				var moveBackward = kb.down("s") || kb.down("down") || mouse.wheelDelta > 0;
-				var strafeLeft = kb.down("a") || kb.down("left");
-				var strafeRight = kb.down("d") || kb.down("right");
-				var strafeUp = kb.down("e");
-				var strafeDown = kb.down("q");
-				var fast = kb.down("shift") ? 2.0 : (kb.down("alt") ? 0.5 : 1.0);
-				if (mouse.wheelDelta != 0) {
-					fast *= Math.abs(mouse.wheelDelta) * 4.0;
-				}
+		if (Operator.shortcut(Config.keymap.action_rotate, ShortcutStarted) ||
+			Operator.shortcut(Config.keymap.action_zoom, ShortcutStarted) ||
+			Operator.shortcut(Config.keymap.action_pan, ShortcutStarted) ||
+			Operator.shortcut(Config.keymap.rotate_envmap, ShortcutStarted) ||
+			Operator.shortcut(Config.keymap.rotate_light, ShortcutStarted) ||
+			(mouse.started("right") && !modif) ||
+			(mouse.started("middle") && !modif) ||
+			(mouse.wheelDelta != 0 && !modifKey)) {
+			controlsDown = true;
+		}
+		else if (!Operator.shortcut(Config.keymap.action_rotate, ShortcutDown) &&
+			!Operator.shortcut(Config.keymap.action_zoom, ShortcutDown) &&
+			!Operator.shortcut(Config.keymap.action_pan, ShortcutDown) &&
+			!Operator.shortcut(Config.keymap.rotate_envmap, ShortcutDown) &&
+			!Operator.shortcut(Config.keymap.rotate_light, ShortcutDown) &&
+			!(mouse.down("right") && !modif) &&
+			!(mouse.down("middle") && !modif) &&
+			(mouse.wheelDelta == 0 && !modifKey)) {
+			controlsDown = false;
+		}
 
-				if (moveForward || moveBackward || strafeRight || strafeLeft || strafeUp || strafeDown) {
-					ease += Time.delta * 15;
-					if (ease > 1.0) ease = 1.0;
-					dir.set(0, 0, 0);
-					if (moveForward) dir.addf(camera.look().x, camera.look().y, camera.look().z);
-					if (moveBackward) dir.addf(-camera.look().x, -camera.look().y, -camera.look().z);
-					if (strafeRight) dir.addf(camera.right().x, camera.right().y, camera.right().z);
-					if (strafeLeft) dir.addf(-camera.right().x, -camera.right().y, -camera.right().z);
-					if (strafeUp) dir.addf(0, 0, 1);
-					if (strafeDown) dir.addf(0, 0, -1);
-				}
-				else {
-					ease -= Time.delta * 20.0 * ease;
-					if (ease < 0.0) ease = 0.0;
-				}
+		if (Input.occupied ||
+			!App.uiEnabled ||
+			App.isDragging ||
+			App.isScrolling() ||
+			App.isComboSelected() ||
+			!controlsDown) {
+			return;
+		}
 
+		var controls = Context.raw.cameraControls;
+		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);
+			camera.transform.rotate(Vec4.zAxis(), -mouse.movementX / 100 * Config.raw.camera_rotation_speed);
+			camera.transform.rotate(camera.rightWorld(), -mouse.movementY / 100 * Config.raw.camera_rotation_speed);
+			if (camera.upWorld().z < 0) {
+				camera.transform.rotate(camera.rightWorld(), mouse.movementY / 100 * Config.raw.camera_rotation_speed);
+			}
+			camera.transform.move(camera.lookWorld(), -dist);
+		}
+		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();
+			t.rotate(up, mouse.movementX / 100 * Config.raw.camera_rotation_speed);
+			var right = camera.rightWorld().normalize();
+			t.rotate(right, mouse.movementY / 100 * Config.raw.camera_rotation_speed);
+			t.buildMatrix();
+			if (t.up().z < 0) {
+				t.rotate(right, -mouse.movementY / 100 * Config.raw.camera_rotation_speed);
+			}
+		}
 
-				var d = Time.delta * fast * ease * 2.0 * ((moveForward || moveBackward) ? Config.raw.camera_zoom_speed : Config.raw.camera_pan_speed);
-				if (d > 0.0) {
-					camera.transform.move(dir, d);
-					if (Context.raw.cameraType == CameraOrthographic) {
-						Viewport.updateCameraType(Context.raw.cameraType);
-					}
-				}
+		if (controls == ControlsRotate || controls == ControlsOrbit) {
+			panAction(modif, defaultKeymap);
 
+			if (Operator.shortcut(Config.keymap.action_zoom, ShortcutDown)) {
 				redraws = 2;
-				camera.transform.rotate(Vec4.zAxis(), -mouse.movementX / 200 * Config.raw.camera_rotation_speed);
-				camera.transform.rotate(camera.right(), -mouse.movementY / 200 * Config.raw.camera_rotation_speed);
+				var f = getZoomDelta() / 150;
+				f *= getCameraZoomSpeed();
+				camera.transform.move(camera.look(), f);
 			}
 
-			if (Operator.shortcut(Config.keymap.rotate_light, ShortcutDown)) {
+			if (mouse.wheelDelta != 0 && !modifKey) {
 				redraws = 2;
-				var light = iron.Scene.active.lights[0];
-				var m = iron.math.Mat4.identity();
-				Context.raw.lightAngle = (Context.raw.lightAngle + ((mouse.movementX / 100) % (2 * Math.PI) + 2 * Math.PI)) % (2 * Math.PI);
-				m.self = kha.math.FastMatrix4.rotationZ(mouse.movementX / 100);
-				light.transform.local.multmat(m);
-				light.transform.decompose();
+				var f = mouse.wheelDelta * (-0.1);
+				f *= getCameraZoomSpeed();
+				camera.transform.move(camera.look(), f);
+			}
+		}
+		else if (controls == ControlsFly && mouse.down("right")) {
+			var moveForward = kb.down("w") || kb.down("up") || mouse.wheelDelta < 0;
+			var moveBackward = kb.down("s") || kb.down("down") || mouse.wheelDelta > 0;
+			var strafeLeft = kb.down("a") || kb.down("left");
+			var strafeRight = kb.down("d") || kb.down("right");
+			var strafeUp = kb.down("e");
+			var strafeDown = kb.down("q");
+			var fast = kb.down("shift") ? 2.0 : (kb.down("alt") ? 0.5 : 1.0);
+			if (mouse.wheelDelta != 0) {
+				fast *= Math.abs(mouse.wheelDelta) * 4.0;
 			}
 
-			if (Operator.shortcut(Config.keymap.rotate_envmap, ShortcutDown)) {
-				redraws = 2;
-				Context.raw.envmapAngle -= mouse.movementX / 100;
+			if (moveForward || moveBackward || strafeRight || strafeLeft || strafeUp || strafeDown) {
+				ease += Time.delta * 15;
+				if (ease > 1.0) ease = 1.0;
+				dir.set(0, 0, 0);
+				if (moveForward) dir.addf(camera.look().x, camera.look().y, camera.look().z);
+				if (moveBackward) dir.addf(-camera.look().x, -camera.look().y, -camera.look().z);
+				if (strafeRight) dir.addf(camera.right().x, camera.right().y, camera.right().z);
+				if (strafeLeft) dir.addf(-camera.right().x, -camera.right().y, -camera.right().z);
+				if (strafeUp) dir.addf(0, 0, 1);
+				if (strafeDown) dir.addf(0, 0, -1);
+			}
+			else {
+				ease -= Time.delta * 20.0 * ease;
+				if (ease < 0.0) ease = 0.0;
 			}
 
-			if (redraws > 0) {
-				redraws--;
-				Context.raw.ddirty = 2;
 
+			var d = Time.delta * fast * ease * 2.0 * ((moveForward || moveBackward) ? Config.raw.camera_zoom_speed : Config.raw.camera_pan_speed);
+			if (d > 0.0) {
+				camera.transform.move(dir, d);
 				if (Context.raw.cameraType == CameraOrthographic) {
 					Viewport.updateCameraType(Context.raw.cameraType);
 				}
 			}
-		});
+
+			redraws = 2;
+			camera.transform.rotate(Vec4.zAxis(), -mouse.movementX / 200 * Config.raw.camera_rotation_speed);
+			camera.transform.rotate(camera.right(), -mouse.movementY / 200 * Config.raw.camera_rotation_speed);
+		}
+
+		if (Operator.shortcut(Config.keymap.rotate_light, ShortcutDown)) {
+			redraws = 2;
+			var light = iron.Scene.active.lights[0];
+			var m = iron.math.Mat4.identity();
+			Context.raw.lightAngle = (Context.raw.lightAngle + ((mouse.movementX / 100) % (2 * Math.PI) + 2 * Math.PI)) % (2 * Math.PI);
+			m.self = kha.math.FastMatrix4.rotationZ(mouse.movementX / 100);
+			light.transform.local.multmat(m);
+			light.transform.decompose();
+		}
+
+		if (Operator.shortcut(Config.keymap.rotate_envmap, ShortcutDown)) {
+			redraws = 2;
+			Context.raw.envmapAngle -= mouse.movementX / 100;
+		}
+
+		if (redraws > 0) {
+			redraws--;
+			Context.raw.ddirty = 2;
+
+			if (Context.raw.cameraType == CameraOrthographic) {
+				Viewport.updateCameraType(Context.raw.cameraType);
+			}
+		}
 	}
 
 	public function distance(): Float {