@soonspacejs/plugin-drawing-shape 2.3.13 → 2.3.16

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@soonspacejs/plugin-drawing-shape",
   "pluginName": "DrawingShapePlugin",
-  "version": "2.3.13",
+  "version": "2.3.16",
   "description": "DrawingShapePlugin plugin for SoonSpace.js",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -13,5 +13,5 @@
   ],
   "author": "xuek",
   "license": "UNLICENSED",
-  "gitHead": "8e8640a5baee74a8a0df5a0b386a6acae77f328a"
+  "gitHead": "7e6e48de24930a7d95ddb459ab559d0804ad32a6"
 }

package/src/index.ts

@@ -38,7 +38,9 @@ export default class DrawIngShapePlugin {
   readonly viewport: SoonSpace['viewport']
 
   constructor( readonly ssp: SoonSpace ) {
+
     this.viewport = ssp.viewport
+  
   }
 
   drawingPoint( options: DrawingPointInfo, events?: DrawingPointEvents ): Promise<SetOptionsPointInfo> {
@@ -60,23 +62,26 @@ export default class DrawIngShapePlugin {
       const point = canvas.getPoint( DrawingIds.point )
 
       const onMouseMove = ( event: MouseEvent ) => {
+
         if ( !point ) return
 
         const intersects = this.ssp.viewport.getIntersects( event )
-        const position = intersects.length > 0 ? intersects[0].point.clone() : this.ssp.getPositionByOffset( event )
+        const position = intersects.length > 0 ? intersects[ 0 ].point.clone() : this.ssp.getPositionByOffset( event )
 
         point.setOptions( {
           position,
         } )
+      
       }
 
       const onClick = ( event: MouseEvent ) => {
+
         removeSignals()
 
         if ( !point ) return
 
         const intersects = this.ssp.viewport.getIntersects( event )
-        const position = intersects.length > 0 ? intersects[0].point.clone() : this.ssp.getPositionByOffset( event )
+        const position = intersects.length > 0 ? intersects[ 0 ].point.clone() : this.ssp.getPositionByOffset( event )
 
         point.setOptions( {
           position,
@@ -86,34 +91,44 @@ export default class DrawIngShapePlugin {
           ...options,
           position: position.clone(),
         } )
+      
       }
 
       const onRightClick = () => {
+
         this.clearDrawingCanvas3D()
         removeSignals()
 
         events?.onCancel?.()
+      
       }
 
       const onKeyUp = ( event: KeyboardEvent ) => {
+
         switch ( event.code ) {
-          case 'Escape':
-            onRightClick()
-            break
+
+        case 'Escape':
+          onRightClick()
+          break
+        
         }
+      
       }
 
       const removeSignals = () => {
+
         this.ssp.signals.mouseMove.remove( onMouseMove )
         this.ssp.signals.click.remove( onClick )
         this.ssp.signals.rightClick.remove( onRightClick )
         this.ssp.signals.keyUp.remove( onKeyUp )
+      
       }
 
       this.ssp.signals.mouseMove.add( onMouseMove )
       this.ssp.signals.click.add( onClick )
       this.ssp.signals.rightClick.add( onRightClick )
       this.ssp.signals.keyUp.add( onKeyUp )
+    
     } )
 
   }
@@ -139,8 +154,9 @@ export default class DrawIngShapePlugin {
       const linePoints: Position[] = []
 
       const onMouseMove = ( event: MouseEvent ) => {
+
         const intersects = this.ssp.viewport.getIntersects( event )
-        const position = intersects.length > 0 ? intersects[0].point.clone() : this.ssp.getPositionByOffset( event )
+        const position = intersects.length > 0 ? intersects[ 0 ].point.clone() : this.ssp.getPositionByOffset( event )
 
         if ( !line ) return
 
@@ -148,11 +164,13 @@ export default class DrawIngShapePlugin {
           ...options,
           points: [ ...linePoints, position.clone().setY( position.y + 1 ) ],
         } )
+      
       }
 
       const onClick = ( event: MouseEvent ) => {
+
         const intersects = this.ssp.viewport.getIntersects( event )
-        const position = intersects.length > 0 ? intersects[0].point.clone() : this.ssp.getPositionByOffset( event )
+        const position = intersects.length > 0 ? intersects[ 0 ].point.clone() : this.ssp.getPositionByOffset( event )
 
         linePoints.push( position.clone().setY( position.y + 1 ) )
 
@@ -162,9 +180,11 @@ export default class DrawIngShapePlugin {
           ...options,
           points: linePoints,
         } )
+      
       }
 
       const onRightClick = () => {
+
         linePoints.pop()
 
         if ( !line ) return
@@ -175,37 +195,46 @@ export default class DrawIngShapePlugin {
         } )
 
         events?.onCancelPrev?.()
