@soonspacejs/plugin-drawing-shape 2.11.37 → 2.11.38

package/README.md

@@ -1,5 +1,5 @@
-# @soonspacejs/plugin-drawing-shape
-
-> Drawing-shape plugin for SoonSpace.js
-
-Document: [http://www.xwbuilders.com:8800/plugin/drawing-shape.html](http://www.xwbuilders.com:8800/plugin/drawing-shape.html)
+# @soonspacejs/plugin-drawing-shape
+
+> Drawing-shape plugin for SoonSpace.js
+
+Document: [http://www.xwbuilders.com:8800/plugin/drawing-shape.html](http://www.xwbuilders.com:8800/plugin/drawing-shape.html)

package/dist/index.esm.js

@@ -1 +1 @@
-const s="drawingCanvas",i="drawingPoint",t="drawingLine",e="drawingPolygon",n="drawingCircle";class o{constructor(s){this.ssp=s,this.drawingLayer=21,this.viewport=s.viewport}getFirstIntersect(s,i){const t=(Array.isArray(i)?i:i?[i]:[]).filter((s=>s));this.configLayer(t);const e=this.ssp.viewport.getIntersects(s);return this.recoverLayer(t),e[0]}configLayer(s){var i;const t=null!==(i=this.drawingLayer)&&void 0!==i?i:21,e=this.ssp.viewport.camera;e.oriMask=e.layers.mask,e.layers.enable(t);const n=Array.isArray(s)?s:[s];for(const s of n)s.oriMask=s.layers.mask,s.layers.set(t)}recoverLayer(s){const i=this.ssp.viewport.camera;i.oriMask&&(i.layers.mask=i.oriMask,i.oriMask=void 0);const t=Array.isArray(s)?s:[s];for(const s of t){const i=s.oriMask;i&&(s.layers.mask=i,s.oriMask=void 0)}}drawingPoint(t,e){return new Promise(((n,o)=>{this.clearDrawingCanvas3D();const a=this.ssp.createCanvas3D({id:s,points:[Object.assign(Object.assign({},t),{id:i})]});this.ssp.addObject(a);const c=a.getPoint(i);if(!c)return o();const r=s=>{if(!c)return;const i=this.getFirstIntersect(s,c),t=i?i.point.clone():this.ssp.getPositionByOffset(s);c.setOptions({position:t})},l=s=>{if(h(),!c)return;const i=this.getFirstIntersect(s,c),e=i?i.point.clone():this.ssp.getPositionByOffset(s);c.setOptions({position:e}),n(Object.assign(Object.assign({},t),{position:e.clone()}))},g=()=>{var s;this.clearDrawingCanvas3D(),h(),null===(s=null==e?void 0:e.onCancel)||void 0===s||s.call(e)},p=s=>{if("Escape"===s.code)g()},h=()=>{this.ssp.signals.mouseMove.remove(r),this.ssp.signals.click.remove(l),this.ssp.signals.rightClick.remove(g),this.ssp.signals.keyUp.remove(p)};this.ssp.signals.mouseMove.add(r),this.ssp.signals.click.add(l),this.ssp.signals.rightClick.add(g),this.ssp.signals.keyUp.add(p)}))}drawingLine(i,e){const{offsetY:n=.01}=i;return new Promise((o=>{this.clearDrawingCanvas3D();const a=this.ssp.createCanvas3D({id:s,lines:[Object.assign(Object.assign({},i),{points:[],id:t})]});this.ssp.addObject(a);const c=a.getLine(t),r=[],l=s=>{const t=this.getFirstIntersect(s,c),e=t?t.point.clone():this.ssp.getPositionByOffset(s);c&&c.setOptions(Object.assign(Object.assign({},i),{points:[...r,e.clone().setY(e.y+n)]}))},g=s=>{const t=this.getFirstIntersect(s,c),e=t?t.point.clone():this.ssp.getPositionByOffset(s);r.push(e.clone().setY(e.y+n)),c&&c.setOptions(Object.assign(Object.assign({},i),{points:r}))},p=()=>{var s;r.pop(),c&&(c.setOptions(Object.assign(Object.assign({},i),{points:r})),null===(s=null==e?void 0:e.onCancelPrev)||void 0===s||s.call(e))},h=s=>{const t=this.getFirstIntersect(s,c),e=t?t.point.clone():this.ssp.getPositionByOffset(s);r.push(e.clone().setY(e.y+n)),v(),o(Object.assign(Object.assign({},i),{points:r}))},d=s=>{var i;switch(s.code){case"Backspace":p();break;case"Escape":this.clearDrawingCanvas3D(),v(),null===(i=null==e?void 0:e.onCancel)||void 0===i||i.call(e)}},v=()=>{this.ssp.signals.mouseMove.remove(l),this.ssp.signals.click.remove(g),this.ssp.signals.rightClick.remove(p),this.ssp.signals.dblClick.remove(h),this.ssp.signals.keyUp.remove(d)};this.ssp.signals.mouseMove.add(l),this.ssp.signals.click.add(g),this.ssp.signals.rightClick.add(p),this.ssp.signals.dblClick.add(h),this.ssp.signals.keyUp.add(d)}))}drawingPolygon(i,n){const{offsetY:o=.01}=i;return new Promise((a=>{this.clearDrawingCanvas3D();const c=this.ssp.createCanvas3D({id:s,polygons:[Object.assign(Object.assign({points:[],yHeight:0},i),{id:e})],lines:[Object.assign(Object.assign({points:[],width:2},i),{id:t})]});this.ssp.addObject(c);const r=c.getPolygon(e),l=c.getLine(t),g=[],p=s=>{var i;const e=this.getFirstIntersect(s,[l,r]),n=e?e.point.clone():this.ssp.getPositionByOffset(s);if(!r)return;const a=[...g,n];a.length>2?c.removeLine(t):null==l||l.setOptions({points:a}),r.setOptions({yHeight:((null===(i=g[0])||void 0===i?void 0:i.y)||n.y)+o,points:a})},h=s=>{var t;const e=this.getFirstIntersect(s,[l,r]),n=e?e.point.clone():this.ssp.getPositionByOffset(s);g.push(n.clone().setY(n.y+o)),r&&r.setOptions(Object.assign(Object.assign({},i),{yHeight:((null===(t=g[0])||void 0===t?void 0:t.y)||0)+o,points:g}))},d=()=>{var s,t;g.pop(),r&&(r.setOptions(Object.assign(Object.assign({},i),{yHeight:((null===(s=g[0])||void 0===s?void 0:s.y)||0)+o,points:g})),null===(t=null==n?void 0:n.onCancelPrev)||void 0===t||t.call(n))},v=s=>{var t;const e=this.getFirstIntersect(s,[l,r]),n=e?e.point.clone():this.ssp.getPositionByOffset(s);g.push(n.clone().setY(n.y+o)),O(),a(Object.assign(Object.assign({},i),{yHeight:((null===(t=g[0])||void 0===t?void 0:t.y)||0)+o,points:g}))},y=s=>{var i;switch(s.code){case"Backspace":d();break;case"Escape":this.clearDrawingCanvas3D(),O(),null===(i=null==n?void 0:n.onCancel)||void 0===i||i.call(n)}},O=()=>{this.ssp.signals.mouseMove.remove(p),this.ssp.signals.click.remove(h),this.ssp.signals.rightClick.remove(d),this.ssp.signals.dblClick.remove(v),this.ssp.signals.keyUp.remove(y)};this.ssp.signals.mouseMove.add(p),this.ssp.signals.click.add(h),this.ssp.signals.rightClick.add(d),this.ssp.signals.dblClick.add(v),this.ssp.signals.keyUp.add(y)}))}drawingCircle(i,t){const{offsetY:e=.01}=i;return new Promise((o=>{this.clearDrawingCanvas3D();const a=this.ssp.createCanvas3D({id:s,circles:[Object.assign(Object.assign({},i),{id:n})]});this.ssp.addObject(a);const c=a.getCircle(n);let r,l=100;const g=s=>{if(!c||!r)return;const i=this.getFirstIntersect(s,c),t=i?i.point.clone():this.ssp.getPositionByOffset(s);l=t.distanceTo(r),c.setOptions({position:r,radius:l})},p=s=>{if(!c)return;const t=this.getFirstIntersect(s,c),n=t?t.point.clone():this.ssp.getPositionByOffset(s);r?(v(),l=n.distanceTo(this.ssp.utils.IVector3ToVector3(r)),c.setOptions({position:r,radius:l}),o(Object.assign(Object.assign({},i),{position:r,radius:l}))):r=n.clone().setY(n.y+e)},h=()=>{var s;this.clearDrawingCanvas3D(),v(),null===(s=null==t?void 0:t.onCancel)||void 0===s||s.call(t)},d=s=>{if("Escape"===s.code)h()},v=()=>{this.ssp.signals.mouseMove.remove(g),this.ssp.signals.click.remove(p),this.ssp.signals.rightClick.remove(h),this.ssp.signals.keyUp.remove(d)};this.ssp.signals.mouseMove.add(g),this.ssp.signals.click.add(p),this.ssp.signals.rightClick.add(h),this.ssp.signals.keyUp.add(d)}))}clearDrawingCanvas3D(){this.ssp.removeObjectById(s)}}export{o as default};
+import s from"soonspacejs";const{utils:i}=s,t={canvas:"drawingCanvas"+i.randomString(),point:"drawingPoint"+i.randomString(),line:"drawingLine"+i.randomString(),polygon:"drawingPolygon"+i.randomString(),circle:"drawingCircle"+i.randomString()};class e{constructor(s){this.ssp=s,this.drawingLayer=21,this.viewport=s.viewport}getFirstIntersect(s,i){const t=(Array.isArray(i)?i:i?[i]:[]).filter((s=>s));this.configLayer(t);const e=this.ssp.viewport.getIntersects(s);return this.recoverLayer(t),e[0]}configLayer(s){var i;const t=null!==(i=this.drawingLayer)&&void 0!==i?i:21,e=this.ssp.viewport.camera;e.oriMask=e.layers.mask,e.layers.enable(t);const n=Array.isArray(s)?s:[s];for(const s of n)s.oriMask=s.layers.mask,s.layers.set(t)}recoverLayer(s){const i=this.ssp.viewport.camera;i.oriMask&&(i.layers.mask=i.oriMask,i.oriMask=void 0);const t=Array.isArray(s)?s:[s];for(const s of t){const i=s.oriMask;i&&(s.layers.mask=i,s.oriMask=void 0)}}drawingPoint(s,i){return new Promise(((e,n)=>{this.clearDrawingCanvas3D();const o=this.ssp.createCanvas3D({id:t.canvas,points:[Object.assign(Object.assign({},s),{id:t.point})]});this.ssp.addObject(o);const a=o.getPoint(t.point);if(!a)return n();const c=s=>{if(!a)return;const i=this.getFirstIntersect(s,a),t=i?i.point.clone():this.ssp.getPositionByOffset(s);a.setOptions({position:t})},r=i=>{if(p(),!a)return;const t=this.getFirstIntersect(i,a),n=t?t.point.clone():this.ssp.getPositionByOffset(i);a.setOptions({position:n}),e(Object.assign(Object.assign({},s),{position:n.clone()}))},l=()=>{var s;this.clearDrawingCanvas3D(),p(),null===(s=null==i?void 0:i.onCancel)||void 0===s||s.call(i)},g=s=>{if("Escape"===s.code)l()},p=()=>{this.ssp.signals.mouseMove.remove(c),this.ssp.signals.click.remove(r),this.ssp.signals.rightClick.remove(l),this.ssp.signals.keyUp.remove(g)};this.ssp.signals.mouseMove.add(c),this.ssp.signals.click.add(r),this.ssp.signals.rightClick.add(l),this.ssp.signals.keyUp.add(g)}))}drawingLine(s,i){const{offsetY:e=.01}=s;return new Promise((n=>{this.clearDrawingCanvas3D();const o=this.ssp.createCanvas3D({id:t.canvas,lines:[Object.assign(Object.assign({},s),{points:[],id:t.line})]});this.ssp.addObject(o);const a=o.getLine(t.line),c=[],r=i=>{const t=this.getFirstIntersect(i,a),n=t?t.point.clone():this.ssp.getPositionByOffset(i);a&&a.setOptions(Object.assign(Object.assign({},s),{points:[...c,n.clone().setY(n.y+e)]}))},l=i=>{const t=this.getFirstIntersect(i,a),n=t?t.point.clone():this.ssp.getPositionByOffset(i);c.push(n.clone().setY(n.y+e)),a&&a.setOptions(Object.assign(Object.assign({},s),{points:c}))},g=()=>{var t;c.pop(),a&&(a.setOptions(Object.assign(Object.assign({},s),{points:c})),null===(t=null==i?void 0:i.onCancelPrev)||void 0===t||t.call(i))},p=i=>{const t=this.getFirstIntersect(i,a),o=t?t.point.clone():this.ssp.getPositionByOffset(i);c.push(o.clone().setY(o.y+e)),h(),n(Object.assign(Object.assign({},s),{points:c}))},d=s=>{var t;switch(s.code){case"Backspace":g();break;case"Escape":this.clearDrawingCanvas3D(),h(),null===(t=null==i?void 0:i.onCancel)||void 0===t||t.call(i)}},h=()=>{this.ssp.signals.mouseMove.remove(r),this.ssp.signals.click.remove(l),this.ssp.signals.rightClick.remove(g),this.ssp.signals.dblClick.remove(p),this.ssp.signals.keyUp.remove(d)};this.ssp.signals.mouseMove.add(r),this.ssp.signals.click.add(l),this.ssp.signals.rightClick.add(g),this.ssp.signals.dblClick.add(p),this.ssp.signals.keyUp.add(d)}))}drawingPolygon(s,i){const{offsetY:e=.01}=s;return new Promise((n=>{this.clearDrawingCanvas3D();const o=this.ssp.createCanvas3D({id:t.canvas,polygons:[Object.assign(Object.assign({points:[],yHeight:0},s),{id:t.polygon})],lines:[Object.assign(Object.assign({points:[],width:2},s),{id:t.line})]});this.ssp.addObject(o);const a=o.getPolygon(t.polygon),c=o.getLine(t.line),r=[],l=s=>{var i;const n=this.getFirstIntersect(s,[c,a]),l=n?n.point.clone():this.ssp.getPositionByOffset(s);if(!a)return;const g=[...r,l];g.length>2?o.removeLine(t.line):null==c||c.setOptions({points:g}),a.setOptions({yHeight:((null===(i=r[0])||void 0===i?void 0:i.y)||l.y)+e,points:g})},g=i=>{var t;const n=this.getFirstIntersect(i,[c,a]),o=n?n.point.clone():this.ssp.getPositionByOffset(i);r.push(o.clone().setY(o.y+e)),a&&a.setOptions(Object.assign(Object.assign({},s),{yHeight:((null===(t=r[0])||void 0===t?void 0:t.y)||0)+e,points:r}))},p=()=>{var t,n;r.pop(),a&&(a.setOptions(Object.assign(Object.assign({},s),{yHeight:((null===(t=r[0])||void 0===t?void 0:t.y)||0)+e,points:r})),null===(n=null==i?void 0:i.onCancelPrev)||void 0===n||n.call(i))},d=i=>{var t;const o=this.getFirstIntersect(i,[c,a]),l=o?o.point.clone():this.ssp.getPositionByOffset(i);r.push(l.clone().setY(l.y+e)),v(),n(Object.assign(Object.assign({},s),{yHeight:((null===(t=r[0])||void 0===t?void 0:t.y)||0)+e,points:r}))},h=s=>{var t;switch(s.code){case"Backspace":p();break;case"Escape":this.clearDrawingCanvas3D(),v(),null===(t=null==i?void 0:i.onCancel)||void 0===t||t.call(i)}},v=()=>{this.ssp.signals.mouseMove.remove(l),this.ssp.signals.click.remove(g),this.ssp.signals.rightClick.remove(p),this.ssp.signals.dblClick.remove(d),this.ssp.signals.keyUp.remove(h)};this.ssp.signals.mouseMove.add(l),this.ssp.signals.click.add(g),this.ssp.signals.rightClick.add(p),this.ssp.signals.dblClick.add(d),this.ssp.signals.keyUp.add(h)}))}drawingCircle(s,i){const{offsetY:e=.01}=s;return new Promise((n=>{this.clearDrawingCanvas3D();const o=this.ssp.createCanvas3D({id:t.canvas,circles:[Object.assign(Object.assign({},s),{id:t.circle})]});this.ssp.addObject(o);const a=o.getCircle(t.circle);let c,r=100;const l=s=>{if(!a||!c)return;const i=this.getFirstIntersect(s,a),t=i?i.point.clone():this.ssp.getPositionByOffset(s);r=t.distanceTo(c),a.setOptions({position:c,radius:r})},g=i=>{if(!a)return;const t=this.getFirstIntersect(i,a),o=t?t.point.clone():this.ssp.getPositionByOffset(i);c?(h(),r=o.distanceTo(this.ssp.utils.IVector3ToVector3(c)),a.setOptions({position:c,radius:r}),n(Object.assign(Object.assign({},s),{position:c,radius:r}))):c=o.clone().setY(o.y+e)},p=()=>{var s;this.clearDrawingCanvas3D(),h(),null===(s=null==i?void 0:i.onCancel)||void 0===s||s.call(i)},d=s=>{if("Escape"===s.code)p()},h=()=>{this.ssp.signals.mouseMove.remove(l),this.ssp.signals.click.remove(g),this.ssp.signals.rightClick.remove(p),this.ssp.signals.keyUp.remove(d)};this.ssp.signals.mouseMove.add(l),this.ssp.signals.click.add(g),this.ssp.signals.rightClick.add(p),this.ssp.signals.keyUp.add(d)}))}clearDrawingCanvas3D(){this.ssp.removeObjectById(t.canvas)}}export{e as default};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@soonspacejs/plugin-drawing-shape",
   "pluginName": "DrawingShapePlugin",
-  "version": "2.11.37",
+  "version": "2.11.38",
   "description": "DrawingShapePlugin plugin for SoonSpace.js",
   "main": "dist/index.esm.js",
   "module": "dist/index.esm.js",
@@ -13,8 +13,8 @@
   ],
   "author": "xunwei",
   "license": "UNLICENSED",
-  "gitHead": "dd46bb9c7dce27e12561d60eaa9bfc14037a73f6",
+  "gitHead": "af8d864a695bc488b8625268189a1b07eecd9775",
   "peerDependencies": {
-    "soonspacejs": "2.11.37"
+    "soonspacejs": "2.11.38"
   }
 }

