@p100-web/core-three 100.0.86 → 100.0.87

package/dist/pcomponents/PBackground.js

@@ -1,29 +1,46 @@
-import { BackSide, MathUtils, Mesh, MeshBasicMaterial, SphereGeometry, SRGBColorSpace, Texture, Vector2, VideoTexture, } from "three";
+import { BackSide, MathUtils, Mesh, MeshBasicMaterial, SphereGeometry, } from "three";
 import { FileType, PBackground as PBackgroundBase, } from "@p100-web/core";
-import { FileSubType } from "@p100-web/core";
 export default class PBackground extends PBackgroundBase {
     constructor() {
         super(...arguments);
         this._material = null;
         this._geometry = null;
         this._texture = null;
-        this._cacheKey = 0;
-    }
-    _dispose(unrender) {
-        if (this.file_texture) {
-            if (this.file_texture.type === FileType.Image) {
-                this.context
-                    .imageLoader()
-                    .disposeImage(this, this.file_texture, this._cacheKey);
+        //
+        //  VideoTextureTask
+        //
+        this.onVideoTextureTaskLoaded = (task) => {
+            if (this._material === null) {
+                this.context.error("onVideoTextureLoaded and material was null");
+                return;
             }
-            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);
+            if (task.texture === null) {
+                this.context.error("onVideoTextureLoaded and texture was null");
+                return;
             }
-            this._cacheKey = 0;
-        }
+            const texture = task.texture;
+            this._material.map = texture;
+            this._texture = texture;
+        };
+        //
+        //  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._texture = texture;
+        };
+    }
+    _dispose(unrender) {
+        // AssetLoader will take care of cleaning up the html elements
         this._texture?.dispose();
         this._texture = null;
         // Check if we should dispose Material
@@ -72,49 +89,17 @@ export default class PBackground extends PBackgroundBase {
         mesh.material = material;
         mesh.scale.x = mesh.scale.x * -1;
         if (this.file_texture !== null) {
-            if (this.file_texture.type === FileType.Image)
-                this.context.imageLoader().load(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");
-        }
-    }
-    //
-    //  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();
-        this._texture = texture;
-        texture.userData.id = file._id;
-        texture.colorSpace = SRGBColorSpace;
-        texture.image = data;
-        if (file.subType === FileSubType.Stereo)
-            texture.repeat = new Vector2(1, 0.5);
-        texture.needsUpdate = true;
-        this._material.map = texture;
-        this._material.needsUpdate = true;
-    }
-    //
-    //  IVideoLoader
-    //
-    onVideoLoaded(file, video) {
-        if (this._material === null) {
-            this.context.error("onVideoLoaded and material was null");
-            return;
+            if (this.file_texture.type === FileType.Image) {
+                this.context
+                    .assetLoader()
+                    .addTextureTask(this, this.file_texture);
+            }
+            else if (this.file_texture.type === FileType.Video) {
+                this.context
+                    .assetLoader()
+                    .addVideoTextureTask(this, this.file_texture);
+            }
         }
-        const texture = new VideoTexture(video);
-        texture.colorSpace = SRGBColorSpace;
-        if (file.subType === FileSubType.Stereo)
-            texture.repeat = new Vector2(1, 0.5);
-        this._texture = texture;
-        this._material.map = texture;
-        this._material.needsUpdate = true;
     }
 }
 //# sourceMappingURL=PBackground.js.map

package/dist/pcomponents/PBackground.js.map

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

package/dist/pcomponents/PBasicMaterial.d.ts

@@ -1,15 +1,14 @@
 import { MeshBasicMaterial } from "three";
 import { PBasicMaterial as PBasicMaterialBase } from "@p100-web/core";