+      
       }
 
       const onDblClick = () => {
+
         removeSignals()
 
         resolve( {
           ...options,
           points: linePoints,
         } )
+      
       }
 
       const onKeyUp = ( event: KeyboardEvent ) => {
+
         switch ( event.code ) {
-          case 'Backspace':
-            onRightClick()
-            break
-          case 'Escape':
-            this.clearDrawingCanvas3D()
-            removeSignals()
-
-            events?.onCancel?.()
-            break
+
+        case 'Backspace':
+          onRightClick()
+          break
+        case 'Escape':
+          this.clearDrawingCanvas3D()
+          removeSignals()
+
+          events?.onCancel?.()
+          break
+        
         }
+      
       }
 
       const removeSignals = () => {
+
         this.ssp.signals.mouseMove.remove( onMouseMove )
         this.ssp.signals.click.remove( onClick )
         this.ssp.signals.rightClick.remove( onRightClick )
         this.ssp.signals.dblClick.remove( onDblClick )
         this.ssp.signals.keyUp.remove( onKeyUp )
+      
       }
 
       this.ssp.signals.mouseMove.add( onMouseMove )
@@ -213,6 +242,7 @@ export default class DrawIngShapePlugin {
       this.ssp.signals.rightClick.add( onRightClick )
       this.ssp.signals.dblClick.add( onDblClick )
       this.ssp.signals.keyUp.add( onKeyUp )
+    
     } )
 
   }
@@ -240,21 +270,24 @@ export default class DrawIngShapePlugin {
       const polygonPoints: Position[] = []
 
       const omMouseMove = ( event: MouseEvent ) => {
+
         const intersects = this.ssp.viewport.getIntersects( event )
-        const position = intersects.length > 0 ? intersects[0].point.clone() : this.ssp.getPositionByOffset( event )
+        const position = intersects.length > 0 ? intersects[ 0 ].point.clone() : this.ssp.getPositionByOffset( event )
 
         if ( !polygon ) return
 
         polygon.setOptions( {
           ...options,
-          yHeight: ( polygonPoints[0]?.y || position.y ) + 1,
+          yHeight: ( polygonPoints[ 0 ]?.y || position.y ) + 1,
           points: [ ...polygonPoints, position ],
         } )
+      
       }
 
       const onClick = ( event: MouseEvent ) => {
+
         const intersects = this.ssp.viewport.getIntersects( event )
-        const position = intersects.length > 0 ? intersects[0].point.clone() : this.ssp.getPositionByOffset( event )
+        const position = intersects.length > 0 ? intersects[ 0 ].point.clone() : this.ssp.getPositionByOffset( event )
 
         polygonPoints.push( position )
 
@@ -262,55 +295,66 @@ export default class DrawIngShapePlugin {
 
         polygon.setOptions( {
           ...options,
-          yHeight: ( polygonPoints[0]?.y || 0 ) + 1,
+          yHeight: ( polygonPoints[ 0 ]?.y || 0 ) + 1,
           points: polygonPoints,
         } )
+      
       }
 
       const onRightClick = () => {
+
         polygonPoints.pop()
 
         if ( !polygon ) return
 
         polygon.setOptions( {
           ...options,
-          yHeight: ( polygonPoints[0]?.y || 0 ) + 1,
+          yHeight: ( polygonPoints[ 0 ]?.y || 0 ) + 1,
           points: polygonPoints,
         } )
 
         events?.onCancelPrev?.()
+      
       }
 
       const onDblClick = () => {
+
         removeSignals()
 
         resolve( {
           ...options,
-          yHeight: ( polygonPoints[0]?.y || 0 ) + 1,
+          yHeight: ( polygonPoints[ 0 ]?.y || 0 ) + 1,
           points: polygonPoints,
         } )
+      
       }
 
       const onKeyUp = ( event: KeyboardEvent ) => {
+
         switch ( event.code ) {
-          case 'Backspace':
-            onRightClick()
-            break
-          case 'Escape':
-            this.clearDrawingCanvas3D()
-            removeSignals()
-
-            events?.onCancel?.()
-            break
+
+        case 'Backspace':
+          onRightClick()
+          break
+        case 'Escape':
+          this.clearDrawingCanvas3D()
+          removeSignals()
+
+          events?.onCancel?.()
+          break
+        
         }
+      
       }
 
       const removeSignals = () => {
+
         this.ssp.signals.mouseMove.remove( omMouseMove )
         this.ssp.signals.click.remove( onClick )
         this.ssp.signals.rightClick.remove( onRightClick )
         this.ssp.signals.dblClick.remove( onDblClick )
         this.ssp.signals.keyUp.remove( onKeyUp )
+      
       }
 
       this.ssp.signals.mouseMove.add( omMouseMove )
@@ -318,6 +362,7 @@ export default class DrawIngShapePlugin {
       this.ssp.signals.rightClick.add( onRightClick )
       this.ssp.signals.dblClick.add( onDblClick )
       this.ssp.signals.keyUp.add( onKeyUp )
+    
     } )
 
   }
