gl-draw 0.11.40 → 0.11.41

package/dist/BaseObject.js

@@ -1 +1 @@
-"use strict";const u=require("three"),b=require("esus-lite"),p=require("three/examples/jsm/renderers/CSS2DRenderer"),d=require("three/examples/jsm/renderers/CSS3DRenderer"),n=require("./disposeMesh.js");require("idb-keyval");require("d3-geo");require("d3-geo-projection");function j(o){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(o){for(const t in o)if(t!=="default"){const i=Object.getOwnPropertyDescriptor(o,t);Object.defineProperty(e,t,i.get?i:{enumerable:!0,get:()=>o[t]})}}return e.default=o,Object.freeze(e)}const r=j(u);class f{constructor(){this.objectType="BaseObject",this.userData={},this.prefab=!1,this.isInstantiate=!1,this.pm=b.makePromiseCreator(),this.materialList={},this.useMaterialType="origin",this.onPointerIndex=[]}get parent(){const e=this.object3d.parent;return e?this.drawController.objMap.get(e)||this.pencil.scene:null}get children(){return this.object3d.children.map(e=>this.drawController.objMap.get(e)).filter(e=>!!e)}get position(){var e;return(e=this.object3d)==null?void 0:e.position}get rotation(){var e;return(e=this.object3d)==null?void 0:e.rotation}get scale(){var e;return(e=this.object3d)==null?void 0:e.scale}get add(){var e;return(e=this.object3d)==null?void 0:e.add.bind(this.object3d)}get remove(){var e;return(e=this.object3d)==null?void 0:e.remove.bind(this.object3d)}get visible(){return this.object3d?this.object3d.visible:!1}create(){}render(){}update(e,t){}resize(e,t){}show(){return this.object3d&&(this.object3d.visible=!0),this}hide(){return this.object3d&&(this.object3d.visible=!1),this}createMesh(...e){return this.object3d=new r.Mesh(...e),this}createGroup(){return this.object3d=new r.Group,this}createPoints(...e){return this.object3d=new r.Points(...e),this}createCSS2DObject(e){return this.object3d=new p.CSS2DObject(e),this}createCSS3DObject(e){return this.object3d=new d.CSS3DObject(e),this}createCSS3DSprite(e){return this.object3d=new d.CSS3DSprite(e),this}createSprite(e){return this.object3d=new r.Sprite(e),this}attach(...e){return[...e].forEach(t=>{this.object3d.attach(t.object3d),this.drawController!==t.drawController&&(t.drawController.objects.delete(t.key),this.drawController.objects.set(t.key,t))}),this}getSize(){const e=new r.Box3().setFromObject(this.object3d);return{min:e.min,max:e.max,size:e.getSize(new r.Vector3)}}traverse(e){e(this),this.children.forEach(t=>{t.traverse(e)})}clone(){return this.instantiate()}instantiate(e){return this.drawController.instantiate(this,{create:t=>{var i;if(this.object3d){if(this.object3d instanceof r.Sprite&&typeof e=="number"){const{size:s}=this.getSize(),a=new r.MeshBasicMaterial,c=["color","map","alphaMap","transparent","opacity","alphaTest","blending","side","depthTest","depthWrite"];for(const h of c){const l=this.object3d.material[h];l!==null&&(a[h]=l)}t.object3d=new r.Mesh(new r.PlaneGeometry(s.x,s.y,2,2),a)}else t.object3d=this.object3d.clone(!0);typeof e=="number"&&(t.object3d=new r.InstancedMesh(t.object3d.geometry,t.object3d.material,e),t.object3d.instanceMatrix.setUsage(r.DynamicDrawUsage)),t.position.set(0,0,0),t.rotation.set(0,0,0),t.setMaterialList("instantiate","clone"),t.useMaterial("instantiate"),t.object3d.userData.bloom&&((i=this.pencil.composerController)==null||i.toggleBloomSelection(t.object3d,!0)),t.object3d.userData.prefab&&(t.object3d.userData.prefab=!1)}}})}setInstancedMatrix(e){this.object3d instanceof r.InstancedMesh&&(Object.keys(e).forEach(t=>{this.object3d.setMatrixAt(Number(t),e[t])}),this.object3d.instanceMatrix.needsUpdate=!0,this.object3d.computeBoundingSphere())}erase(){this.drawController.erase(this)}cloneMaterial(){const e=this.object3d;if(!e||!e.material)return;const t=e.material;if(Array.isArray(t))return t.map(i=>{const s=i.userData;i.userData={};const a=i.clone();return i.userData=s,a});{const i=t.userData;t.userData={};const s=t.clone();return t.userData=i,s}}setMaterialList(e,t,i=!0){const s=this.object3d;if(!s||!s.material)return;if(this.materialList.origin||(this.materialList.origin=s.material),this.materialList[e])if(i){const c=this.materialList[e];n.disposeMesh({material:c})}else return this.materialList[e];const a=t==="clone"?this.cloneMaterial():t;return this.materialList[e]=a,a}useMaterial(e){const t=this.object3d;!t||!t.material||this.useMaterialType===e||!this.materialList[e]||(this.useMaterialType=e,t.material=this.materialList[e])}setTop(e){this.object3d&&(this.object3d.renderOrder=e)}onPointerEvent(e,t){const i=this.drawController.handlePick([this],e,t);this.onPointerIndex.push(i)}dispose(){this.onPointerIndex.forEach(e=>{this.drawController.removePick(e)}),this.object3d&&n.disposeMesh(this.object3d),Object.keys(this.materialList).forEach(e=>{if(e!==this.useMaterialType){if(this.isInstantiate&&e==="origin")return;n.disposeMesh({material:this.materialList[e]})}})}disposeWithOutMaterial(){this.onPointerIndex.forEach(e=>{this.drawController.removePick(e)}),this.object3d&&n.disposeMesh(this.object3d,!1)}}exports.BaseObject=f;
+"use strict";const u=require("three"),b=require("esus-lite"),p=require("three/examples/jsm/renderers/CSS2DRenderer"),d=require("three/examples/jsm/renderers/CSS3DRenderer"),n=require("./disposeMesh.js");require("idb-keyval");require("d3-geo");require("d3-geo-projection");function j(o){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(o){for(const t in o)if(t!=="default"){const i=Object.getOwnPropertyDescriptor(o,t);Object.defineProperty(e,t,i.get?i:{enumerable:!0,get:()=>o[t]})}}return e.default=o,Object.freeze(e)}const r=j(u);class f{constructor(){this.objectType="BaseObject",this.userData={},this.prefab=!1,this.isInstantiate=!1,this.pm=b.makePromiseCreator(),this.materialList={},this.useMaterialType="origin",this.onPointerIndex=[]}get parent(){const e=this.object3d.parent;return e?this.drawController.objMap.get(e)||this.pencil.scene:null}get children(){return this.object3d.children.map(e=>this.drawController.objMap.get(e)).filter(e=>!!e)}get position(){var e;return(e=this.object3d)==null?void 0:e.position}get rotation(){var e;return(e=this.object3d)==null?void 0:e.rotation}get scale(){var e;return(e=this.object3d)==null?void 0:e.scale}get add(){var e;return(e=this.object3d)==null?void 0:e.add.bind(this.object3d)}get remove(){var e;return(e=this.object3d)==null?void 0:e.remove.bind(this.object3d)}get visible(){return this.object3d?this.object3d.visible:!1}create(){}render(){}update(e,t){}resize(e,t){}show(){return this.object3d&&(this.object3d.visible=!0),this}hide(){return this.object3d&&(this.object3d.visible=!1),this}createMesh(...e){return this.object3d=new r.Mesh(...e),this}createGroup(){return this.object3d=new r.Group,this}createPoints(...e){return this.object3d=new r.Points(...e),this}createCSS2DObject(e){return this.object3d=new p.CSS2DObject(e),this}createCSS3DObject(e){return this.object3d=new d.CSS3DObject(e),this}createCSS3DSprite(e){return this.object3d=new d.CSS3DSprite(e),this}createSprite(e){return this.object3d=new r.Sprite(e),this}attach(...e){return[...e].forEach(t=>{this.object3d.attach(t.object3d),this.drawController!==t.drawController&&(t.drawController.objects.delete(t.key),this.drawController.objects.set(t.key,t))}),this}getSize(){const e=new r.Box3().setFromObject(this.object3d);return{min:e.min,max:e.max,size:e.getSize(new r.Vector3),center:e.getCenter(new r.Vector3)}}traverse(e){e(this),this.children.forEach(t=>{t.traverse(e)})}clone(){return this.instantiate()}instantiate(e){return this.drawController.instantiate(this,{create:t=>{var i;if(this.object3d){if(this.object3d instanceof r.Sprite&&typeof e=="number"){const{size:s}=this.getSize(),a=new r.MeshBasicMaterial,c=["color","map","alphaMap","transparent","opacity","alphaTest","blending","side","depthTest","depthWrite"];for(const h of c){const l=this.object3d.material[h];l!==null&&(a[h]=l)}t.object3d=new r.Mesh(new r.PlaneGeometry(s.x,s.y,2,2),a)}else t.object3d=this.object3d.clone(!0);typeof e=="number"&&(t.object3d=new r.InstancedMesh(t.object3d.geometry,t.object3d.material,e),t.object3d.instanceMatrix.setUsage(r.DynamicDrawUsage)),t.position.set(0,0,0),t.rotation.set(0,0,0),t.setMaterialList("instantiate","clone"),t.useMaterial("instantiate"),t.object3d.userData.bloom&&((i=this.pencil.composerController)==null||i.toggleBloomSelection(t.object3d,!0)),t.object3d.userData.prefab&&(t.object3d.userData.prefab=!1)}}})}setInstancedMatrix(e){this.object3d instanceof r.InstancedMesh&&(Object.keys(e).forEach(t=>{this.object3d.setMatrixAt(Number(t),e[t])}),this.object3d.instanceMatrix.needsUpdate=!0,this.object3d.computeBoundingSphere())}erase(){this.drawController.erase(this)}cloneMaterial(){const e=this.object3d;if(!e||!e.material)return;const t=e.material;if(Array.isArray(t))return t.map(i=>{const s=i.userData;i.userData={};const a=i.clone();return i.userData=s,a});{const i=t.userData;t.userData={};const s=t.clone();return t.userData=i,s}}setMaterialList(e,t,i=!0){const s=this.object3d;if(!s||!s.material)return;if(this.materialList.origin||(this.materialList.origin=s.material),this.materialList[e])if(i){const c=this.materialList[e];n.disposeMesh({material:c})}else return this.materialList[e];const a=t==="clone"?this.cloneMaterial():t;return this.materialList[e]=a,a}useMaterial(e){const t=this.object3d;!t||!t.material||this.useMaterialType===e||!this.materialList[e]||(this.useMaterialType=e,t.material=this.materialList[e])}setTop(e){this.object3d&&(this.object3d.renderOrder=e)}onPointerEvent(e,t){const i=this.drawController.handlePick([this],e,t);this.onPointerIndex.push(i)}dispose(){this.onPointerIndex.forEach(e=>{this.drawController.removePick(e)}),this.object3d&&n.disposeMesh(this.object3d),Object.keys(this.materialList).forEach(e=>{if(e!==this.useMaterialType){if(this.isInstantiate&&e==="origin")return;n.disposeMesh({material:this.materialList[e]})}})}disposeWithOutMaterial(){this.onPointerIndex.forEach(e=>{this.drawController.removePick(e)}),this.object3d&&n.disposeMesh(this.object3d,!1)}}exports.BaseObject=f;

