@womp/mesh-editor 0.1.7 → 0.1.9

package/README.md

@@ -23,6 +23,10 @@ await open_edit_session({
 });
 ```
 
+Return `false` from `on_commit` when the host cancels its import dialog. The session
+stays open with its edits and undo history. Rejected promises display an error
+and also keep the session open for retry.
+
 `root_class` scopes the semantic `--womp-mesh-editor-*` theme tokens documented
 in `docs/ui-theming.md`. Omit it to retain the default appearance.
 

package/dist/browser/src/mesh_editor/editor.d.ts

@@ -65,7 +65,7 @@ interface OrbitState {
     pointerId: number | null;
     lastX: number;
     lastY: number;
-    mode: "orbit" | "pan";
+    mode: "orbit" | "pan" | "zoom";
 }
 interface DragState {
     pointerId: number;
@@ -587,6 +587,7 @@ export declare class PortableMeshEditor {
     update_brush_stroke_surface_hit(hit: any): void;
     apply_brush_hit(hit: any, pathRatio?: number): void;
     handle_wheel(event: WheelEvent): void;
+    zoom_camera(factor: number): void;
     pan_camera(dx: number, dy: number): void;
     pick_mesh(event: PointerEvent): any;
     pick_mesh_at(clientX: number, clientY: number): any;

package/dist/browser/src/mesh_editor/editor.js

@@ -6404,7 +6404,7 @@ export class PortableMeshEditor {
             event.preventDefault();
             return;
         }
-        if (event.button === 2) {
+        if (event.button === 2 || event.button === 1 || event.altKey || event.metaKey) {
             event.preventDefault();
             this.canvas.setPointerCapture(event.pointerId);
             this.hide_brush_cursor();
@@ -6412,18 +6412,7 @@ export class PortableMeshEditor {
             this.orbit.pointerId = event.pointerId;
             this.orbit.lastX = event.clientX;
             this.orbit.lastY = event.clientY;
-            this.orbit.mode = "pan";
-            return;
-        }
-        if (event.button === 1 || event.altKey || event.metaKey) {
-            event.preventDefault();
-            this.canvas.setPointerCapture(event.pointerId);
-            this.hide_brush_cursor();
-            this.orbit.active = true;
-            this.orbit.pointerId = event.pointerId;
-            this.orbit.lastX = event.clientX;
-            this.orbit.lastY = event.clientY;
-            this.orbit.mode = "orbit";
+            this.orbit.mode = event.button === 2 ? "pan" : event.button === 1 ? "zoom" : "orbit";
             return;
         }
         if (event.button !== 0) {
@@ -6435,7 +6424,12 @@ export class PortableMeshEditor {
         if (this.meshObject === null) {
             return;
         }
-        if (this.tool === "view") {
+        const hit = this.tool === "view" ? null : this.pick_mesh(event);
+        const vertexPick = this.tool === "drag" ? this.pick_vertex(event, hit) : null;
+        if (this.tool === "view" || (hit === null && vertexPick === null)) {
+            if (hit === null && this.tool !== "view") {
+                this.clear_selection();
+            }
             this.hide_brush_cursor();
             this.orbit.active = true;
             this.orbit.pointerId = event.pointerId;
@@ -6444,9 +6438,7 @@ export class PortableMeshEditor {
             this.orbit.mode = "orbit";
             return;
         }
-        const hit = this.pick_mesh(event);
         if (this.tool === "drag") {
-            const vertexPick = this.pick_vertex(event, hit);
             if (vertexPick === null) {
                 this.clear_selection();
                 this.set_status("No vertex selected.");
@@ -6469,12 +6461,6 @@ export class PortableMeshEditor {
             this.set_status(`Dragging vertex ${vertexIndex}`);
             return;
         }
-        if (hit === null) {
-            this.hide_brush_cursor();
-            this.clear_selection();
-            this.release_pointer_capture(event.pointerId);
-            return;
-        }
         this.show_brush_cursor([hit.point.x, hit.point.y, hit.point.z], [hit.face.normal.x, hit.face.normal.y, hit.face.normal.z]);
         this.brushStrokeState = {
             pointerId: event.pointerId,
@@ -6513,6 +6499,10 @@ export class PortableMeshEditor {
                 this.pan_camera(dx, dy);
                 return;
             }
+            if (this.orbit.mode === "zoom") {
+                this.zoom_camera(Math.exp(dy * 0.01));
+                return;
+            }
             this.orbit.theta -= dx * 0.01;
             this.orbit.phi = Math.min(Math.PI - 0.02, Math.max(0.02, this.orbit.phi - (dy * 0.01)));
             this.apply_orbit_camera();
@@ -7174,7 +7164,9 @@ export class PortableMeshEditor {
     handle_wheel(event) {
         event.preventDefault();
         this.hide_brush_cursor();
-        const factor = Math.exp(event.deltaY * 0.001);
+        this.zoom_camera(Math.exp(event.deltaY * 0.001));
+    }
+    zoom_camera(factor) {
         const referenceRadius = Math.max(this.sessionBoundsRadius, Number.MIN_VALUE);
         this.orbit.radius = Math.min(referenceRadius * 1000, Math.max(referenceRadius * 0.02, this.orbit.radius * factor));
         this.apply_orbit_camera();

package/dist/browser/src/session/edit_session.d.ts

@@ -10,7 +10,7 @@ export interface OpenEditSessionOptions {
     symmetry_enabled?: boolean;
     symmetry_vertical?: boolean;
     symmetry_horizontal?: boolean;
-    on_commit?: (result: EditSessionCommitResult) => void | Promise<void>;
+    on_commit?: (result: EditSessionCommitResult) => void | boolean | Promise<void | boolean>;
 }
 export type EditSessionCommitResult = {
     action: "commit";

package/dist/browser/src/session/edit_session.js

@@ -765,7 +765,7 @@ export async function open_edit_session(options) {
     viewport.className = "womp-mesh-editor-viewport";
     const canvas = document.createElement("canvas");
     canvas.className = "womp-mesh-editor-canvas";
-    canvas.title = "Mesh editor viewport. Primary drag in View orbits; secondary drag pans; Alt-drag or middle mouse orbits; brush tools edit on drag.";
+    canvas.title = "Mesh editor viewport. Left drag on empty space rotates; right drag pans; middle drag zooms; left drag on the mesh sculpts. Alt-drag or View also rotates.";
     canvas.setAttribute("aria-label", "Mesh editor viewport");
     viewport.appendChild(canvas);
     const header = document.createElement("div");
@@ -1111,7 +1111,7 @@ export async function open_edit_session(options) {
     const cancelButton = button("Cancel", "Close the mesh editor without applying changes.", "womp-mesh-editor-button is-secondary");
     const footerHint = document.createElement("div");
     footerHint.className = "womp-mesh-editor-footer-hint";
-    footerHint.textContent = "Orbit: Alt or middle drag · Pan: right drag · Zoom: wheel";
+    footerHint.textContent = "Rotate: left drag on empty space · Pan: right drag · Zoom: middle drag or wheel";
     const footerActions = document.createElement("div");
     footerActions.className = "womp-mesh-editor-footer-actions";
     footerActions.appendChild(cancelButton);
@@ -1440,7 +1440,13 @@ export async function open_edit_session(options) {
                 mode: "edit",
                 mesh: await editor.prepare_commit_async(),
             };
-            await options.on_commit?.(result);
+            const accepted = await options.on_commit?.(result);
+            if (accepted === false) {
+                set_status("Mesh editing", "Mesh tools are ready.", "idle");
+                set_busy(false);
+                commitButton.focus();
+                return;
+            }
             editor.accept_commit();
             close(result);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@womp/mesh-editor",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Browser mesh editing engine and edit-session UI for Womp products.",
   "private": false,
   "type": "module",