@@ -344,10 +389,11 @@ export default class DrawIngShapePlugin {
       let radius = 100
 
       const onMouseMove = ( event: MouseEvent ) => {
+
         if ( !circle || !position ) return
 
         const intersects = this.ssp.viewport.getIntersects( event )
-        const mouseMovePosition = intersects.length > 0 ? intersects[0].point.clone() : this.ssp.getPositionByOffset( event )
+        const mouseMovePosition = intersects.length > 0 ? intersects[ 0 ].point.clone() : this.ssp.getPositionByOffset( event )
 
         radius = mouseMovePosition.distanceTo( position )
 
@@ -355,16 +401,19 @@ export default class DrawIngShapePlugin {
           position,
           radius,
         } )
+      
       }
 
       const onClick = ( event: MouseEvent ) => {
+
         if ( !circle ) return
 
         const intersects = this.ssp.viewport.getIntersects( event )
-        const mouseMovePosition = intersects.length > 0 ? intersects[0].point.clone() : this.ssp.getPositionByOffset( event )
+        const mouseMovePosition = intersects.length > 0 ? intersects[ 0 ].point.clone() : this.ssp.getPositionByOffset( event )
 
         if ( !position ) position = mouseMovePosition.clone().setY( mouseMovePosition.y + 1 )
         else {
+
           removeSignals()
           
           radius = mouseMovePosition.distanceTo( this.ssp.utils.IVector3ToVector3( position ) )
@@ -379,41 +428,54 @@ export default class DrawIngShapePlugin {
             position,
             radius,
           } )
+        
         }
+      
       }
 
       const onRightClick = () => {
+
         this.clearDrawingCanvas3D()
         removeSignals()
 
         events?.onCancel?.()
+      
       }
 
       const onKeyUp = ( event: KeyboardEvent ) => {
+
         switch ( event.code ) {
-          case 'Escape':
-            onRightClick()
-            break
+
+        case 'Escape':
+          onRightClick()
+          break
+        
         }
+      
       }
 
       const removeSignals = () => {
+
         this.ssp.signals.mouseMove.remove( onMouseMove )
         this.ssp.signals.click.remove( onClick )
         this.ssp.signals.rightClick.remove( onRightClick )
         this.ssp.signals.keyUp.remove( onKeyUp )
+      
       }
 
       this.ssp.signals.mouseMove.add( onMouseMove )
       this.ssp.signals.click.add( onClick )
       this.ssp.signals.rightClick.add( onRightClick )
       this.ssp.signals.keyUp.add( onKeyUp )
+    
     } )
 
   }
 
   clearDrawingCanvas3D(): void {
+
     this.ssp.removeCanvas3DById( DrawingIds.canvas )
+  
   }
 
 }