-import { IImageLoader, IVideoLoader, PFile } from "@p100-web/core";
-export default class PBasicMaterial extends PBasicMaterialBase implements IImageLoader, IVideoLoader {
+import { TextureTask, VideoTextureTask, ITextureTaskLoader, IVideoTextureTaskLoader } from "../assets/ThreeAssetLoader";
+export default class PBasicMaterial extends PBasicMaterialBase implements ITextureTaskLoader, IVideoTextureTaskLoader {
     protected _material: MeshBasicMaterial | null;
-    _cacheKey: number;
     getTexture<T>(): T | null;
     _dispose(unrender: boolean): void;
     render(): void;
     callback_setOpacity(payloadValue: string | null): void;
-    onVideoLoaded(file: PFile, value: any): void;
-    onImageLoaded(file: PFile, data: any, cacheKey: number): void;
+    onVideoTextureTaskLoaded: (task: VideoTextureTask) => void;
+    onTextureTaskLoaded: (task: TextureTask) => void;
     /**
      * Called by this component and eg PSpriteAnimation.
      */

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

@@ -1 +1 @@
-{"version":3,"file":"PBasicMaterial.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PBasicMaterial.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,iBAAiB,EAMlB,MAAM,OAAO,CAAC;AAIf,OAAO,EACL,cAAc,IAAI,kBAAkB,EACrC,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAGL,YAAY,EACZ,YAAY,EACZ,KAAK,EACN,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,cACnB,SAAQ,kBACR,YAAW,YAAY,EAAE,YAAY;IAErC,SAAS,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IACrD,SAAS,SAAK;IAEd,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAQzB,QAAQ,CAAC,QAAQ,EAAE,OAAO;IAoC1B,MAAM;IA2CN,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAWtD,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG;IAqBrC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAyB7D;;OAEG;IACH,gBAAgB;CAajB"}
+{"version":3,"file":"PBasicMaterial.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PBasicMaterial.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,iBAAiB,EAIlB,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,cAAc,IAAI,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAItE,OAAyB,EACvB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,OAAO,OAAO,cACnB,SAAQ,kBACR,YAAW,kBAAkB,EAAE,uBAAuB;IAEtD,SAAS,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IAErD,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAQzB,QAAQ,CAAC,QAAQ,EAAE,OAAO;IAoB1B,MAAM;IA+CN,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAWtD,wBAAwB,GAAI,MAAM,gBAAgB,KAAG,IAAI,CAavD;IAMF,mBAAmB,GAAI,MAAM,WAAW,KAAG,IAAI,CAa7C;IAMF;;OAEG;IACH,gBAAgB;CAajB"}

package/dist/pcomponents/PBasicMaterial.js

@@ -1,11 +1,42 @@
-import { BackSide, ClampToEdgeWrapping, FrontSide, MeshBasicMaterial, RepeatWrapping, Texture, Vector2, SRGBColorSpace, VideoTexture, } from "three";
-import { PBasicMaterial as PBasicMaterialBase, } from "@p100-web/core";
-import { FileSubType, FileType, } from "@p100-web/core";
+import { BackSide, ClampToEdgeWrapping, FrontSide, MeshBasicMaterial, RepeatWrapping, Vector2, } from "three";
+import { PBasicMaterial as PBasicMaterialBase } from "@p100-web/core";
+import { FileSubType, FileType } from "@p100-web/core";
 export default class PBasicMaterial extends PBasicMaterialBase {
     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._material.map = texture;
+            this.setTextureRepeat();
+        };
+        //
+        //  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.setTextureRepeat();
+        };
     }
     getTexture() {
         return this._material?.map;
@@ -14,26 +45,12 @@ export default class PBasicMaterial extends PBasicMaterialBase {
     //  PComponent
     //
     _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.map) {
+                // AssetLoader will take care of cleaning up the html elements
                 this._material.map.dispose();
-                this._material.map.source.data = null;
                 this._material.map = null;
             }
             this._material.needsUpdate = true;
@@ -69,12 +86,16 @@ export default class PBasicMaterial extends PBasicMaterialBase {
         mesh.renderOrder = this.renderOrder;
         if (this.file_texture !== null) {
             // Check which loader to use
-            if (this.file_texture.type === FileType.Image)
-                this.context.imageLoader().load(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");
+            if (this.file_texture.type === FileType.Image) {
+                this.context
+                    .assetLoader()
+                    .addTextureTask(this, this.file_texture);
+            }
+            else if (this.file_texture.type === FileType.Video) {
+                this.context
+                    .assetLoader()
+                    .addVideoTextureTask(this, this.file_texture);
+            }
         }
         material.needsUpdate = true;
     }
@@ -88,41 +109,6 @@ export default class PBasicMaterial extends PBasicMaterialBase {
         }
     }
     //
-    //  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;
-        if (file.subType === FileSubType.Stereo)
-            texture.repeat = new Vector2(1, 0.5);
-        this._material.map = texture;
-        this.setTextureRepeat();
-        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;
-        if (file.subType === FileSubType.Stereo)
-            texture.repeat = new Vector2(1, 0.5);
-        this._material.map = texture;
-        this.setTextureRepeat();
-        this._material.needsUpdate = true;
-    }
-    //
     //  Tools
     //
     /**

package/dist/pcomponents/PBasicMaterial.js.map

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

package/dist/pcomponents/PEnvironment.d.ts

@@ -1,14 +1,13 @@
 import { Texture } from "three";
 import { PEnvironment as PEnvironmentBase } from "@p100-web/core";
-import { IImageLoader, PFile } from "@p100-web/core";
-export default class PEnvironment extends PEnvironmentBase implements IImageLoader {
+import { TextureTask, HDRTextureTask, type ITextureTaskLoader, type IHDRTextureTaskLoader } from "../assets/ThreeAssetLoader";
+export default class PEnvironment extends PEnvironmentBase implements ITextureTaskLoader, IHDRTextureTaskLoader {
     _texture: Texture | null;
-    _cacheKey: number;
     getTexture<T>(): T | null;
     _dispose(): void;
     unrender(): void;
     render(): void;
-    onEnvironmentLoaded(_file: PFile, texture: Texture): void;
-    onImageLoaded(file: PFile, data: any, cacheKey: number): void;
+    onHDRTextureTaskLoaded: (task: HDRTextureTask) => void;
+    onTextureTaskLoaded: (task: TextureTask) => void;
 }
 //# sourceMappingURL=PEnvironment.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"PEnvironment.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PEnvironment.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EACR,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAY,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAG/D,MAAM,CAAC,OAAO,OAAO,YACnB,SAAQ,gBACR,YAAW,YAAY;IAEvB,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAQ;IAChC,SAAS,SAAK;IAEd,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAQzB,QAAQ;IAsBR,QAAQ;IAIR,MAAM;IAeN,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAgBzD,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CA0B9D"}
+{"version":3,"file":"PEnvironment.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PEnvironment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,OAAO,EAAE,MAAM,OAAO,CAAC;AAElE,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAKlE,OAAyB,EACvB,WAAW,EACX,cAAc,EACd,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC3B,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,OAAO,OAAO,YACnB,SAAQ,gBACR,YAAW,kBAAkB,EAAE,qBAAqB;IAEpD,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAQ;IAEhC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAQzB,QAAQ;IASR,QAAQ;IAIR,MAAM;IAmBN,sBAAsB,GAAI,MAAM,cAAc,KAAG,IAAI,CAInD;IAMF,mBAAmB,GAAI,MAAM,WAAW,KAAG,IAAI,CAe7C;CACH"}

package/dist/pcomponents/PEnvironment.js

@@ -1,11 +1,34 @@
-import { EquirectangularReflectionMapping, SRGBColorSpace, Texture, } from "three";
+import { EquirectangularReflectionMapping } from "three";
 import { PEnvironment as PEnvironmentBase } from "@p100-web/core";
 import { FileType } from "@p100-web/core";
 export default class PEnvironment extends PEnvironmentBase {
     constructor() {
         super(...arguments);
         this._texture = null;
-        this._cacheKey = 0;
+        //
+        //  HDRTextureTask
+        //
+        this.onHDRTextureTaskLoaded = (task) => {
+            this._texture = task.texture;
+            const pcanvas = this.context.getPCanvas();
+            pcanvas.setEnvironment(this);
+        };
+        //
+        //  TextureTask
+        //
+        this.onTextureTaskLoaded = (task) => {
+            if (task.texture === null) {
+                this.context.error("onTextureLoaded and texture was null");
+                return;
+            }
+            const texture = task.texture;
+            this._texture = texture;
+            if (this.equirectangular) {
+                texture.mapping = EquirectangularReflectionMapping;
+            }
+            const pcanvas = this.context.getPCanvas();
+            pcanvas.setEnvironment(this);
+        };
     }
     getTexture() {
         return this._texture;
@@ -18,19 +41,6 @@ export default class PEnvironment extends PEnvironmentBase {
         if (this._texture) {
             pcanvas.clearEnvironment(this);
         }
-        if (this.file_texture) {
-            if (this.file_texture.type & FileType.Environment) {
-                this.context
-                    .environmentLoader()
-                    .disposeEnvironment(this, this.file_texture);
-            }
-            else {
-                this.context
-                    .imageLoader()
-                    .disposeImage(this, this.file_texture, this._cacheKey);
-                this._cacheKey = 0;
-            }
-        }
         this._texture?.dispose();
         this._texture = null;
     }
@@ -41,46 +51,16 @@ export default class PEnvironment extends PEnvironmentBase {
         if (this.file_texture !== null) {
             // Check image type
             if (this.file_texture.type & FileType.Environment) {
-                this.context.environmentLoader().load(this, this.file_texture);
+                this.context
+                    .assetLoader()
+                    .addHDRTextureTask(this, this.file_texture);
             }
             else {
-                this.context.imageLoader().load(this, this.file_texture);
+                this.context
+                    .assetLoader()
+                    .addTextureTask(this, this.file_texture);
             }
         }
     }
-    //
-    //  IEnvironmentLoader
-    //
-    onEnvironmentLoaded(_file, texture) {
-        this._texture = texture;
-        const pcanvas = this.context.getPCanvas();
-        pcanvas.setEnvironment(this);
-        // if (this.background)
-        //   pcanvas.setBackground(this._texture, this.rotation, this.intensity);
-        // if (this.environment)
-        //   pcanvas.setEnvironment(this._texture, this.rotation, this.intensity);
-    }
-    //
-    //  IImageLoader
-    //
-    onImageLoaded(file, data, cacheKey) {
-        this._cacheKey = cacheKey;
-        const texture = new Texture();
-        this._texture = texture;
-        if (this.equirectangular) {
-            texture.mapping = EquirectangularReflectionMapping;
-        }
-        texture.colorSpace = SRGBColorSpace;
-        texture.userData.id = file._id;
-        texture.colorSpace = SRGBColorSpace;
-        texture.image = data;
-        texture.needsUpdate = true;
-        const pcanvas = this.context.getPCanvas();
-        pcanvas.setEnvironment(this);
-        // if (this.background)
-        //   pcanvas.setBackground(this._texture, this.rotation, this.intensity);
-        // if (this.environment)
-        //   pcanvas.setEnvironment(this._texture, this.rotation, this.intensity);
-    }
 }
 //# sourceMappingURL=PEnvironment.js.map

package/dist/pcomponents/PEnvironment.js.map

@@ -1 +1 @@
-{"version":3,"file":"PEnvironment.js","sourceRoot":"","sources":["../../src/pcomponents/PEnvironment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PEnvironment.js","sourceRoot":"","sources":["../../src/pcomponents/PEnvironment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gCAAgC,EAAW,MAAM,OAAO,CAAC;AAElE,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAU1C,MAAM,CAAC,OAAO,OAAO,YACnB,SAAQ,gBAAgB;IAD1B;;QAIE,aAAQ,GAAmB,IAAI,CAAC;QAsChC,EAAE;QACF,kBAAkB;QAClB,EAAE;QAEF,2BAAsB,GAAG,CAAC,IAAoB,EAAQ,EAAE;YACtD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;YAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAe,CAAC;YACvD,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC;QAEF,EAAE;QACF,eAAe;QACf,EAAE;QAEF,wBAAmB,GAAG,CAAC,IAAiB,EAAQ,EAAE;YAChD,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;gBAC1B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;gBAC3D,OAAO;YACT,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAE7B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YACxB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzB,OAAO,CAAC,OAAO,GAAG,gCAAgC,CAAC;YACrD,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAe,CAAC;YACvD,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC;IACJ,CAAC;IAlEC,UAAU;QACR,OAAO,IAAI,CAAC,QAAa,CAAC;IAC5B,CAAC;IAED,EAAE;IACF,cAAc;IACd,EAAE;IAEF,QAAQ;QACN,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAe,CAAC;QACvD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IAED,MAAM;QACJ,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;YAC/B,mBAAmB;YACnB,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;gBAClD,IAAI,CAAC,OAAO;qBACT,WAAW,EAAoB;qBAC/B,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,OAAO;qBACT,WAAW,EAAoB;qBAC/B,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;IACH,CAAC;CAgCF"}

package/dist/pcomponents/PImageCache.d.ts

@@ -0,0 +1,11 @@
+import { PImageCache as PImageCacheBase } from "@p100-web/core";
+import { TextureTask, ITextureTaskLoader } from "../assets/ThreeAssetLoader";
+import { Texture } from "three";
+export default class PImageCache extends PImageCacheBase implements ITextureTaskLoader {
+    protected _cache: (Texture | null)[];
+    unrender(): void;
+    render(): void;
+    onTextureTaskLoaded: (task: TextureTask) => void;
+    editor_setFile(_index: number, _file: string | null): void;
+}
+//# sourceMappingURL=PImageCache.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"PImageCache.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PImageCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEhE,OAAyB,EACvB,WAAW,EACX,kBAAkB,EACnB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,MAAM,CAAC,OAAO,OAAO,WACnB,SAAQ,eACR,YAAW,kBAAkB;IAE7B,SAAS,CAAC,MAAM,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAM;IAE1C,QAAQ;IAQR,MAAM;IAYN,mBAAmB,GAAI,MAAM,WAAW,KAAG,IAAI,CAI7C;IAMF,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CACpD"}

package/dist/pcomponents/PImageCache.js

@@ -0,0 +1,35 @@
+import { PImageCache as PImageCacheBase } from "@p100-web/core";
+export default class PImageCache extends PImageCacheBase {
+    constructor() {
+        super(...arguments);
+        this._cache = [];
+        //
+        //  TextureTask
+        //
+        this.onTextureTaskLoaded = (task) => {
+            if (task.texture === null)
+                return;
+            const index = this.files_textures.indexOf(task.pfile);
+            this._cache[index] = task.texture;
+        };
+    }
+    unrender() {
+        // Dispose textures
+        for (const texture of this._cache) {
+            texture?.dispose();
+        }
+        this._cache.length = 0;
+    }
+    render() {
+        for (const file of this.files_textures) {
+            if (file) {
+                this.context.assetLoader().addTextureTask(this, file);
+            }
+        }
+    }
+    //
+    //  EDITOR
+    //
+    editor_setFile(_index, _file) { }
+}
+//# sourceMappingURL=PImageCache.js.map

package/dist/pcomponents/PImageCache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PImageCache.js","sourceRoot":"","sources":["../../src/pcomponents/PImageCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAQhE,MAAM,CAAC,OAAO,OAAO,WACnB,SAAQ,eAAe;IADzB;;QAIY,WAAM,GAAuB,EAAE,CAAC;QAkB1C,EAAE;QACF,eAAe;QACf,EAAE;QAEF,wBAAmB,GAAG,CAAC,IAAiB,EAAQ,EAAE;YAChD,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI;gBAAE,OAAO;YAClC,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACtD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QACpC,CAAC,CAAC;IAOJ,CAAC;IA/BC,QAAQ;QACN,mBAAmB;QACnB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAClC,OAAO,EAAE,OAAO,EAAE,CAAC;QACrB,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,MAAM;QACJ,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACvC,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,OAAO,CAAC,WAAW,EAAoB,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC;IACH,CAAC;IAYD,EAAE;IACF,UAAU;IACV,EAAE;IAEF,cAAc,CAAC,MAAc,EAAE,KAAoB,IAAG,CAAC;CACxD"}

package/dist/pcomponents/PLight.js

@@ -19,4 +19,27 @@ export default class PLight extends PLightBase {
         this.node.set_el(light);
     }
 }
+/*
+import { HemisphereLight } from "three";
+
+import { PLight as PLightBase } from "@p100-web/core";
+
+export default class PLight extends PLightBase {
+  light: HemisphereLight | null = null;
+
+  unrender() {
+    if (this.light !== null) {
+      this.light.dispose();
+      this.light = null;
+    }
+  }
+
+  render() {
+    const light = new HemisphereLight(this.color, this.color, this.intensity);
+    this.light = light;
+    light.intensity = this.intensity;
+    this.node.set_el(light);
+  }
+}
+*/ 
 //# sourceMappingURL=PLight.js.map