package/dist/index.d.ts

@@ -1,45 +0,0 @@
-import SoonSpace from 'soonspacejs';
-import type { SetOptionsPointInfo, SetOptionsLineInfo, SetOptionsPolygonInfo, SetOptionsCircleInfo } from 'soonspacejs/types/Library';
-import type { Object3D } from 'three';
-export type DrawingPointInfo = SetOptionsPointInfo;
-export interface DrawingPointEvents {
-    onCancel?: () => void;
-}
-export type DrawingLineInfo = Omit<SetOptionsLineInfo, 'points'> & {
-    offsetY?: number;
-};
-export interface DrawingLineEvents {
-    onCancel?: () => void;
-    onCancelPrev?: () => void;
-}
-export type DrawingPolygonInfo = Omit<SetOptionsPolygonInfo, 'points' | 'yHeight'> & {
-    width?: number | undefined;
-    offsetY?: number;
-};
-export interface DrawingPolygonEvents {
-    onCancel?: () => void;
-    onCancelPrev?: () => void;
-}
-export type DrawingCircleInfo = Omit<SetOptionsCircleInfo, 'radius'> & {
-    offsetY?: number;
-};
-export interface DrawingCircleEvents {
-    onCancel?: () => void;
-}
-export default class DrawIngShapePlugin {
-    readonly ssp: SoonSpace;
-    readonly viewport: SoonSpace['viewport'];
-    constructor(ssp: SoonSpace);
-    getFirstIntersect(event: MouseEvent, drawingObj?: (Object3D | null)[] | Object3D | null): import("three").Intersection<Object3D<import("three").Object3DEventMap>>;
-    /**
-     * 绘图时使用的临时 layer
-     */
-    drawingLayer: number;
-    configLayer(drawingObj: Object3D[] | Object3D): void;
-    recoverLayer(drawingObj: Object3D[] | Object3D): void;
-    drawingPoint(options: DrawingPointInfo, events?: DrawingPointEvents): Promise<SetOptionsPointInfo>;
-    drawingLine(options: DrawingLineInfo, events?: DrawingLineEvents): Promise<SetOptionsLineInfo>;
-    drawingPolygon(options: DrawingPolygonInfo, events?: DrawingPolygonEvents): Promise<SetOptionsPolygonInfo>;
-    drawingCircle(options: DrawingCircleInfo, events?: DrawingCircleEvents): Promise<SetOptionsCircleInfo>;
-    clearDrawingCanvas3D(): void;
-}