gl-draw 0.9.0-beta.74 → 0.9.0-beta.76

package/dist/plugins/Loader/VideoTextureLoader.d.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
 export default class extends THREE.Loader {
-    constructor(manager: THREE.LoadingManager);
+    constructor(manager?: THREE.LoadingManager);
     load(url: string, onLoad?: (texture: THREE.VideoTexture) => void, onProgress?: any, onError?: any): THREE.VideoTexture;
 }

package/dist/plugins/Loader/index.d.ts

@@ -2,32 +2,46 @@ import * as THREE from 'three';
 import { EventEmitter } from 'events';
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
 import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
-import { makePromiseCreator } from 'esus-lite';
 import VideoTextureLoader from './VideoTextureLoader';
 import Pencil from "../../core/Pencil";
+export declare const KNOWN_ASSET_TYPES: {
+    images: string[];
+    media: string[];
+    gltf: string[];
+};
 export default class Loader {
     textureLoader: THREE.TextureLoader;
     videoTextureLoader: VideoTextureLoader;
     gltfLoader: GLTFLoader;
     gltfDracoLoader: GLTFLoader;
     dracoLoader?: DRACOLoader;
+    loadingManager?: THREE.LoadingManager;
+    loadObj: {
+        texture: string[];
+        videoTexture: string[];
+        gltf: string[];
+        dracGltf: string[];
+    };
     assets: Map<string, THREE.Texture>;
     gltfAssets: Map<string, THREE.Object3D<THREE.Event>>;
-    loadingManager: THREE.LoadingManager;
-    progress: number;
-    pm: ReturnType<typeof makePromiseCreator>;
     event: EventEmitter;
     pencil: Pencil;
     emit(eventName: string, ...args: any[]): void;
     on(eventName: string, listener: (...args: any[]) => void): void;
     install(pencil: Pencil): void;
-    init(options?: {
-        progressLog?: boolean;
+    initLoadingManager(): {
+        promise: Promise<any>;
+        resolve: (value?: any) => void;
+        reject: (value?: any) => void;
+    };
+    setDecoderPath(path: string): void;
+    setItem(src: string | string[], options?: {
+        dracoPath: string;
     }): void;
+    load(): Promise<any>;
     loadTexture(srcArr: string[]): void;
     colorCorrection(): void;
     loadVideoTexture(srcArr: string[]): void;
-    setDecoderPath(path: string): void;
     loadGltf(srcArr: string[], draco?: boolean): void;
     dispose(): void;
 }

package/dist/plugins/index.js

@@ -1 +1 @@
-"use strict";var E=Object.defineProperty;var m=Object.getOwnPropertySymbols;var k=Object.prototype.hasOwnProperty,M=Object.prototype.propertyIsEnumerable;var v=(a,e,t)=>e in a?E(a,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):a[e]=t,L=(a,e)=>{for(var t in e||(e={}))k.call(e,t)&&v(a,t,e[t]);if(m)for(var t of m(e))M.call(e,t)&&v(a,t,e[t]);return a};var u=(a,e,t)=>new Promise((s,r)=>{var o=n=>{try{c(t.next(n))}catch(h){r(h)}},i=n=>{try{c(t.throw(n))}catch(h){r(h)}},c=n=>n.done?s(n.value):Promise.resolve(n.value).then(o,i);c((t=t.apply(a,e)).next())});Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("esus-lite"),T=require("three"),g=require("idb-keyval"),O=require("../events.js"),j=require("three/examples/jsm/loaders/GLTFLoader"),C=require("three/examples/jsm/loaders/DRACOLoader"),b=require("../colorCorrection.js");function D(a){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(a){for(const t in a)if(t!=="default"){const s=Object.getOwnPropertyDescriptor(a,t);Object.defineProperty(e,t,s.get?s:{enumerable:!0,get:()=>a[t]})}}return e.default=a,Object.freeze(e)}const l=D(T);class R{constructor(){this.cache=new Map}install(){}init(e){const t=y.makePromiseCreator();this.cache.set(e,t)}get(e,t){return u(this,null,function*(){if(!this.cache.get(e)&&t){this.init(e);const s=yield t();this.set(e,s)}if(this.cache.get(e))return yield this.cache.get(e).promise})}set(e,t){const s=this.cache.get(e);s?s.resolve(t):console.warn("init cache first")}dispose(){this.cache.forEach((e,t)=>{e.reject(`stop set cache:${t}`)}),this.cache.clear()}}class U{constructor(e){this.onTopBase=new Map,this.objectNamesToFactories=new Map,this.objects=new Map,this.objects_=e}get objectsPromise(){const e=[];return this.objects.forEach(t=>{e.push(t.pm.promise)}),e}install(e){this.pencil=e,this.initObjectFactories()}initObjectFactories(){const{objects_:e}=this;Object.keys(e).forEach(t=>{const s=class{create(o={}){return new e[t](o)}};this.objectNamesToFactories.set(t,s)})}getObject(e,t){e.includes("#")&&console.warn("getObject:err:不支持 #",e);const{key:s}=t||{},r=`${e}${s?`#${s}`:""}`;return this.objects.get(r)}getAllObject(e,t){e.includes("#")&&console.warn("getAllObject:err:不支持 #",e);const{key:s}=t||{},r=`${e}${s?`#${s}`:""}`,o=[];return this.objects.forEach((i,c)=>{(c.startsWith(`${r}#`)||c===r)&&o.push(i)}),o}draw(e,t,s){return u(this,null,function*(){const r=this.objectNamesToFactories.get(e);if(r){const{key:o}=t||{};let i=`${e}${o?`#${o}`:""}`;if(this.objects.has(i)){const p=l.MathUtils.generateUUID();i+=`#${p}`}const c=(t==null?void 0:t.target)||s,n=(t==null?void 0:t.onTop)||0;let h;typeof c=="string"?h=this.objects.get(c):(c==null?void 0:c.objecttype__)==="BaseObject"?h=c:this.group?h=this.group:h=this.pencil.scene;const d=new r().create(t);return d.pencil=this.pencil,d.key=i,this.objects.set(i,d),yield this.addMesh(d,h,n),d}throw new Error(`Unrecognized:${e}`)})}addMesh(e,t,s){return u(this,null,function*(){if(yield e.create(),e.object3d){if(e.object3d.userData.BaseObject_=e,s)if(e.type_==="node")e.object3d.renderOrder=s;else{const r=1e3+s*2,o=`${r-1}`;if(!this.onTopBase.has(o)){const i=new l.Points(void 0,new l.PointsMaterial({transparent:!0,opacity:0}));i.renderOrder=r-1,i.onBeforeRender=()=>{this.pencil.renderer.clearDepth()},i.frustumCulled=!1,this.onTopBase.set(o,!0),this.pencil.scene.add(i)}e.object3d.renderOrder=r}t.add(e.object3d)}e.visible=!0,e.render(),e.pm.resolve()})}erase(...e){[...e].forEach(t=>{const s=[];if(typeof t=="string"){const[r,o]=t.split("#");s.push(...this.getAllObject(r,{key:o}))}else s.push(t);s.forEach(r=>{this.removeMesh(r)})})}removeMesh(e){const{parent:t}=e;e.object3d&&t.remove(e.object3d),e.traverse(s=>{s.visible=!1,s.dispose(),this.objects.delete(s.key)})}update(e,t){this.objects.forEach(s=>{s.update(e,t)})}setSize(e,t){this.objects.forEach(s=>{s.resize(e,t)})}show(){var e;(e=this.group)==null||e.show()}hide(){var e;(e=this.group)==null||e.hide()}dispose(){this.group=void 0,this.objects.forEach((e,t)=>{e.dispose(),e.pm.reject(`stop draw:${t}`)}),this.objects.clear(),this.onTopBase.clear(),this.objectNamesToFactories.clear()}}class ${constructor(){this.data={}}install(){}setData(e,t){var s;this.data[e]=t,(s=this.cb)==null||s.call(this,e)}runAll(){Object.keys(this.data).forEach(e=>{var t;(t=this.cb)==null||t.call(this,e)})}runType(e){var t;this.data[e]!==void 0&&((t=this.cb)==null||t.call(this,e))}dispose(){this.data={},this.cb=void 0}}class A{constructor(e={}){this.messageList=[],this.options=L({cache:!1,cacheVersion:"1"},e)}install(e,t){if(!t)return;const{scriptURL:s,length:r}=t;this.init(s,r)}init(e,t){let{cache:s,cacheVersion:r}=this.options;this.workerList=Array.from({length:t},(o,i)=>{const c=typeof e=="string"?new Worker(e):e();return c.onmessage=({data:{res:n,uuid:h}})=>{var p,w;const d=this.messageList.find(({uuid:f})=>h===f);if(d==null||d.options.cb(n),this.workerList[i].inUse=!1,this.checkMessage(),s=(p=d==null?void 0:d.options.cache)!=null?p:s,r=(w=d==null?void 0:d.options.cacheVersion)!=null?w:r,s){const f=r;g.set(h,{[f]:n})}},{worker:c,inUse:!1}})}postMessage(e,t){var i,c;let{cache:s,cacheVersion:r}=this.options;if(s=(i=t.cache)!=null?i:s,r=(c=t.cacheVersion)!=null?c:r,s&&!e.workerKey){console.warn("worker cache need workerKey");return}if(s&&e.workerKey&&e.delCache){console.warn(`worker cache del: ${e.workerKey}`),g.del(e.workerKey);return}const o=e.workerKey||l.MathUtils.generateUUID();(s?g.get(o):Promise.resolve()).then(n=>{const h=r;n&&n[h]?t.cb(n[h]):(this.messageList.push({req:e,options:t,uuid:o,inUse:!1}),this.checkMessage())}).catch(()=>{console.warn("err:worker cache"),this.messageList.push({req:e,options:t,uuid:o,inUse:!1}),this.checkMessage()})}checkMessage(){const e=this.workerList.find(({inUse:t})=>!t);if(e){const t=this.messageList.find(({inUse:s})=>!s);t&&(t.inUse=!0,e.inUse=!0,e.worker.postMessage({req:t.req,uuid:t.uuid}))}}dispose(){this.workerList.forEach(({worker:e})=>{e.terminate()}),this.workerList=[],this.messageList=[]}}class S{constructor(){this.chunks=[]}install(e){this.pencil=e,this.canvas=e.renderer.domElement}init({frameRequestRate:e=60}={}){const t=this.canvas.captureStream(e),s=new MediaRecorder(t,{mimeType:"video/webm; codecs=vp9"});this.mediaRecorder=s,s.ondataavailable=r=>{this.chunks.push(r.data)},s.onstop=()=>{this.handleStop()}}handleStop(){const e=new Blob(this.chunks,{type:"video/webm"}),t=URL.createObjectURL(e),s=document.createElement("a");s.style.display="none",s.href=t,s.download="video.webm",document.body.appendChild(s),s.click(),setTimeout(()=>{URL.revokeObjectURL(t),document.body.removeChild(s)},0)}start(e){this.mediaRecorder.start(e)}stop(){this.mediaRecorder.stop()}dispose(){this.chunks=[]}}class x extends l.Loader{constructor(e){super(e)}load(e,t,s,r){e===void 0&&(e=""),this.path!==void 0&&(e=this.path+e),e=this.manager.resolveURL(e);const o=document.createElement("video"),i=new l.VideoTexture(o);i.needsUpdate=!0;const c=()=>{h(),t&&t(i),this.manager.itemEnd(e)},n=d=>{h(),r&&r(d),this.manager.itemEnd(e),this.manager.itemError(e)},h=()=>{o.removeEventListener("canplaythrough",c,!1),o.removeEventListener("error",n,!1)};return o.addEventListener("canplaythrough",c,!1),o.addEventListener("error",n,!1),e.slice(0,5)!=="data:"&&this.crossOrigin!==void 0&&(o.crossOrigin=this.crossOrigin),this.manager.itemStart(e),o.src=e,o.preload="auto",o.autoplay=!1,o.loop=!1,o.muted=!0,o.load(),o.setAttribute("webkit-playsinline","webkit-playsinline"),o.setAttribute("playsinline",""),i}}class P{constructor(){this.assets=new Map,this.gltfAssets=new Map,this.progress=0,this.event=new O.eventsExports.EventEmitter}emit(e,...t){this.event.emit(e,...t)}on(e,t){this.event.on(e,t)}install(e){this.pencil=e,this.colorCorrection()}init(e={}){this.pm=y.makePromiseCreator(!0),this.loadingManager=new l.LoadingManager,this.textureLoader=new l.TextureLoader(this.loadingManager),this.videoTextureLoader=new x(this.loadingManager),this.gltfLoader=new j.GLTFLoader(this.loadingManager),this.gltfDracoLoader=new j.GLTFLoader(this.loadingManager),this.loadingManager.onProgress=(t,s,r)=>{const o=s,i=r;this.progress=o/i,e.progressLog&&console.log("onProgress",t,o,i),this.progress===1&&this.pm.resolve(),this.emit("progress",this.progress)},this.loadingManager.onError=t=>console.log("There was an error loading "+t)}loadTexture(e){e.forEach(t=>u(this,null,function*(){const s=yield this.textureLoader.loadAsync(t);this.assets.set(t,s)}))}colorCorrection(){(+l.REVISION<152&&this.pencil.options.renderer.outputEncoding===b.TextureEncoding.sRGB||+l.REVISION>=152&&this.pencil.options.renderer.outputColorSpace===b.ColorSpace.sRGB)&&this.assets.forEach(e=>{b.colorCorrection({texture:e})})}loadVideoTexture(e){e.forEach(t=>u(this,null,function*(){this.videoTextureLoader.load(t,s=>{this.assets.set(t,s)})}))}setDecoderPath(e){this.dracoLoader=new C.DRACOLoader,this.dracoLoader.setDecoderPath(e),this.gltfDracoLoader.setDRACOLoader(this.dracoLoader)}loadGltf(e,t){e.forEach(s=>u(this,null,function*(){const r=yield this[t?"gltfDracoLoader":"gltfLoader"].loadAsync(s);this.gltfAssets.set(s,r.scene)}))}dispose(){var e;this.assets.clear(),this.gltfAssets.clear(),(e=this.dracoLoader)==null||e.dispose()}}exports.Cache=R;exports.CanvasStream=S;exports.Data=$;exports.Draw=U;exports.Loader=P;exports.Wk=A;
+"use strict";var T=Object.defineProperty;var v=Object.getOwnPropertySymbols;var k=Object.prototype.hasOwnProperty,O=Object.prototype.propertyIsEnumerable;var j=(r,e,t)=>e in r?T(r,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):r[e]=t,L=(r,e)=>{for(var t in e||(e={}))k.call(e,t)&&j(r,t,e[t]);if(v)for(var t of v(e))O.call(e,t)&&j(r,t,e[t]);return r};var u=(r,e,t)=>new Promise((s,o)=>{var a=n=>{try{c(t.next(n))}catch(h){o(h)}},i=n=>{try{c(t.throw(n))}catch(h){o(h)}},c=n=>n.done?s(n.value):Promise.resolve(n.value).then(a,i);c((t=t.apply(r,e)).next())});Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const E=require("esus-lite"),M=require("three"),p=require("idb-keyval"),x=require("../events.js"),y=require("three/examples/jsm/loaders/GLTFLoader"),D=require("three/examples/jsm/loaders/DRACOLoader"),b=require("../colorCorrection.js");function C(r){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(r){for(const t in r)if(t!=="default"){const s=Object.getOwnPropertyDescriptor(r,t);Object.defineProperty(e,t,s.get?s:{enumerable:!0,get:()=>r[t]})}}return e.default=r,Object.freeze(e)}const l=C(M);class R{constructor(){this.cache=new Map}install(){}init(e){const t=E.makePromiseCreator();this.cache.set(e,t)}get(e,t){return u(this,null,function*(){if(!this.cache.get(e)&&t){this.init(e);const s=yield t();this.set(e,s)}if(this.cache.get(e))return yield this.cache.get(e).promise})}set(e,t){const s=this.cache.get(e);s?s.resolve(t):console.warn("init cache first")}dispose(){this.cache.forEach((e,t)=>{e.reject(`stop set cache:${t}`)}),this.cache.clear()}}class S{constructor(e){this.onTopBase=new Map,this.objectNamesToFactories=new Map,this.objects=new Map,this.objects_=e}get objectsPromise(){const e=[];return this.objects.forEach(t=>{e.push(t.pm.promise)}),e}install(e){this.pencil=e,this.initObjectFactories()}initObjectFactories(){const{objects_:e}=this;Object.keys(e).forEach(t=>{const s=class{create(a={}){return new e[t](a)}};this.objectNamesToFactories.set(t,s)})}getObject(e,t){e.includes("#")&&console.warn("getObject:err:不支持 #",e);const{key:s}=t||{},o=`${e}${s?`#${s}`:""}`;return this.objects.get(o)}getAllObject(e,t){e.includes("#")&&console.warn("getAllObject:err:不支持 #",e);const{key:s}=t||{},o=`${e}${s?`#${s}`:""}`,a=[];return this.objects.forEach((i,c)=>{(c.startsWith(`${o}#`)||c===o)&&a.push(i)}),a}draw(e,t,s){return u(this,null,function*(){const o=this.objectNamesToFactories.get(e);if(o){const{key:a}=t||{};let i=`${e}${a?`#${a}`:""}`;if(this.objects.has(i)){const f=l.MathUtils.generateUUID();i+=`#${f}`}const c=(t==null?void 0:t.target)||s,n=(t==null?void 0:t.onTop)||0;let h;typeof c=="string"?h=this.objects.get(c):(c==null?void 0:c.objecttype__)==="BaseObject"?h=c:this.group?h=this.group:h=this.pencil.scene;const d=new o().create(t);return d.pencil=this.pencil,d.key=i,this.objects.set(i,d),yield this.addMesh(d,h,n),d}throw new Error(`Unrecognized:${e}`)})}addMesh(e,t,s){return u(this,null,function*(){if(yield e.create(),e.object3d){if(e.object3d.userData.BaseObject_=e,s)if(e.type_==="node")e.object3d.renderOrder=s;else{const o=1e3+s*2,a=`${o-1}`;if(!this.onTopBase.has(a)){const i=new l.Points(void 0,new l.PointsMaterial({transparent:!0,opacity:0}));i.renderOrder=o-1,i.onBeforeRender=()=>{this.pencil.renderer.clearDepth()},i.frustumCulled=!1,this.onTopBase.set(a,!0),this.pencil.scene.add(i)}e.object3d.renderOrder=o}t.add(e.object3d)}e.visible=!0,e.render(),e.pm.resolve()})}erase(...e){[...e].forEach(t=>{const s=[];if(typeof t=="string"){const[o,a]=t.split("#");s.push(...this.getAllObject(o,{key:a}))}else s.push(t);s.forEach(o=>{this.removeMesh(o)})})}removeMesh(e){const{parent:t}=e;e.object3d&&t.remove(e.object3d),e.traverse(s=>{s.visible=!1,s.dispose(),this.objects.delete(s.key)})}update(e,t){this.objects.forEach(s=>{s.update(e,t)})}setSize(e,t){this.objects.forEach(s=>{s.resize(e,t)})}show(){var e;(e=this.group)==null||e.show()}hide(){var e;(e=this.group)==null||e.hide()}dispose(){this.group=void 0,this.objects.forEach((e,t)=>{e.dispose(),e.pm.reject(`stop draw:${t}`)}),this.objects.clear(),this.onTopBase.clear(),this.objectNamesToFactories.clear()}}class U{constructor(){this.data={}}install(){}setData(e,t){var s;this.data[e]=t,(s=this.cb)==null||s.call(this,e)}runAll(){Object.keys(this.data).forEach(e=>{var t;(t=this.cb)==null||t.call(this,e)})}runType(e){var t;this.data[e]!==void 0&&((t=this.cb)==null||t.call(this,e))}dispose(){this.data={},this.cb=void 0}}class ${constructor(e={}){this.messageList=[],this.options=L({cache:!1,cacheVersion:"1"},e)}install(e,t){if(!t)return;const{scriptURL:s,length:o}=t;this.init(s,o)}init(e,t){let{cache:s,cacheVersion:o}=this.options;this.workerList=Array.from({length:t},(a,i)=>{const c=typeof e=="string"?new Worker(e):e();return c.onmessage=({data:{res:n,uuid:h}})=>{var f,w;const d=this.messageList.find(({uuid:g})=>h===g);if(d==null||d.options.cb(n),this.workerList[i].inUse=!1,this.checkMessage(),s=(f=d==null?void 0:d.options.cache)!=null?f:s,o=(w=d==null?void 0:d.options.cacheVersion)!=null?w:o,s){const g=o;p.set(h,{[g]:n})}},{worker:c,inUse:!1}})}postMessage(e,t){var i,c;let{cache:s,cacheVersion:o}=this.options;if(s=(i=t.cache)!=null?i:s,o=(c=t.cacheVersion)!=null?c:o,s&&!e.workerKey){console.warn("worker cache need workerKey");return}if(s&&e.workerKey&&e.delCache){console.warn(`worker cache del: ${e.workerKey}`),p.del(e.workerKey);return}const a=e.workerKey||l.MathUtils.generateUUID();(s?p.get(a):Promise.resolve()).then(n=>{const h=o;n&&n[h]?t.cb(n[h]):(this.messageList.push({req:e,options:t,uuid:a,inUse:!1}),this.checkMessage())}).catch(()=>{console.warn("err:worker cache"),this.messageList.push({req:e,options:t,uuid:a,inUse:!1}),this.checkMessage()})}checkMessage(){const e=this.workerList.find(({inUse:t})=>!t);if(e){const t=this.messageList.find(({inUse:s})=>!s);t&&(t.inUse=!0,e.inUse=!0,e.worker.postMessage({req:t.req,uuid:t.uuid}))}}dispose(){this.workerList.forEach(({worker:e})=>{e.terminate()}),this.workerList=[],this.messageList=[]}}class P{constructor(){this.chunks=[]}install(e){this.pencil=e,this.canvas=e.renderer.domElement}init({frameRequestRate:e=60}={}){const t=this.canvas.captureStream(e),s=new MediaRecorder(t,{mimeType:"video/webm; codecs=vp9"});this.mediaRecorder=s,s.ondataavailable=o=>{this.chunks.push(o.data)},s.onstop=()=>{this.handleStop()}}handleStop(){const e=new Blob(this.chunks,{type:"video/webm"}),t=URL.createObjectURL(e),s=document.createElement("a");s.style.display="none",s.href=t,s.download="video.webm",document.body.appendChild(s),s.click(),setTimeout(()=>{URL.revokeObjectURL(t),document.body.removeChild(s)},0)}start(e){this.mediaRecorder.start(e)}stop(){this.mediaRecorder.stop()}dispose(){this.chunks=[]}}class A extends l.Loader{constructor(e){super(e)}load(e,t,s,o){e===void 0&&(e=""),this.path!==void 0&&(e=this.path+e),e=this.manager.resolveURL(e);const a=document.createElement("video"),i=new l.VideoTexture(a);i.needsUpdate=!0;const c=()=>{h(),t&&t(i),this.manager.itemEnd(e)},n=d=>{h(),o&&o(d),this.manager.itemEnd(e),this.manager.itemError(e)},h=()=>{a.removeEventListener("canplaythrough",c,!1),a.removeEventListener("error",n,!1)};return a.addEventListener("canplaythrough",c,!1),a.addEventListener("error",n,!1),e.slice(0,5)!=="data:"&&this.crossOrigin!==void 0&&(a.crossOrigin=this.crossOrigin),this.manager.itemStart(e),a.src=e,a.preload="auto",a.autoplay=!1,a.loop=!1,a.muted=!0,a.load(),a.setAttribute("webkit-playsinline","webkit-playsinline"),a.setAttribute("playsinline",""),i}}const m={images:["png","jpg","jpeg","gif","svg","ico","webp","avif"],media:["mp4","webm","ogg","mp3","wav","flac","aac"],gltf:["gltf","glb"]};class _{constructor(){this.textureLoader=new l.TextureLoader,this.videoTextureLoader=new A,this.gltfLoader=new y.GLTFLoader,this.gltfDracoLoader=new y.GLTFLoader,this.loadObj={texture:[],videoTexture:[],gltf:[],dracGltf:[]},this.assets=new Map,this.gltfAssets=new Map,this.event=new x.eventsExports.EventEmitter}emit(e,...t){this.event.emit(e,...t)}on(e,t){this.event.on(e,t)}install(e){this.pencil=e,this.colorCorrection()}initLoadingManager(){const e=E.makePromiseCreator(!0);return this.loadingManager=new l.LoadingManager,this.textureLoader.manager=this.loadingManager,this.videoTextureLoader.manager=this.loadingManager,this.gltfLoader.manager=this.loadingManager,this.gltfDracoLoader.manager=this.loadingManager,this.loadingManager.onProgress=(t,s,o)=>{s===o&&e.resolve(),this.emit("progress",s,o,t)},this.loadingManager.onError=t=>{console.log("There was an error loading "+t),e.reject()},e}setDecoderPath(e){this.dracoLoader=new D.DRACOLoader,this.dracoLoader.setDecoderPath(e),this.gltfDracoLoader.setDRACOLoader(this.dracoLoader)}setItem(e,t){typeof e=="string"&&(e=[e]);const{dracoPath:s}=t||{};s&&this.setDecoderPath(s),e.forEach(o=>{const a=o.split(".").pop();m.images.includes(a)?this.loadObj.texture.push(o):m.media.includes(a)?this.loadObj.videoTexture.push(o):m.gltf.includes(a)&&(s?this.loadObj.dracGltf.push(o):this.loadObj.gltf.push(o))})}load(){const e=this.initLoadingManager();return this.loadTexture(this.loadObj.texture),this.loadVideoTexture(this.loadObj.videoTexture),this.loadGltf(this.loadObj.gltf),this.loadGltf(this.loadObj.dracGltf,!0),e.promise}loadTexture(e){this.loadObj.texture.push(...e),e.forEach(t=>u(this,null,function*(){const s=yield this.textureLoader.loadAsync(t);this.assets.set(t,s)}))}colorCorrection(){(+l.REVISION<152&&this.pencil.options.renderer.outputEncoding===b.TextureEncoding.sRGB||+l.REVISION>=152&&this.pencil.options.renderer.outputColorSpace===b.ColorSpace.sRGB)&&this.assets.forEach(e=>{b.colorCorrection({texture:e})})}loadVideoTexture(e){this.loadObj.videoTexture.push(...e),e.forEach(t=>u(this,null,function*(){this.videoTextureLoader.load(t,s=>{this.assets.set(t,s)})}))}loadGltf(e,t){this.loadObj[t?"dracGltf":"gltf"].push(...e),e.forEach(s=>u(this,null,function*(){const o=yield this[t?"gltfDracoLoader":"gltfLoader"].loadAsync(s);this.gltfAssets.set(s,o.scene)}))}dispose(){var e;this.assets.clear(),this.gltfAssets.clear(),(e=this.dracoLoader)==null||e.dispose()}}exports.Cache=R;exports.CanvasStream=P;exports.Data=U;exports.Draw=S;exports.Loader=_;exports.Wk=$;

package/dist/plugins/index.module.js

@@ -1,37 +1,37 @@
-var j = Object.defineProperty;
-var m = Object.getOwnPropertySymbols;
-var y = Object.prototype.hasOwnProperty, E = Object.prototype.propertyIsEnumerable;
-var w = (d, e, t) => e in d ? j(d, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[e] = t, b = (d, e) => {
+var y = Object.defineProperty;
+var b = Object.getOwnPropertySymbols;
+var E = Object.prototype.hasOwnProperty, k = Object.prototype.propertyIsEnumerable;
+var w = (d, e, t) => e in d ? y(d, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[e] = t, v = (d, e) => {
   for (var t in e || (e = {}))
-    y.call(e, t) && w(d, t, e[t]);
-  if (m)
-    for (var t of m(e))
-      E.call(e, t) && w(d, t, e[t]);
+    E.call(e, t) && w(d, t, e[t]);
+  if (b)
+    for (var t of b(e))
+      k.call(e, t) && w(d, t, e[t]);
   return d;
 };
-var p = (d, e, t) => new Promise((s, o) => {
-  var r = (c) => {
+var f = (d, e, t) => new Promise((s, o) => {
+  var a = (c) => {
     try {
-      a(t.next(c));
+      r(t.next(c));
     } catch (n) {
       o(n);
     }
   }, i = (c) => {
     try {
-      a(t.throw(c));
+      r(t.throw(c));
     } catch (n) {
       o(n);
     }
-  }, a = (c) => c.done ? s(c.value) : Promise.resolve(c.value).then(r, i);
-  a((t = t.apply(d, e)).next());
+  }, r = (c) => c.done ? s(c.value) : Promise.resolve(c.value).then(a, i);
+  r((t = t.apply(d, e)).next());
 });
 import { makePromiseCreator as L } from "esus-lite";
 import * as l from "three";
-import { set as k, del as M, get as T } from "idb-keyval";
-import { e as U } from "../events.module.js";
-import { GLTFLoader as v } from "three/examples/jsm/loaders/GLTFLoader";
-import { DRACOLoader as R } from "three/examples/jsm/loaders/DRACOLoader";
-import { T as $, C, c as x } from "../colorCorrection.module.js";
+import { set as T, del as M, get as x } from "idb-keyval";
+import { e as O } from "../events.module.js";
+import { GLTFLoader as j } from "three/examples/jsm/loaders/GLTFLoader";
+import { DRACOLoader as U } from "three/examples/jsm/loaders/DRACOLoader";
+import { T as D, C as R, c as $ } from "../colorCorrection.module.js";
 class _ {
   constructor() {
     this.cache = /* @__PURE__ */ new Map();
@@ -43,7 +43,7 @@ class _ {
     this.cache.set(e, t);
   }
   get(e, t) {
-    return p(this, null, function* () {
+    return f(this, null, function* () {
       if (!this.cache.get(e) && t) {
         this.init(e);
         const s = yield t();
@@ -80,8 +80,8 @@ class K {
     const { objects_: e } = this;
     Object.keys(e).forEach((t) => {
       const s = class {
-        create(r = {}) {
-          return new e[t](r);
+        create(a = {}) {
+          return new e[t](a);
         }
       };
       this.objectNamesToFactories.set(t, s);
@@ -94,24 +94,24 @@ class K {
   }
   getAllObject(e, t) {
     e.includes("#") && console.warn("getAllObject:err:不支持 #", e);
-    const { key: s } = t || {}, o = `${e}${s ? `#${s}` : ""}`, r = [];
-    return this.objects.forEach((i, a) => {
-      (a.startsWith(`${o}#`) || a === o) && r.push(i);
-    }), r;
+    const { key: s } = t || {}, o = `${e}${s ? `#${s}` : ""}`, a = [];
+    return this.objects.forEach((i, r) => {
+      (r.startsWith(`${o}#`) || r === o) && a.push(i);
+    }), a;
   }
   draw(e, t, s) {
-    return p(this, null, function* () {
+    return f(this, null, function* () {
       const o = this.objectNamesToFactories.get(e);
       if (o) {
-        const { key: r } = t || {};
-        let i = `${e}${r ? `#${r}` : ""}`;
+        const { key: a } = t || {};
+        let i = `${e}${a ? `#${a}` : ""}`;
         if (this.objects.has(i)) {
-          const f = l.MathUtils.generateUUID();
-          i += `#${f}`;
+          const p = l.MathUtils.generateUUID();
+          i += `#${p}`;
         }
-        const a = (t == null ? void 0 : t.target) || s, c = (t == null ? void 0 : t.onTop) || 0;
+        const r = (t == null ? void 0 : t.target) || s, c = (t == null ? void 0 : t.onTop) || 0;
         let n;
-        typeof a == "string" ? n = this.objects.get(a) : (a == null ? void 0 : a.objecttype__) === "BaseObject" ? n = a : this.group ? n = this.group : n = this.pencil.scene;
+        typeof r == "string" ? n = this.objects.get(r) : (r == null ? void 0 : r.objecttype__) === "BaseObject" ? n = r : this.group ? n = this.group : n = this.pencil.scene;
         const h = new o().create(t);
         return h.pencil = this.pencil, h.key = i, this.objects.set(i, h), yield this.addMesh(h, n, c), h;
       }
@@ -119,14 +119,14 @@ class K {
     });
   }
   addMesh(e, t, s) {
-    return p(this, null, function* () {
+    return f(this, null, function* () {
       if (yield e.create(), e.object3d) {
         if (e.object3d.userData.BaseObject_ = e, s)
           if (e.type_ === "node")
             e.object3d.renderOrder = s;
           else {
-            const o = 1e3 + s * 2, r = `${o - 1}`;
-            if (!this.onTopBase.has(r)) {
+            const o = 1e3 + s * 2, a = `${o - 1}`;
+            if (!this.onTopBase.has(a)) {
               const i = new l.Points(
                 void 0,
                 new l.PointsMaterial({
@@ -136,7 +136,7 @@ class K {
               );
               i.renderOrder = o - 1, i.onBeforeRender = () => {
                 this.pencil.renderer.clearDepth();
-              }, i.frustumCulled = !1, this.onTopBase.set(r, !0), this.pencil.scene.add(i);
+              }, i.frustumCulled = !1, this.onTopBase.set(a, !0), this.pencil.scene.add(i);
             }
             e.object3d.renderOrder = o;
           }
@@ -149,8 +149,8 @@ class K {
     [...e].forEach((t) => {
       const s = [];
       if (typeof t == "string") {
-        const [o, r] = t.split("#");
-        s.push(...this.getAllObject(o, { key: r }));
+        const [o, a] = t.split("#");
+        s.push(...this.getAllObject(o, { key: a }));
       } else
         s.push(t);
       s.forEach((o) => {
@@ -188,7 +188,7 @@ class K {
     }), this.objects.clear(), this.onTopBase.clear(), this.objectNamesToFactories.clear();
   }
 }
-class N {
+class I {
   constructor() {
     this.data = {};
   }
@@ -212,9 +212,9 @@ class N {
     this.data = {}, this.cb = void 0;
   }
 }
-class G {
+class W {
   constructor(e = {}) {
-    this.messageList = [], this.options = b({
+    this.messageList = [], this.options = v({
       cache: !1,
       cacheVersion: "1"
     }, e);
@@ -227,24 +227,24 @@ class G {
   }
   init(e, t) {
     let { cache: s, cacheVersion: o } = this.options;
-    this.workerList = Array.from({ length: t }, (r, i) => {
-      const a = typeof e == "string" ? new Worker(e) : e();
-      return a.onmessage = ({ data: { res: c, uuid: n } }) => {
-        var f, g;
-        const h = this.messageList.find(({ uuid: u }) => n === u);
-        h == null || h.options.cb(c), this.workerList[i].inUse = !1, this.checkMessage(), s = (f = h == null ? void 0 : h.options.cache) != null ? f : s, o = (g = h == null ? void 0 : h.options.cacheVersion) != null ? g : o, s && k(n, {
+    this.workerList = Array.from({ length: t }, (a, i) => {
+      const r = typeof e == "string" ? new Worker(e) : e();
+      return r.onmessage = ({ data: { res: c, uuid: n } }) => {
+        var p, u;
+        const h = this.messageList.find(({ uuid: m }) => n === m);
+        h == null || h.options.cb(c), this.workerList[i].inUse = !1, this.checkMessage(), s = (p = h == null ? void 0 : h.options.cache) != null ? p : s, o = (u = h == null ? void 0 : h.options.cacheVersion) != null ? u : o, s && T(n, {
           [o]: c
         });
       }, {
-        worker: a,
+        worker: r,
         inUse: !1
       };
     });
   }
   postMessage(e, t) {
-    var i, a;
+    var i, r;
     let { cache: s, cacheVersion: o } = this.options;
-    if (s = (i = t.cache) != null ? i : s, o = (a = t.cacheVersion) != null ? a : o, s && !e.workerKey) {
+    if (s = (i = t.cache) != null ? i : s, o = (r = t.cacheVersion) != null ? r : o, s && !e.workerKey) {
       console.warn("worker cache need workerKey");
       return;
     }
@@ -252,20 +252,20 @@ class G {
       console.warn(`worker cache del: ${e.workerKey}`), M(e.workerKey);
       return;
     }
-    const r = e.workerKey || l.MathUtils.generateUUID();
-    (s ? T(r) : Promise.resolve()).then((c) => {
+    const a = e.workerKey || l.MathUtils.generateUUID();
+    (s ? x(a) : Promise.resolve()).then((c) => {
       const n = o;
       c && c[n] ? t.cb(c[n]) : (this.messageList.push({
         req: e,
         options: t,
-        uuid: r,
+        uuid: a,
         inUse: !1
       }), this.checkMessage());
     }).catch(() => {
       console.warn("err:worker cache"), this.messageList.push({
         req: e,
         options: t,
-        uuid: r,
+        uuid: a,
         inUse: !1
       }), this.checkMessage();
     });
@@ -283,7 +283,7 @@ class G {
     }), this.workerList = [], this.messageList = [];
   }
 }
-class W {
+class z {
   constructor() {
     this.chunks = [];
   }
@@ -316,27 +316,37 @@ class W {
     this.chunks = [];
   }
 }
-class D extends l.Loader {
+class C extends l.Loader {
   constructor(e) {
     super(e);
   }
   load(e, t, s, o) {
     e === void 0 && (e = ""), this.path !== void 0 && (e = this.path + e), e = this.manager.resolveURL(e);
-    const r = document.createElement("video"), i = new l.VideoTexture(r);
+    const a = document.createElement("video"), i = new l.VideoTexture(a);
     i.needsUpdate = !0;
-    const a = () => {
+    const r = () => {
       n(), t && t(i), this.manager.itemEnd(e);
     }, c = (h) => {
       n(), o && o(h), this.manager.itemEnd(e), this.manager.itemError(e);
     }, n = () => {
-      r.removeEventListener("canplaythrough", a, !1), r.removeEventListener("error", c, !1);
+      a.removeEventListener("canplaythrough", r, !1), a.removeEventListener("error", c, !1);
     };
-    return r.addEventListener("canplaythrough", a, !1), r.addEventListener("error", c, !1), e.slice(0, 5) !== "data:" && this.crossOrigin !== void 0 && (r.crossOrigin = this.crossOrigin), this.manager.itemStart(e), r.src = e, r.preload = "auto", r.autoplay = !1, r.loop = !1, r.muted = !0, r.load(), r.setAttribute("webkit-playsinline", "webkit-playsinline"), r.setAttribute("playsinline", ""), i;
+    return a.addEventListener("canplaythrough", r, !1), a.addEventListener("error", c, !1), e.slice(0, 5) !== "data:" && this.crossOrigin !== void 0 && (a.crossOrigin = this.crossOrigin), this.manager.itemStart(e), a.src = e, a.preload = "auto", a.autoplay = !1, a.loop = !1, a.muted = !0, a.load(), a.setAttribute("webkit-playsinline", "webkit-playsinline"), a.setAttribute("playsinline", ""), i;
   }
 }
-class z {
+const g = {
+  images: ["png", "jpg", "jpeg", "gif", "svg", "ico", "webp", "avif"],
+  media: ["mp4", "webm", "ogg", "mp3", "wav", "flac", "aac"],
+  gltf: ["gltf", "glb"]
+};
+class H {
   constructor() {
-    this.assets = /* @__PURE__ */ new Map(), this.gltfAssets = /* @__PURE__ */ new Map(), this.progress = 0, this.event = new U.EventEmitter();
+    this.textureLoader = new l.TextureLoader(), this.videoTextureLoader = new C(), this.gltfLoader = new j(), this.gltfDracoLoader = new j(), this.loadObj = {
+      texture: [],
+      videoTexture: [],
+      gltf: [],
+      dracGltf: []
+    }, this.assets = /* @__PURE__ */ new Map(), this.gltfAssets = /* @__PURE__ */ new Map(), this.event = new O.EventEmitter();
   }
   emit(e, ...t) {
     this.event.emit(e, ...t);
@@ -347,35 +357,49 @@ class z {
   install(e) {
     this.pencil = e, this.colorCorrection();
   }
-  init(e = {}) {
-    this.pm = L(!0), this.loadingManager = new l.LoadingManager(), this.textureLoader = new l.TextureLoader(this.loadingManager), this.videoTextureLoader = new D(this.loadingManager), this.gltfLoader = new v(this.loadingManager), this.gltfDracoLoader = new v(this.loadingManager), this.loadingManager.onProgress = (t, s, o) => {
-      const r = s, i = o;
-      this.progress = r / i, e.progressLog && console.log("onProgress", t, r, i), this.progress === 1 && this.pm.resolve(), this.emit("progress", this.progress);
-    }, this.loadingManager.onError = (t) => console.log("There was an error loading " + t);
+  initLoadingManager() {
+    const e = L(!0);
+    return this.loadingManager = new l.LoadingManager(), this.textureLoader.manager = this.loadingManager, this.videoTextureLoader.manager = this.loadingManager, this.gltfLoader.manager = this.loadingManager, this.gltfDracoLoader.manager = this.loadingManager, this.loadingManager.onProgress = (t, s, o) => {
+      s === o && e.resolve(), this.emit("progress", s, o, t);
+    }, this.loadingManager.onError = (t) => {
+      console.log("There was an error loading " + t), e.reject();
+    }, e;
+  }
+  setDecoderPath(e) {
+    this.dracoLoader = new U(), this.dracoLoader.setDecoderPath(e), this.gltfDracoLoader.setDRACOLoader(this.dracoLoader);
+  }
+  setItem(e, t) {
+    typeof e == "string" && (e = [e]);
+    const { dracoPath: s } = t || {};
+    s && this.setDecoderPath(s), e.forEach((o) => {
+      const a = o.split(".").pop();
+      g.images.includes(a) ? this.loadObj.texture.push(o) : g.media.includes(a) ? this.loadObj.videoTexture.push(o) : g.gltf.includes(a) && (s ? this.loadObj.dracGltf.push(o) : this.loadObj.gltf.push(o));
+    });
+  }
+  load() {
+    const e = this.initLoadingManager();
+    return this.loadTexture(this.loadObj.texture), this.loadVideoTexture(this.loadObj.videoTexture), this.loadGltf(this.loadObj.gltf), this.loadGltf(this.loadObj.dracGltf, !0), e.promise;
   }
   loadTexture(e) {
-    e.forEach((t) => p(this, null, function* () {
+    this.loadObj.texture.push(...e), e.forEach((t) => f(this, null, function* () {
       const s = yield this.textureLoader.loadAsync(t);
       this.assets.set(t, s);
     }));
   }
   colorCorrection() {
-    (+l.REVISION < 152 && this.pencil.options.renderer.outputEncoding === $.sRGB || +l.REVISION >= 152 && this.pencil.options.renderer.outputColorSpace === C.sRGB) && this.assets.forEach((e) => {
-      x({ texture: e });
+    (+l.REVISION < 152 && this.pencil.options.renderer.outputEncoding === D.sRGB || +l.REVISION >= 152 && this.pencil.options.renderer.outputColorSpace === R.sRGB) && this.assets.forEach((e) => {
+      $({ texture: e });
     });
   }
   loadVideoTexture(e) {
-    e.forEach((t) => p(this, null, function* () {
+    this.loadObj.videoTexture.push(...e), e.forEach((t) => f(this, null, function* () {
       this.videoTextureLoader.load(t, (s) => {
         this.assets.set(t, s);
       });
     }));
   }
-  setDecoderPath(e) {
-    this.dracoLoader = new R(), this.dracoLoader.setDecoderPath(e), this.gltfDracoLoader.setDRACOLoader(this.dracoLoader);
-  }
   loadGltf(e, t) {
-    e.forEach((s) => p(this, null, function* () {
+    this.loadObj[t ? "dracGltf" : "gltf"].push(...e), e.forEach((s) => f(this, null, function* () {
       const o = yield this[t ? "gltfDracoLoader" : "gltfLoader"].loadAsync(s);
       this.gltfAssets.set(s, o.scene);
     }));
@@ -387,9 +411,9 @@ class z {
 }
 export {
   _ as Cache,
-  W as CanvasStream,
-  N as Data,
+  z as CanvasStream,
+  I as Data,
   K as Draw,
-  z as Loader,
-  G as Wk
+  H as Loader,
+  W as Wk
 };

package/package.json

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