package/dist/pcomponents/PLight.js.map

@@ -1 +1 @@
-{"version":3,"file":"PLight.js","sourceRoot":"","sources":["../../src/pcomponents/PLight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAErC,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,UAAU;IAA9C;;QACE,UAAK,GAAwB,IAAI,CAAC;IAgBpC,CAAC;IAdC,QAAQ;QACN,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC;IACH,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACjC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACF"}
+{"version":3,"file":"PLight.js","sourceRoot":"","sources":["../../src/pcomponents/PLight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAErC,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,UAAU;IAA9C;;QACE,UAAK,GAAwB,IAAI,CAAC;IAgBpC,CAAC;IAdC,QAAQ;QACN,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC;IACH,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACjC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACF;AAED;;;;;;;;;;;;;;;;;;;;;;EAsBE"}

package/dist/pcomponents/PMaskedMaterial.d.ts

@@ -1,9 +1,9 @@
 import { Texture, ShaderMaterial } from "three";
 import { PMaskedMaterial as PMaskedMaterialBase } from "@p100-web/core";
-import { type IImageLoader, type IVideoLoader, PFile } from "@p100-web/core";
-export default class PMaskedMaterial extends PMaskedMaterialBase implements IImageLoader, IVideoLoader {
+import { PFile } from "@p100-web/core";
+import { TextureTask, VideoTextureTask, ITextureTaskLoader, IVideoTextureTaskLoader } from "../assets/ThreeAssetLoader";
+export default class PMaskedMaterial extends PMaskedMaterialBase implements ITextureTaskLoader, IVideoTextureTaskLoader {
     private _material;
-    private _cacheKey;
     getTexture<T>(): T | null;
     getMaterial(): ShaderMaterial | null;
     dispose(): void;
@@ -11,7 +11,7 @@ export default class PMaskedMaterial extends PMaskedMaterialBase implements IIma
     unrender(): void;
     render(): void;
     protected setTextureRepeat(file: PFile, texture: Texture): void;
-    onVideoLoaded(file: PFile, value: any): void;
-    onImageLoaded(file: PFile, data: any, cacheKey: number): void;
+    onVideoTextureTaskLoaded: (task: VideoTextureTask) => void;
+    onTextureTaskLoaded: (task: TextureTask) => void;
 }
 //# sourceMappingURL=PMaskedMaterial.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"PMaskedMaterial.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PMaskedMaterial.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,OAAO,EAGP,cAAc,EAGf,MAAM,OAAO,CAAC;AAKf,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAExE,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,YAAY,EAEjB,KAAK,EAEN,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAO,eACnB,SAAQ,mBACR,YAAW,YAAY,EAAE,YAAY;IAErC,OAAO,CAAC,SAAS,CAA+B;IAChD,OAAO,CAAC,SAAS,CAAK;IAEtB,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAIzB,WAAW;IAQX,OAAO;IAKP,QAAQ,CAAC,QAAQ,EAAE,OAAO;IAsC1B,QAAQ;IAMR,MAAM;IAgDN,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO;IAexD,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG;IAoBrC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CAmB9D"}
+{"version":3,"file":"PMaskedMaterial.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PMaskedMaterial.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,OAAO,EACP,cAAc,EAGf,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAExE,OAAO,EAEL,KAAK,EAEN,MAAM,gBAAgB,CAAC;AAExB,OAAyB,EACvB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,OAAO,OAAO,eACnB,SAAQ,mBACR,YAAW,kBAAkB,EAAE,uBAAuB;IAEtD,OAAO,CAAC,SAAS,CAA+B;IAEhD,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAIzB,WAAW;IAQX,OAAO;IAKP,QAAQ,CAAC,QAAQ,EAAE,OAAO;IAmB1B,QAAQ;IAMR,MAAM;IAgDN,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO;IAexD,wBAAwB,GAAI,MAAM,gBAAgB,KAAG,IAAI,CAavD;IAMF,mBAAmB,GAAI,MAAM,WAAW,KAAG,IAAI,CAa7C;CACH"}