package/dist/BaseObject.module.js

@@ -1,4 +1,4 @@
-import * as r from "three";
+import * as i from "three";
 import { makePromiseCreator as l } from "esus-lite";
 import { CSS2DObject as d } from "three/examples/jsm/renderers/CSS2DRenderer";
 import { CSS3DObject as b, CSS3DSprite as u } from "three/examples/jsm/renderers/CSS3DRenderer";
@@ -6,7 +6,7 @@ import { d as o } from "./disposeMesh.module.js";
 import "idb-keyval";
 import "d3-geo";
 import "d3-geo-projection";
-class D {
+class C {
   constructor() {
     this.objectType = "BaseObject", this.userData = {}, this.prefab = !1, this.isInstantiate = !1, this.pm = l(), this.materialList = {}, this.useMaterialType = "origin", this.onPointerIndex = [];
   }
@@ -55,13 +55,13 @@ class D {
     return this.object3d && (this.object3d.visible = !1), this;
   }
   createMesh(...t) {
-    return this.object3d = new r.Mesh(...t), this;
+    return this.object3d = new i.Mesh(...t), this;
   }
   createGroup() {
-    return this.object3d = new r.Group(), this;
+    return this.object3d = new i.Group(), this;
   }
   createPoints(...t) {
-    return this.object3d = new r.Points(...t), this;
+    return this.object3d = new i.Points(...t), this;
   }
   createCSS2DObject(t) {
     return this.object3d = new d(t), this;
@@ -73,7 +73,7 @@ class D {
     return this.object3d = new u(t), this;
   }
   createSprite(t) {
-    return this.object3d = new r.Sprite(t), this;
+    return this.object3d = new i.Sprite(t), this;
   }
   attach(...t) {
     return [...t].forEach((e) => {
@@ -81,11 +81,12 @@ class D {
     }), this;
   }
   getSize() {
-    const t = new r.Box3().setFromObject(this.object3d);
+    const t = new i.Box3().setFromObject(this.object3d);
     return {
       min: t.min,
       max: t.max,
-      size: t.getSize(new r.Vector3())
+      size: t.getSize(new i.Vector3()),
+      center: t.getCenter(new i.Vector3())
     };
   }
   traverse(t) {
@@ -99,10 +100,10 @@ class D {
   instantiate(t) {
     return this.drawController.instantiate(this, {
       create: (e) => {
-        var i;
+        var r;
         if (this.object3d) {
-          if (this.object3d instanceof r.Sprite && typeof t == "number") {
-            const { size: s } = this.getSize(), a = new r.MeshBasicMaterial(), n = [
+          if (this.object3d instanceof i.Sprite && typeof t == "number") {
+            const { size: s } = this.getSize(), a = new i.MeshBasicMaterial(), n = [
               "color",
               "map",
               "alphaMap",
@@ -118,17 +119,17 @@ class D {
               const h = this.object3d.material[c];
               h !== null && (a[c] = h);
             }
-            e.object3d = new r.Mesh(
-              new r.PlaneGeometry(s.x, s.y, 2, 2),
+            e.object3d = new i.Mesh(
+              new i.PlaneGeometry(s.x, s.y, 2, 2),
               a
             );
           } else
             e.object3d = this.object3d.clone(!0);
-          typeof t == "number" && (e.object3d = new r.InstancedMesh(
+          typeof t == "number" && (e.object3d = new i.InstancedMesh(
             e.object3d.geometry,
             e.object3d.material,
             t
-          ), e.object3d.instanceMatrix.setUsage(r.DynamicDrawUsage)), e.position.set(0, 0, 0), e.rotation.set(0, 0, 0), e.setMaterialList("instantiate", "clone"), e.useMaterial("instantiate"), e.object3d.userData.bloom && ((i = this.pencil.composerController) == null || i.toggleBloomSelection(
+          ), e.object3d.instanceMatrix.setUsage(i.DynamicDrawUsage)), e.position.set(0, 0, 0), e.rotation.set(0, 0, 0), e.setMaterialList("instantiate", "clone"), e.useMaterial("instantiate"), e.object3d.userData.bloom && ((r = this.pencil.composerController) == null || r.toggleBloomSelection(
             e.object3d,
             !0
           )), e.object3d.userData.prefab && (e.object3d.userData.prefab = !1);
@@ -137,7 +138,7 @@ class D {
     });
   }
   setInstancedMatrix(t) {
-    this.object3d instanceof r.InstancedMesh && (Object.keys(t).forEach((e) => {
+    this.object3d instanceof i.InstancedMesh && (Object.keys(t).forEach((e) => {
       this.object3d.setMatrixAt(
         Number(e),
         t[e]
@@ -153,25 +154,25 @@ class D {
       return;
     const e = t.material;
     if (Array.isArray(e))
-      return e.map((i) => {
-        const s = i.userData;
-        i.userData = {};
-        const a = i.clone();
-        return i.userData = s, a;
+      return e.map((r) => {
+        const s = r.userData;
+        r.userData = {};
+        const a = r.clone();
+        return r.userData = s, a;
       });
     {
-      const i = e.userData;
+      const r = e.userData;
       e.userData = {};
       const s = e.clone();
-      return e.userData = i, s;
+      return e.userData = r, s;
     }
   }
-  setMaterialList(t, e, i = !0) {
+  setMaterialList(t, e, r = !0) {
     const s = this.object3d;
     if (!s || !s.material)
       return;
     if (this.materialList.origin || (this.materialList.origin = s.material), this.materialList[t])
-      if (i) {
+      if (r) {
         const n = this.materialList[t];
         o({
           material: n
@@ -189,8 +190,8 @@ class D {
     this.object3d && (this.object3d.renderOrder = t);
   }
   onPointerEvent(t, e) {
-    const i = this.drawController.handlePick([this], t, e);
-    this.onPointerIndex.push(i);
+    const r = this.drawController.handlePick([this], t, e);
+    this.onPointerIndex.push(r);
   }
   dispose() {
     this.onPointerIndex.forEach((t) => {
@@ -212,5 +213,5 @@ class D {
   }
 }
 export {
-  D as B
+  C as B
 };

package/dist/core/BaseObject.d.ts

@@ -46,6 +46,7 @@ export default class BaseObject {
         min: THREE.Vector3;
         max: THREE.Vector3;
         size: THREE.Vector3;
+        center: THREE.Vector3;
     };
     traverse(fn: (o: IBaseObject) => void): void;
     clone(): Promise<this>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gl-draw",
-  "version": "0.11.40",
+  "version": "0.11.41",
   "author": "gitplus <hstits@gmail.com>",
   "scripts": {
     "start": "bundler-dev",