@p100-web/core-three 100.0.86 → 100.0.88

package/dist/pcomponents/PMaskedMaterial.js

@@ -1,11 +1,44 @@
-import { BackSide, FrontSide, Texture, SRGBColorSpace, VideoTexture, ShaderMaterial, Color, } from "three";
+import { BackSide, FrontSide, ShaderMaterial, Color, } from "three";
 import { PMaskedMaterial as PMaskedMaterialBase } from "@p100-web/core";
 import { FileType, FileSubType, } from "@p100-web/core";
 export default class PMaskedMaterial extends PMaskedMaterialBase {
     constructor() {
         super(...arguments);
         this._material = null;
-        this._cacheKey = 0;
+        //
+        //  VideoTextureTask
+        //
+        this.onVideoTextureTaskLoaded = (task) => {
+            if (this._material === null) {
+                this.context.error("onVideoTextureLoaded and material was null");
+                return;
+            }
+            if (task.texture === null) {
+                this.context.error("onVideoTextureLoaded and texture was null");
+                return;
+            }
+            const texture = task.texture;
+            this.setTextureRepeat(task.pfile, texture);
+            this._material.uniforms.map.value = texture;
+            this._material.needsUpdate = true;
+        };
+        //
+        //  TextureTask
+        //
+        this.onTextureTaskLoaded = (task) => {
+            if (this._material === null) {
+                this.context.error("onTextureLoaded and material was null");
+                return;
+            }
+            if (task.texture === null) {
+                this.context.error("onTextureLoaded and texture was null");
+                return;
+            }
+            const texture = task.texture;
+            this.setTextureRepeat(task.pfile, texture);
+            this._material.uniforms.map.value = texture;
+            this._material.needsUpdate = true;
+        };
     }
     getTexture() {
         return this._material?.uniforms.map.value || null;
@@ -22,28 +55,11 @@ export default class PMaskedMaterial extends PMaskedMaterialBase {
             this.context.releaseFile(this.file_texture);
     }
     _dispose(unrender) {
-        if (this.file_texture) {
-            if (this.file_texture.type === FileType.Image) {
-                this.context
-                    .imageLoader()
-                    .disposeImage(this, this.file_texture, this._cacheKey);
-            }
-            else if (this.file_texture.type === FileType.Video) {
-                // Notify any video player
-                const videoPlayer = this.node.findComponent("PVideoPlayer");
-                videoPlayer?.onDisposeMaterial();
-                this.context
-                    .videoLoader()
-                    .disposeVideo(this, this.file_texture);
-            }
-            this._cacheKey = 0;
-        }
         // Check if we should dispose Material
         if (this._material) {
             // Do we have a texture as well?
             if (this._material.uniforms.map.value) {
                 this._material.uniforms.map.value.dispose();
-                this._material.uniforms.map.value.source.data = null;
                 this._material.uniforms.map.value = null;
             }
             this._material.needsUpdate = true;
@@ -87,16 +103,16 @@ export default class PMaskedMaterial extends PMaskedMaterialBase {
         mesh.renderOrder = this.renderOrder;
         if (this.file_texture !== null) {
             // Check which loader to use
-            if (this.file_texture.type === FileType.Image)
+            if (this.file_texture.type === FileType.Image) {
                 this.context
-                    .imageLoader()
-                    .load(this, this.file_texture);
-            else if (this.file_texture.type === FileType.Video)
+                    .assetLoader()
+                    .addTextureTask(this, this.file_texture);
+            }
+            else if (this.file_texture.type === FileType.Video) {
                 this.context
-                    .videoLoader()
-                    .load(this, this.file_texture);
-            else
-                this.context.error("Unsuppotred material texture");
+                    .assetLoader()
+                    .addVideoTextureTask(this, this.file_texture);
+            }
         }
         material.needsUpdate = true;
     }
@@ -111,37 +127,6 @@ export default class PMaskedMaterial extends PMaskedMaterialBase {
             texture.needsUpdate = true;
         }
     }
-    //
-    //  IVideoLoader
-    //
-    onVideoLoaded(file, value) {
-        if (this._material === null) {
-            this.context.error("onVideoLoaded and material was null");
-            return;
-        }
-        const texture = new VideoTexture(value);
-        texture.colorSpace = SRGBColorSpace;
-        this.setTextureRepeat(file, texture);
-        this._material.uniforms.map.value = texture;
-        this._material.needsUpdate = true;
-    }
-    //
-    //  IImageLoader
-    //
-    onImageLoaded(file, data, cacheKey) {
-        this._cacheKey = cacheKey;
-        if (this._material === null) {
-            this.context.error("onImageLoaded and material was null");
-            return;
-        }
-        const texture = new Texture();
-        texture.userData.id = file._id;
-        texture.colorSpace = SRGBColorSpace;
-        texture.image = data;
-        this.setTextureRepeat(file, texture);
-        this._material.uniforms.map.value = texture;
-        this._material.needsUpdate = true;
-    }
 }
 function createChromaKeyMaterial(args) {
     return new ShaderMaterial({

package/dist/pcomponents/PMaskedMaterial.js.map

@@ -1 +1 @@
-{"version":3,"file":"PMaskedMaterial.js","sourceRoot":"","sources":["../../src/pcomponents/PMaskedMaterial.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PMaskedMaterial.js","sourceRoot":"","sources":["../../src/pcomponents/PMaskedMaterial.ts"],"names":[],"mappings":"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"}

package/dist/pcomponents/PModelAnnotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PModelAnnotation.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PModelAnnotation.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,IAAI,oBAAoB,EACxC,QAAQ,EACT,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,oBAAoB;IAChE,MAAM,IAAI,IAAI;IAEd,QAAQ;IAER,aAAa,IAAI;QAAE,QAAQ,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,QAAQ,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;CAc/E"}
+{"version":3,"file":"PModelAnnotation.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PModelAnnotation.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,IAAI,oBAAoB,EACxC,QAAQ,EACT,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,oBAAoB;IAChE,MAAM,IAAI,IAAI;IAEd,QAAQ;IAER,aAAa,IAAI;QACf,QAAQ,EAAE,QAAQ,CAAC;QACnB,MAAM,EAAE,QAAQ,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;KACd,GAAG,IAAI;CAeT"}

package/dist/pcomponents/PModelAnnotation.js

@@ -5,6 +5,8 @@ export default class PModelAnnotation extends PModelAnnotationBase {
     getAnnotation() {
         const annotation = this.node.getEl();
         if (annotation) {
+            if (annotation.children.length !== 2)
+                return null;
             const positionNode = annotation.children[this.positionIndex];
             const targetNode = annotation.children[this.targetIndex];
             return {

package/dist/pcomponents/PModelAnnotation.js.map

@@ -1 +1 @@
-{"version":3,"file":"PModelAnnotation.js","sourceRoot":"","sources":["../../src/pcomponents/PModelAnnotation.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,IAAI,oBAAoB,GAEzC,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,oBAAoB;IAChE,MAAM,KAAU,CAAC;IAEjB,QAAQ,KAAI,CAAC;IAEb,aAAa;QACX,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAY,CAAC;QAC/C,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC7D,MAAM,UAAU,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzD,OAAO;gBACL,QAAQ,EAAE,YAAY,CAAC,gBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC;gBAC9D,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC;gBACxD,IAAI,EAAE,UAAU,CAAC,IAAI;aACtB,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"PModelAnnotation.js","sourceRoot":"","sources":["../../src/pcomponents/PModelAnnotation.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,IAAI,oBAAoB,GAEzC,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,oBAAoB;IAChE,MAAM,KAAU,CAAC;IAEjB,QAAQ,KAAI,CAAC;IAEb,aAAa;QAKX,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAY,CAAC;QAC/C,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAClD,MAAM,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC7D,MAAM,UAAU,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzD,OAAO;gBACL,QAAQ,EAAE,YAAY,CAAC,gBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC;gBAC9D,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC;gBACxD,IAAI,EAAE,UAAU,CAAC,IAAI;aACtB,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

package/dist/pcomponents/PModelGLTF.d.ts

@@ -1,7 +1,6 @@
-import { AnimationAction, AnimationMixer, Group, Object3D } from "three";
+import { AnimationAction, AnimationMixer, Object3D, Group } from "three";
 import { type IAnimationAction, PModelGLTF as PModelGLTFBase } from "@p100-web/core";
-import { type IModelLoader, PFile } from "@p100-web/core";
-import { IModel } from "../media/ModelLoader";
+import { ModelTask, type IModelTaskLoader } from "../assets/ThreeAssetLoader";
 /**
  * Interface for other components that listens to when this model has loaded
  */
@@ -9,7 +8,7 @@ interface IModelListener {
     onModelUpdate(component: PModelGLTF | null, model: Object3D | null): void;
 }
 export { type IModelListener };
-export default class PModelGLTF extends PModelGLTFBase implements IModelLoader {
+export default class PModelGLTF extends PModelGLTFBase implements IModelTaskLoader {
     el: Group | null;
     mixer: AnimationMixer | null;
     actions: AnimationAction[] | null;
@@ -20,9 +19,6 @@ export default class PModelGLTF extends PModelGLTFBase implements IModelLoader {
     addListener(listener: IModelListener): void;
     removeListener(listener: IModelListener): void;
     getAnimationAction(clip: string): IAnimationAction | null;
-    /**
-     * Called when the object has finished loading
-     */
-    onModelLoaded: (_file: PFile, model: IModel) => void;
+    onModelTaskLoaded: (task: ModelTask) => void;
 }
 //# sourceMappingURL=PModelGLTF.d.ts.map

package/dist/pcomponents/PModelGLTF.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PModelGLTF.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PModelGLTF.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,KAAK,EAAQ,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC/E,OAAO,EACL,KAAK,gBAAgB,EACrB,UAAU,IAAI,cAAc,EAC7B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG9C;;GAEG;AACH,UAAU,cAAc;IACtB,aAAa,CAAC,SAAS,EAAE,UAAU,GAAG,IAAI,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC;CAC3E;AAED,OAAO,EAAE,KAAK,cAAc,EAAE,CAAC;AAE/B,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,cAAe,YAAW,YAAY;IAC5E,EAAE,EAAE,KAAK,GAAG,IAAI,CAAQ;IAExB,KAAK,EAAE,cAAc,GAAG,IAAI,CAAQ;IACpC,OAAO,EAAE,eAAe,EAAE,GAAG,IAAI,CAAQ;IAEzC,SAAS,CAAC,eAAe,EAAE,OAAO,CAAS;IAE3C,SAAS,CAAC,SAAS,EAAE,cAAc,EAAE,CAAM;IAE3C,QAAQ;IAuBR,MAAM;IAaN,WAAW,CAAC,QAAQ,EAAE,cAAc;IAOpC,cAAc,CAAC,QAAQ,EAAE,cAAc;IAWvC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAYzD;;OAEG;IACH,aAAa,GAAI,OAAO,KAAK,EAAE,OAAO,MAAM,UAkD1C;CACH"}
+{"version":3,"file":"PModelGLTF.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PModelGLTF.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAQ,QAAQ,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC/E,OAAO,EACL,KAAK,gBAAgB,EACrB,UAAU,IAAI,cAAc,EAC7B,MAAM,gBAAgB,CAAC;AAGxB,OAAyB,EACvB,SAAS,EACT,KAAK,gBAAgB,EACtB,MAAM,4BAA4B,CAAC;AAEpC;;GAEG;AACH,UAAU,cAAc;IACtB,aAAa,CAAC,SAAS,EAAE,UAAU,GAAG,IAAI,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC;CAC3E;AAED,OAAO,EAAE,KAAK,cAAc,EAAE,CAAC;AAE/B,MAAM,CAAC,OAAO,OAAO,UACnB,SAAQ,cACR,YAAW,gBAAgB;IAE3B,EAAE,EAAE,KAAK,GAAG,IAAI,CAAQ;IAExB,KAAK,EAAE,cAAc,GAAG,IAAI,CAAQ;IACpC,OAAO,EAAE,eAAe,EAAE,GAAG,IAAI,CAAQ;IAEzC,SAAS,CAAC,eAAe,EAAE,OAAO,CAAS;IAE3C,SAAS,CAAC,SAAS,EAAE,cAAc,EAAE,CAAM;IAE3C,QAAQ;IAuBR,MAAM;IAaN,WAAW,CAAC,QAAQ,EAAE,cAAc;IAOpC,cAAc,CAAC,QAAQ,EAAE,cAAc;IAWvC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAUzD,iBAAiB,GAAI,MAAM,SAAS,KAAG,IAAI,CAmD1C;CACF"}

package/dist/pcomponents/PModelGLTF.js

@@ -8,25 +8,22 @@ export default class PModelGLTF extends PModelGLTFBase {
         this.actions = null;
         this._haveReflectors = false;
         this.listeners = [];
-        //
-        //  IModelLoader
-        //
-        /**
-         * Called when the object has finished loading
-         */
-        this.onModelLoaded = (_file, model) => {
-            if (!this.node.hasEl())
-                throw new Error("Missing el");
-            if (model.actions && model.actions.length) {
-                this.mixer = model.mixer;
+        // ModelTask
+        this.onModelTaskLoaded = (task) => {
+            if (!task.model) {
+                this.context.error("onModelTaskLoaded: no model");
+                return;
             }
-            this.actions = model.actions || [];
-            this.el = model.modelScene;
-            this.node.getEl().add(model.modelScene);
+            if (task.actions && task.actions.length) {
+                this.mixer = task.mixer;
+            }
+            this.actions = task.actions || [];
+            this.el = task.model;
+            this.node.getEl().add(this.el);
             // Process model
             if (this.forceDepthWrite || this.reflector) {
                 let reflectors = [];
-                model.modelScene.traverse((node) => {
+                this.el.traverse((node) => {
                     if (node.material) {
                         const material = node.material;
                         if (this.reflector) {
@@ -71,16 +68,16 @@ export default class PModelGLTF extends PModelGLTFBase {
         }
         this.listeners.length = 0;
         if (this.el !== null) {
-            this.context.modelLoader().disposeModel(this, this.el);
+            this.context.assetLoader().disposeModel(this.el);
             this.el = null;
         }
     }
     render() {
         if (this.file_model !== null) {
             this.node.set_el(new Group());
-            if (!this.context.modelLoader().load(this, this.file_model)) {
-                this.context.error("File type not supported");
-            }
+            this.context
+                .assetLoader()
+                .addModelTask(this, this.file_model);
         }
     }
     //

package/dist/pcomponents/PModelGLTF.js.map

@@ -1 +1 @@
-{"version":3,"file":"PModelGLTF.js","sourceRoot":"","sources":["../../src/pcomponents/PModelGLTF.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PModelGLTF.js","sourceRoot":"","sources":["../../src/pcomponents/PModelGLTF.ts"],"names":[],"mappings":"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"}

package/dist/pcomponents/PModelNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PModelNode.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PModelNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,UAAU,EAAE,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,UAAU,IAAI,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAE9D,MAAM,CAAC,OAAO,OAAO,UACnB,SAAQ,cACR,YAAW,cAAc;IAEzB,SAAS,EAAE,QAAQ,GAAG,IAAI,CAAQ;IAElC,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IASpE,iBAAiB,IAAI,UAAU,GAAG,IAAI;IAUtC,MAAM,IAAI,IAAI;IAMd,QAAQ;IASR,aAAa,IAAI,MAAM,EAAE;IAiBzB,aAAa,CAAC,SAAS,EAAE,UAAU,GAAG,IAAI,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI;CAqB1E"}
+{"version":3,"file":"PModelNode.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PModelNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,UAAU,EAAE,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,UAAU,IAAI,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAE9D,MAAM,CAAC,OAAO,OAAO,UACnB,SAAQ,cACR,YAAW,cAAc;IAEzB,SAAS,EAAE,QAAQ,GAAG,IAAI,CAAQ;IAElC,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IASpE,iBAAiB,IAAI,UAAU,GAAG,IAAI;IAItC,MAAM,IAAI,IAAI;IAMd,QAAQ;IASR,aAAa,IAAI,MAAM,EAAE;IAiBzB,aAAa,CAAC,SAAS,EAAE,UAAU,GAAG,IAAI,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI;CAqB1E"}

package/dist/pcomponents/PModelNode.js

@@ -15,14 +15,7 @@ export default class PModelNode extends PModelNodeBase {
         return null;
     }
     getModelComponent() {
-        let parent = this.node.parent;
-        while (parent) {
-            const model = parent.findComponent("PModelGLTF");
-            if (model)
-                return model;
-            parent = parent.parent;
-        }
-        return null;
+        return this.findComponent("PModelGLTF");
     }
     render() {
         // Find model

package/dist/pcomponents/PModelNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"PModelNode.js","sourceRoot":"","sources":["../../src/pcomponents/PModelNode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PModelNode.js","sourceRoot":"","sources":["../../src/pcomponents/PModelNode.ts"],"names":[],"mappings":"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"}

package/dist/pcomponents/PPhysicalMaterial.d.ts

@@ -1,14 +1,13 @@
 import { MeshStandardMaterial } from "three";
 import { PPhysicalMaterial as PPhysicalMaterialBase } from "@p100-web/core";
-import { IImageLoader, PFile } from "@p100-web/core";
-export default class PPhysicalMaterial extends PPhysicalMaterialBase implements IImageLoader {
+import { TextureTask, ITextureTaskLoader } from "../assets/ThreeAssetLoader";
+export default class PPhysicalMaterial extends PPhysicalMaterialBase implements ITextureTaskLoader {
     protected _material: MeshStandardMaterial | null;
-    _cacheKey: number;
     setTextureRepeat(): void;
     getTexture<T>(): T | null;
     _dispose(unrender: boolean): void;
     render(): void;
     callback_setOpacity: (payloadValue: string | null) => void;
-    onImageLoaded(file: PFile, data: any, cacheKey: number): void;
+    onTextureTaskLoaded: (task: TextureTask) => void;
 }
 //# sourceMappingURL=PPhysicalMaterial.d.ts.map

package/dist/pcomponents/PPhysicalMaterial.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PPhysicalMaterial.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PPhysicalMaterial.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,oBAAoB,EAKrB,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,iBAAiB,IAAI,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAe,YAAY,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,iBACnB,SAAQ,qBACR,YAAW,YAAY;IAEvB,SAAS,CAAC,SAAS,EAAE,oBAAoB,GAAG,IAAI,CAAQ;IACxD,SAAS,SAAK;IAEd,gBAAgB;IAYhB,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAQzB,QAAQ,CAAC,QAAQ,EAAE,OAAO;IA0B1B,MAAM;IAwCN,mBAAmB,GAAI,cAAc,MAAM,GAAG,IAAI,UAKhD;IAMF,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CAmB9D"}
+{"version":3,"file":"PPhysicalMaterial.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PPhysicalMaterial.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,oBAAoB,EAGrB,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,iBAAiB,IAAI,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAE5E,OAAyB,EACvB,WAAW,EACX,kBAAkB,EACnB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,OAAO,OAAO,iBACnB,SAAQ,qBACR,YAAW,kBAAkB;IAE7B,SAAS,CAAC,SAAS,EAAE,oBAAoB,GAAG,IAAI,CAAQ;IAExD,gBAAgB;IAYhB,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAQzB,QAAQ,CAAC,QAAQ,EAAE,OAAO;IAmB1B,MAAM;IAwCN,mBAAmB,GAAI,cAAc,MAAM,GAAG,IAAI,UAKhD;IAMF,mBAAmB,GAAI,MAAM,WAAW,KAAG,IAAI,CAc7C;CACH"}

package/dist/pcomponents/PPhysicalMaterial.js

@@ -1,11 +1,9 @@
-import { BackSide, ClampToEdgeWrapping, DoubleSide, FrontSide, MeshStandardMaterial, RepeatWrapping, Texture, Vector2, SRGBColorSpace, } from "three";
+import { BackSide, ClampToEdgeWrapping, DoubleSide, FrontSide, MeshStandardMaterial, RepeatWrapping, Vector2, } from "three";
 import { PPhysicalMaterial as PPhysicalMaterialBase } from "@p100-web/core";
-import { FileSubType } from "@p100-web/core";
 export default class PPhysicalMaterial extends PPhysicalMaterialBase {
     constructor() {
         super(...arguments);
         this._material = null;
-        this._cacheKey = 0;
         //
         //  Event Callbacks
         //
@@ -15,6 +13,23 @@ export default class PPhysicalMaterial extends PPhysicalMaterialBase {
                 this._material.opacity = opacity;
             }
         };
+        //
+        //  TextureTask
+        //
+        this.onTextureTaskLoaded = (task) => {
+            if (this._material === null) {
+                this.context.error("onTextureLoaded and material was null");
+                return;
+            }
+            if (task.texture === null) {
+                this.context.error("onTextureLoaded and texture was null");
+                return;
+            }
+            const texture = task.texture;
+            this._material.map = texture;
+            this._material.needsUpdate = true;
+            this.setTextureRepeat();
+        };
     }
     setTextureRepeat() {
         const texture = this._material?.map || null;
@@ -35,12 +50,6 @@ export default class PPhysicalMaterial extends PPhysicalMaterialBase {
     //  PComponent
     //
     _dispose(unrender) {
-        if (this.file_texture) {
-            this.context
-                .imageLoader()
-                .disposeImage(this, this.file_texture, this._cacheKey);
-            this._cacheKey = 0;
-        }
         // Check if we should dispose Material
         if (this._material) {
             // Do we have a texture as well?
@@ -82,28 +91,10 @@ export default class PPhysicalMaterial extends PPhysicalMaterialBase {
         }
         mesh.renderOrder = this.renderOrder;
         if (this.file_texture !== null) {
-            this.context.imageLoader().load(this, this.file_texture);
-        }
-        material.needsUpdate = true;
-    }
-    //
-    //  IImageLoader
-    //
-    onImageLoaded(file, data, cacheKey) {
-        this._cacheKey = cacheKey;
-        if (this._material === null) {
-            this.context.error("onImageLoaded and material was null");
-            return;
+            this.context
+                .assetLoader()
+                .addTextureTask(this, this.file_texture);
         }
-        const texture = new Texture();
-        texture.userData.id = file._id;
-        texture.colorSpace = SRGBColorSpace;
-        texture.image = data;
-        if (file.subType === FileSubType.Stereo)
-            texture.repeat = new Vector2(1, 0.5);
-        this._material.map = texture;
-        this.setTextureRepeat();
-        this._material.needsUpdate = true;
     }
 }
 //# sourceMappingURL=PPhysicalMaterial.js.map

package/dist/pcomponents/PPhysicalMaterial.js.map

@@ -1 +1 @@
-{"version":3,"file":"PPhysicalMaterial.js","sourceRoot":"","sources":["../../src/pcomponents/PPhysicalMaterial.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PPhysicalMaterial.js","sourceRoot":"","sources":["../../src/pcomponents/PPhysicalMaterial.ts"],"names":[],"mappings":"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"}

package/dist/pcomponents/PSound.d.ts

@@ -1,15 +1,15 @@
 import { Audio as StaticAudio, PositionalAudio } from "three";
 import { PSound as PSoundBase } from "@p100-web/core";
-import { IAudioLoader, PFile } from "@p100-web/core";
-export default class PSound extends PSoundBase implements IAudioLoader {
+import { AudioTask, IAudioTaskLoader } from "../assets/ThreeAssetLoader";
+export default class PSound extends PSoundBase implements IAudioTaskLoader {
     _staticSound: StaticAudio | null;
     _positionalSound: PositionalAudio | null;
     _waitingForPlay: boolean;
     render(): void;
     unrender(): void;
-    onAudioLoaded: (_file: PFile, buffer: AudioBuffer) => void;
+    onAudioTaskLoaded: (task: AudioTask) => void;
     disposeAudio(): void;
-    loadAudio: () => void;
+    loadAudio(): void;
     onEnded: () => void;
     callback_onPlay: () => void;
     callback_onStop: () => void;

package/dist/pcomponents/PSound.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PSound.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PSound.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,eAAe,EAAiB,MAAM,OAAO,CAAC;AAC7E,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAErD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,UAAW,YAAW,YAAY;IACpE,YAAY,EAAE,WAAW,GAAG,IAAI,CAAQ;IACxC,gBAAgB,EAAE,eAAe,GAAG,IAAI,CAAQ;IAChD,eAAe,UAAS;IAExB,MAAM;IAMN,QAAQ;IAUR,aAAa,GAAI,OAAO,KAAK,EAAE,QAAQ,WAAW,UAiBhD;IAEF,YAAY;IAmBZ,SAAS,aAYP;IAMF,OAAO,aAEL;IAEF,eAAe,aAgBb;IAEF,eAAe,aAMb;CACH"}
+{"version":3,"file":"PSound.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PSound.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,eAAe,EAAiB,MAAM,OAAO,CAAC;AAC7E,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAyB,EACvB,SAAS,EACT,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,UAAW,YAAW,gBAAgB;IACxE,YAAY,EAAE,WAAW,GAAG,IAAI,CAAQ;IACxC,gBAAgB,EAAE,eAAe,GAAG,IAAI,CAAQ;IAChD,eAAe,UAAS;IAExB,MAAM;IAMN,QAAQ;IAUR,iBAAiB,GAAI,MAAM,SAAS,KAAG,IAAI,CAsB1C;IAED,YAAY;IAmBZ,SAAS;IAoBT,OAAO,aAEL;IAEF,eAAe,aAgBb;IAEF,eAAe,aAMb;CACH"}

package/dist/pcomponents/PSound.js

@@ -9,7 +9,12 @@ export default class PSound extends PSoundBase {
         //
         //  LOADING
         //
-        this.onAudioLoaded = (_file, buffer) => {
+        this.onAudioTaskLoaded = (task) => {
+            const buffer = task.buffer;
+            if (!buffer) {
+                this.context.error("onAudioTaskLoaded: no buffer");
+                return;
+            }
             if (this._positionalSound) {
                 const sound = this._positionalSound;
                 sound.setBuffer(buffer);
@@ -28,20 +33,6 @@ export default class PSound extends PSoundBase {
                 this._staticSound = sound;
             }
         };
-        this.loadAudio = () => {
-            if (this.file_sound !== null) {
-                const audioListener = this.context.getAudioListener();
-                if (this.positional) {
-                    this._positionalSound = new PositionalAudio(audioListener);
-                    this.node.set_el(this._positionalSound);
-                }
-                else {
-                    this._staticSound = new StaticAudio(audioListener);
-                    this.node.set_el(this._staticSound);
-                }
-                this.context.audioLoader().load(this, this.file_sound);
-            }
-        };
         //
         //  EVENTS
         //
@@ -88,14 +79,13 @@ export default class PSound extends PSoundBase {
         }
     }
     disposeAudio() {
-        if (this.file_sound !== null) {
-            this.context.audioLoader().disposeAudio(this, this.file_sound);
-        }
         // Positional sound
         if (this._positionalSound !== null) {
             if (this._positionalSound.isPlaying)
                 this._positionalSound.stop();
             this._positionalSound.onEnded = undefined;
+            this._positionalSound.disconnect();
+            this._positionalSound.setBuffer(null);
             this._positionalSound = null;
         }
         // Static sound
@@ -103,8 +93,26 @@ export default class PSound extends PSoundBase {
             if (this._staticSound?.isPlaying)
                 this._staticSound.stop();
             this._staticSound.onEnded = undefined;
+            this._staticSound.disconnect();
+            this._staticSound.setBuffer(null);
             this._staticSound = null;
         }
     }
+    loadAudio() {
+        if (this.file_sound !== null) {
+            const audioListener = this.context.getAudioListener();
+            if (this.positional) {
+                this._positionalSound = new PositionalAudio(audioListener);
+                this.node.set_el(this._positionalSound);
+            }
+            else {
+                this._staticSound = new StaticAudio(audioListener);
+                this.node.set_el(this._staticSound);
+            }
+            this.context
+                .assetLoader()
+                .addAudioTask(this, this.file_sound);
+        }
+    }
 }
 //# sourceMappingURL=PSound.js.map

package/dist/pcomponents/PSound.js.map

@@ -1 +1 @@
-{"version":3,"file":"PSound.js","sourceRoot":"","sources":["../../src/pcomponents/PSound.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PSound.js","sourceRoot":"","sources":["../../src/pcomponents/PSound.ts"],"names":[],"mappings":"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"}

package/dist/pcomponents/PSprite.d.ts

@@ -1,14 +1,13 @@
 import { SpriteMaterial } from "three";
 import { PSprite as PSpriteBase } from "@p100-web/core";
-import { IImageLoader, PFile } from "@p100-web/core";
-export default class PSprite extends PSpriteBase implements IImageLoader {
+import { TextureTask, ITextureTaskLoader } from "../assets/ThreeAssetLoader";
+export default class PSprite extends PSpriteBase implements ITextureTaskLoader {
     protected _material_back: SpriteMaterial | null;
     protected _material_front: SpriteMaterial | null;
-    _cacheKey: number;
     private _unrenderMaterial;
     _unrender(unrender: boolean): void;
     unrender(): void;
     render(): void;
-    onImageLoaded(file: PFile, data: any, cacheKey: number): void;
+    onTextureTaskLoaded: (task: TextureTask) => void;
 }
 //# sourceMappingURL=PSprite.d.ts.map