@p100-web/core-three 100.0.86 → 100.0.88

package/dist/assets/ThreeAssetLoader.js

@@ -0,0 +1,487 @@
+import { FileSubType, AssetLoader } from "@p100-web/core";
+import { SRGBColorSpace, Texture, TextureLoader, Vector2, VideoTexture, AnimationMixer, AudioLoader, PMREMGenerator, } from "three";
+import { GLTFLoader, } from "three/examples/jsm/loaders/GLTFLoader.js";
+import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader.js";
+var TaskType;
+(function (TaskType) {
+    TaskType[TaskType["Texture"] = 0] = "Texture";
+    TaskType[TaskType["Video"] = 1] = "Video";
+    TaskType[TaskType["Model"] = 2] = "Model";
+    TaskType[TaskType["Audio"] = 3] = "Audio";
+    TaskType[TaskType["HDR"] = 4] = "HDR";
+})(TaskType || (TaskType = {}));
+class AbstractTask {
+}
+class TextureTask extends AbstractTask {
+    constructor(pfile) {
+        super();
+        this.texture = null;
+        this.pfile = pfile;
+    }
+}
+class VideoTextureTask extends AbstractTask {
+    constructor(pfile) {
+        super();
+        this.texture = null;
+        this.pfile = pfile;
+    }
+}
+class ModelTask extends AbstractTask {
+    constructor(pfile) {
+        super();
+        this.model = null;
+        this.gltf = null;
+        this.mixer = null;
+        this.actions = null;
+        this.pfile = pfile;
+    }
+}
+class AudioTask extends AbstractTask {
+    constructor(pfile) {
+        super();
+        this.buffer = null;
+        this.pfile = pfile;
+    }
+}
+class HDRTextureTask extends AbstractTask {
+    constructor(pfile) {
+        super();
+        this.texture = null;
+        this.pfile = pfile;
+    }
+}
+class TaskLoader {
+    constructor(type, pfile) {
+        this.tasks = [];
+        this.type = type;
+        this.pfile = pfile;
+    }
+}
+export { TextureTask, VideoTextureTask, ModelTask, AudioTask, HDRTextureTask, };
+const disposeEvent = new Event("dispose");
+export default class ThreeAssetLoader extends AssetLoader {
+    constructor(baseUrl, context) {
+        super(baseUrl, context);
+        this._textureLoader = new TextureLoader();
+        this._gltfLoader = new GLTFLoader();
+        this._audioLoader = new AudioLoader();
+        this._rgbeLoader = new RGBELoader();
+        this._loading = false;
+        this.onError = (_taskLoader, error) => {
+            this._gameContext.error(error);
+        };
+        this.onProgress = () => {
+            //    console.log("onProgress: ", this._tasks.length);
+        };
+        this._loaderPromise = null;
+        //
+        //  SHARED
+        //
+        this._tasks = [];
+        //
+        //  TEXTURES
+        //
+        this._textureCache = {};
+        this.onTextureDispose = (e) => {
+            e.target.removeEventListener("dispose", this.onTextureDispose);
+            const id = e.target.userData.id;
+            const cacheItem = this._textureCache[id];
+            if (!cacheItem) {
+                console.error("onTextureDispose: cacheItem not found", id);
+                return;
+            }
+            cacheItem.count--;
+            e.target.source.data = null;
+            if (cacheItem.count === 0) {
+                delete this._textureCache[id];
+                // console.log("cache item deleted");
+            }
+        };
+        this.onVideoTextureDispose = (e) => {
+            e.target.removeEventListener("dispose", this.onVideoTextureDispose);
+            const video = e.target.source.data;
+            e.target.source.data = null;
+            if (video) {
+                video.dispatchEvent(disposeEvent);
+                video.removeAttribute("src");
+                video.load();
+            }
+        };
+        this.onModelProgress = (e, taskLoader) => {
+            const tasks = taskLoader.tasks;
+            const progress = e.total > 0 ? e.loaded / e.total : 0;
+            for (const task of tasks) {
+                if (task.onProgress) {
+                    task.onProgress(progress * 0.9);
+                }
+            }
+        };
+        this.onHDRTextureDispose = (e) => {
+            e.target.removeEventListener("dispose", this.onHDRTextureDispose);
+            e.target.source.data = null;
+        };
+        const renderer = context.getPCanvas().getThreeRenderer();
+        this._pmremGenerator = new PMREMGenerator(renderer);
+        this._pmremGenerator.compileEquirectangularShader();
+    }
+    dispose() {
+        super.dispose();
+        this._pmremGenerator.dispose();
+        this._textureCache = {};
+    }
+    async loadAsync() {
+        // Nothing to do
+        if (this._tasks.length === 0) {
+            return this._loaderPromise ?? Promise.resolve();
+        }
+        // Already loading → return the same promise
+        if (this._loading) {
+            return this._loaderPromise;
+        }
+        // Start a new loading session
+        this._loading = true;
+        this._loaderPromise = (async () => {
+            try {
+                while (this._tasks.length > 0) {
+                    const tasks = [...this._tasks];
+                    this._tasks.length = 0;
+                    const promises = tasks.map((task) => {
+                        switch (task.type) {
+                            case TaskType.Texture:
+                                return this.loadTextureTask(task);
+                            case TaskType.Video:
+                                return this.loadVideoTextureTask(task);
+                            case TaskType.Model:
+                                return this.loadModelTask(task);
+                            case TaskType.Audio:
+                                return this.loadAudioTask(task);
+                            case TaskType.HDR:
+                                return this.loadHDRTextureTask(task);
+                            default:
+                                console.error("[AssetLoader] Unknown task type:", task.type);
+                                return Promise.resolve();
+                        }
+                    });
+                    await Promise.all(promises);
+                }
+            }
+            finally {
+                // Always reset state, even on error
+                this._loading = false;
+                this._loaderPromise = null;
+            }
+        })();
+        return this._loaderPromise;
+    }
+    hasQueue() {
+        return this._tasks.length > 0 || this._loading;
+    }
+    getTaskLoader(file) {
+        return this._tasks.find((t) => t.pfile._id === file._id) || null;
+    }
+    addTextureTask(owner, file) {
+        if (file.url === null)
+            throw new Error("No url on file");
+        // Check if we are loading this url...
+        let taskLoader = this.getTaskLoader(file);
+        if (taskLoader === null) {
+            taskLoader = new TaskLoader(TaskType.Texture, file);
+            this._tasks.push(taskLoader);
+        }
+        // Create a task
+        const task = new TextureTask(file);
+        task.onSuccess = owner.onTextureTaskLoaded;
+        // Add it to the loader
+        taskLoader.tasks.push(task);
+    }
+    onTextureLoaded(taskLoader, texture) {
+        const tasks = taskLoader.tasks;
+        for (let i = 0; i < taskLoader.tasks.length; i++) {
+            const itexture = i === 0 ? texture : new Texture(texture.source.data);
+            tasks[i].texture = itexture;
+            itexture.addEventListener("dispose", this.onTextureDispose);
+            itexture.colorSpace = SRGBColorSpace;
+            itexture.userData.id = taskLoader.pfile._id;
+            if (taskLoader.pfile.subType === FileSubType.Stereo)
+                texture.repeat = new Vector2(1, 0.5);
+            itexture.needsUpdate = true;
+            tasks[i].onSuccess?.(tasks[i]);
+        }
+        taskLoader.tasks.length = 0;
+        this.onProgress();
+    }
+    loadTextureTask(taskLoader) {
+        return new Promise((resolve) => {
+            // Check cache
+            let cached = this._textureCache[taskLoader.pfile._id];
+            if (cached) {
+                cached.count += taskLoader.tasks.length;
+                const texture = new Texture(cached.image);
+                this.onTextureLoaded(taskLoader, texture);
+                resolve();
+                return;
+            }
+            // Load
+            this._textureLoader.load(this._baseUrl + taskLoader.pfile.url, (texture) => {
+                this._textureCache[taskLoader.pfile._id] = {
+                    count: taskLoader.tasks.length,
+                    image: texture.source.data,
+                };
+                this.onTextureLoaded(taskLoader, texture);
+                resolve();
+            }, undefined, () => {
+                this.onProgress();
+                this.onError(taskLoader, "Failed to load image: " + taskLoader.pfile.name);
+                resolve();
+            });
+        });
+    }
+    //
+    //  VIDEO
+    //
+    addVideoTextureTask(owner, file) {
+        // console.log(">>> addVideoTextureTask: ");
+        if (file.url === null)
+            throw new Error("No url on file");
+        // For VideoTextureTask we don't want to share the video element
+        const taskLoader = new TaskLoader(TaskType.Video, file);
+        this._tasks.push(taskLoader);
+        // Create a task
+        const task = new VideoTextureTask(file);
+        task.onSuccess = owner.onVideoTextureTaskLoaded;
+        // Add it to the loader
+        taskLoader.tasks.push(task);
+    }
+    onVideoTextureLoaded(taskLoader, texture) {
+        const task = taskLoader.tasks[0];
+        task.texture = texture;
+        texture.addEventListener("dispose", this.onVideoTextureDispose);
+        texture.colorSpace = SRGBColorSpace;
+        texture.userData.id = taskLoader.pfile._id;
+        if (taskLoader.pfile.subType === FileSubType.Stereo)
+            texture.repeat = new Vector2(1, 0.5);
+        texture.needsUpdate = true;
+        task.onSuccess?.(task);
+        taskLoader.tasks.length = 0;
+        this.onProgress();
+    }
+    loadVideoTextureTask(taskLoader) {
+        return new Promise((resolve, reject) => {
+            const video = document.createElement("video");
+            video.src = this._baseUrl + taskLoader.pfile.url;
+            video.crossOrigin = "anonymous";
+            video.loop = true;
+            video.muted = true;
+            video.playsInline = true;
+            video.preload = "auto";
+            const onLoaded = (e) => {
+                cleanup();
+                const video = e.target;
+                this.onVideoTextureLoaded(taskLoader, new VideoTexture(video));
+                resolve();
+            };
+            const onError = (e) => {
+                cleanup();
+                this.onProgress();
+                this.onError(taskLoader, "Failed to load video: " + taskLoader.pfile.name);
+                reject(e);
+            };
+            const cleanup = () => {
+                video.removeEventListener("loadeddata", onLoaded);
+                video.removeEventListener("error", onError);
+            };
+            // "loadeddata" is triggered before "canplay"
+            video.addEventListener("loadeddata", onLoaded);
+            video.addEventListener("error", onError);
+            video.load();
+        });
+    }
+    //
+    //  MODELS
+    //
+    addModelTask(owner, file) {
+        if (file.url === null)
+            throw new Error("No url on file");
+        let taskLoader = this.getTaskLoader(file);
+        if (taskLoader === null) {
+            taskLoader = new TaskLoader(TaskType.Model, file);
+            this._tasks.push(taskLoader);
+        }
+        const task = new ModelTask(file);
+        task.onSuccess = owner.onModelTaskLoaded;
+        task.onProgress = owner.onModelTaskProgress;
+        taskLoader.tasks.push(task);
+    }
+    disposeModelMaterial(material) {
+        const MAPS = [
+            "map",
+            "alphaMap",
+            "emissiveMap",
+            "normalMap",
+            "metalnessMap",
+            "roughnessMap",
+        ];
+        for (const map of MAPS) {
+            const tex = material[map];
+            if (tex) {
+                tex.dispose();
+                material[map] = null;
+            }
+        }
+        material.dispose();
+    }
+    disposeModel(model) {
+        model.traverse((child) => {
+            if (child.skeleton) {
+                child.skeleton.dispose();
+            }
+            if (child.material) {
+                const materials = Array.isArray(child.material)
+                    ? child.material
+                    : [child.material];
+                for (const material of materials) {
+                    this.disposeModelMaterial(material);
+                }
+            }
+            if (child.geometry) {
+                child.geometry.dispose();
+            }
+        });
+        model.removeFromParent();
+    }
+    onModelLoaded(taskLoader, gltf) {
+        const tasks = taskLoader.tasks;
+        for (let i = 0; i < taskLoader.tasks.length; i++) {
+            const task = tasks[i];
+            task.gltf = gltf;
+            task.model = i === 0 ? gltf.scene : gltf.scene.clone(true);
+            task.model.traverse((child) => {
+                if (child.isMesh) {
+                    child.castShadow = false;
+                    child.receiveShadow = false;
+                }
+            });
+            if (task.onProgress) {
+                task.onProgress(1);
+            }
+            if (gltf.animations && gltf.animations.length) {
+                task.mixer = new AnimationMixer(gltf.scene);
+                task.actions = [];
+                for (const animation of gltf.scene.animations) {
+                    const action = task.mixer.clipAction(animation);
+                    task.actions.push(action);
+                }
+            }
+            task.onSuccess?.(task);
+        }
+        taskLoader.tasks.length = 0;
+        this.onProgress();
+    }
+    loadModelTask(taskLoader) {
+        return new Promise((resolve) => {
+            this._gltfLoader.load(this._baseUrl + taskLoader.pfile.url, (gltf) => {
+                this.onModelLoaded(taskLoader, gltf);
+                resolve();
+            }, (event) => {
+                this.onModelProgress(event, taskLoader);
+            }, (error) => {
+                console.log("error: ", error);
+                this.onProgress();
+                this.onError(taskLoader, "Failed to load model '" +
+                    taskLoader.pfile.name +
+                    "': " +
+                    error.message);
+                resolve();
+            });
+        });
+    }
+    //
+    //  AUDIO
+    //
+    addAudioTask(owner, file) {
+        if (file.url === null)
+            throw new Error("No url on file");
+        let taskLoader = this.getTaskLoader(file);
+        if (taskLoader === null) {
+            taskLoader = new TaskLoader(TaskType.Audio, file);
+            this._tasks.push(taskLoader);
+        }
+        const task = new AudioTask(file);
+        task.onSuccess = owner.onAudioTaskLoaded;
+        task.onProgress = owner.onAudioTaskProgress;
+        taskLoader.tasks.push(task);
+    }
+    loadAudioTask(taskLoader) {
+        return new Promise((resolve) => {
+            this._audioLoader.load(this._baseUrl + taskLoader.pfile.url, (buffer) => {
+                this.onAudioLoaded(taskLoader, buffer);
+                resolve();
+            }, (event) => {
+                const progress = event.total > 0 ? event.loaded / event.total : 0;
+                for (const task of taskLoader.tasks) {
+                    task.onProgress?.(progress * 0.9);
+                }
+            }, (error) => {
+                this.onProgress();
+                this.onError(taskLoader, "Failed to load audio '" +
+                    taskLoader.pfile.name +
+                    "': " +
+                    error.message);
+                resolve();
+            });
+        });
+    }
+    onAudioLoaded(taskLoader, buffer) {
+        const tasks = taskLoader.tasks;
+        for (const task of tasks) {
+            task.buffer = buffer;
+            task.onProgress?.(1);
+            task.onSuccess?.(task);
+        }
+        taskLoader.tasks.length = 0;
+        this.onProgress();
+    }
+    //
+    //  HDR
+    //
+    addHDRTextureTask(owner, file) {
+        if (file.url === null)
+            throw new Error("No url on file");
+        let taskLoader = this.getTaskLoader(file);
+        if (taskLoader === null) {
+            taskLoader = new TaskLoader(TaskType.HDR, file);
+            this._tasks.push(taskLoader);
+        }
+        const task = new HDRTextureTask(file);
+        task.onSuccess = owner.onHDRTextureTaskLoaded;
+        taskLoader.tasks.push(task);
+    }
+    onHDRTextureLoaded(taskLoader, baseTexture) {
+        const tasks = taskLoader.tasks;
+        for (let i = 0; i < tasks.length; i++) {
+            const env = i === 0 ? baseTexture : baseTexture.clone();
+            env.userData.id = taskLoader.pfile._id;
+            env.addEventListener("dispose", this.onHDRTextureDispose);
+            env.needsUpdate = true;
+            tasks[i].texture = env;
+            tasks[i].onSuccess?.(tasks[i]);
+        }
+        taskLoader.tasks.length = 0;
+        this.onProgress();
+    }
+    loadHDRTextureTask(taskLoader) {
+        return new Promise((resolve) => {
+            this._rgbeLoader.load(this._baseUrl + taskLoader.pfile.url, (hdr) => {
+                const pmrem = this._pmremGenerator.fromEquirectangular(hdr);
+                hdr.dispose();
+                this.onHDRTextureLoaded(taskLoader, pmrem.texture);
+                resolve();
+            }, undefined, () => {
+                this.onProgress();
+                this.onError(taskLoader, "Failed to load HDR: " + taskLoader.pfile.name);
+                resolve();
+            });
+        });
+    }
+}
+//# sourceMappingURL=ThreeAssetLoader.js.map

package/dist/assets/ThreeAssetLoader.js.map

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

package/dist/index.d.ts

@@ -1,9 +1,6 @@
 export { default as ThreeCanvas } from "./ThreeCanvas";
 export { default as ThreeEngine } from "./ThreeEngine";
-export { default as ImageLoader } from "./media/ImageLoader";
-export { default as VideoLoader } from "./media/VideoLoader";
-export { default as ModelLoader } from "./media/ModelLoader";
-export { default as AudioLoader } from "./media/AudioLoader";
+export { default as ThreeAssetLoader } from "./assets/ThreeAssetLoader";
 export { default as App } from "./App";
 export { type IThreeRenderSettings } from "./settings/IThreeRenderSettings";
 export * from "./pcomponents";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EAAE,OAAO,IAAI,GAAG,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAE5E,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAE,OAAO,IAAI,GAAG,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAE5E,cAAc,eAAe,CAAC"}

package/dist/index.js

@@ -1,10 +1,7 @@
 // p100
 export { default as ThreeCanvas } from "./ThreeCanvas";
 export { default as ThreeEngine } from "./ThreeEngine";
-export { default as ImageLoader } from "./media/ImageLoader";
-export { default as VideoLoader } from "./media/VideoLoader";
-export { default as ModelLoader } from "./media/ModelLoader";
-export { default as AudioLoader } from "./media/AudioLoader";
+export { default as ThreeAssetLoader } from "./assets/ThreeAssetLoader";
 export { default as App } from "./App";
 export * from "./pcomponents";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO;AAEP,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EAAE,OAAO,IAAI,GAAG,EAAE,MAAM,OAAO,CAAC;AAIvC,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO;AAEP,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAE,OAAO,IAAI,GAAG,EAAE,MAAM,OAAO,CAAC;AAIvC,cAAc,eAAe,CAAC"}

package/dist/pcomponents/PAnimator.d.ts

@@ -1,4 +1,4 @@
-import { AnimationAction, AnimationMixer, Object3D } from "three";
+import { AnimationAction, AnimationMixer, Group } from "three";
 import PModelGLTF, { IModelListener } from "./PModelGLTF";
 import { PAnimator as PAnimatorBase } from "@p100-web/core";
 export default class PAnimator extends PAnimatorBase implements IModelListener {
@@ -10,7 +10,7 @@ export default class PAnimator extends PAnimatorBase implements IModelListener {
     getModelComponent(): PModelGLTF | null;
     render(): void;
     unrender(): void;
-    onModelUpdate(component: PModelGLTF | null, model: Object3D | null): void;
+    onModelUpdate(component: PModelGLTF | null, model: Group | null): void;
     /**
      * Stop playback and remove event listeners
      */

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

@@ -1 +1 @@
-{"version":3,"file":"PAnimator.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PAnimator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,cAAc,EAEd,QAAQ,EACT,MAAM,OAAO,CAAC;AACf,OAAO,UAAU,EAAE,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,SAAS,IAAI,aAAa,EAAS,MAAM,gBAAgB,CAAC;AAEnE,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,aAAc,YAAW,cAAc;IAC5E,MAAM,EAAE,eAAe,GAAG,IAAI,CAAQ;IACtC,KAAK,EAAE,cAAc,GAAG,IAAI,CAAQ;IAEpC,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,QAAQ,CAAS;IAEzB,iBAAiB,IAAI,UAAU,GAAG,IAAI;IAUtC,MAAM,IAAI,IAAI;IAMd,QAAQ;IAgBR,aAAa,CAAC,SAAS,EAAE,UAAU,GAAG,IAAI,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI;IAezE;;OAEG;IACH,OAAO,CAAC,KAAK;IAoBb,iBAAiB,IAAI,MAAM,EAAE;IAe7B,eAAe,IAAI,IAAI;IAkCvB,UAAU,aAIR;IAEF,eAAe,IAAI,IAAI;IAMvB,aAAa,GAAI,IAAI,MAAM,UASzB;IAEF,MAAM,GAAI,IAAI,MAAM,UAElB;CACH"}
+{"version":3,"file":"PAnimator.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PAnimator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,cAAc,EAEd,KAAK,EACN,MAAM,OAAO,CAAC;AACf,OAAO,UAAU,EAAE,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE5D,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,aAAc,YAAW,cAAc;IAC5E,MAAM,EAAE,eAAe,GAAG,IAAI,CAAQ;IACtC,KAAK,EAAE,cAAc,GAAG,IAAI,CAAQ;IAEpC,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,QAAQ,CAAS;IAEzB,iBAAiB,IAAI,UAAU,GAAG,IAAI;IAItC,MAAM,IAAI,IAAI;IAMd,QAAQ;IAgBR,aAAa,CAAC,SAAS,EAAE,UAAU,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,GAAG,IAAI;IAetE;;OAEG;IACH,OAAO,CAAC,KAAK;IAoBb,iBAAiB,IAAI,MAAM,EAAE;IAe7B,eAAe,IAAI,IAAI;IAkCvB,UAAU,aAIR;IAEF,eAAe,IAAI,IAAI;IAMvB,aAAa,GAAI,IAAI,MAAM,UASzB;IAEF,MAAM,GAAI,IAAI,MAAM,UAElB;CACH"}

package/dist/pcomponents/PAnimator.js

@@ -27,14 +27,7 @@ export default class PAnimator extends PAnimatorBase {
         };
     }
     getModelComponent() {
-        let parent = this.node;
-        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/PAnimator.js.map

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

package/dist/pcomponents/PBackground.d.ts

@@ -1,16 +1,15 @@
 import { MeshBasicMaterial, SphereGeometry, Texture } from "three";
-import { IPMaterial, IVideoLoader, PBackground as PBackgroundBase } from "@p100-web/core";
-import { IImageLoader, PFile } from "@p100-web/core";
-export default class PBackground extends PBackgroundBase implements IImageLoader, IVideoLoader, IPMaterial {
+import { IPMaterial, PBackground as PBackgroundBase } from "@p100-web/core";
+import { TextureTask, VideoTextureTask, ITextureTaskLoader, IVideoTextureTaskLoader } from "../assets/ThreeAssetLoader";
+export default class PBackground extends PBackgroundBase implements ITextureTaskLoader, IVideoTextureTaskLoader, IPMaterial {
     protected _material: MeshBasicMaterial | null;
     protected _geometry: SphereGeometry | null;
     protected _texture: Texture | null;
-    _cacheKey: number;
     _dispose(unrender: boolean): void;
     getTexture<T>(): T | null;
     unrender(): void;
     render(): void;
-    onImageLoaded(file: PFile, data: any, cacheKey: number): void;
-    onVideoLoaded(file: PFile, video: any): void;
+    onVideoTextureTaskLoaded: (task: VideoTextureTask) => void;
+    onTextureTaskLoaded: (task: TextureTask) => void;
 }
 //# sourceMappingURL=PBackground.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"PBackground.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PBackground.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EACjB,cAAc,EAEd,OAAO,EAGR,MAAM,OAAO,CAAC;AAEf,OAAO,EAEL,UAAU,EACV,YAAY,EACZ,WAAW,IAAI,eAAe,EAE/B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAe,YAAY,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAElE,MAAM,CAAC,OAAO,OAAO,WACnB,SAAQ,eACR,YAAW,YAAY,EAAE,YAAY,EAAE,UAAU;IAEjD,SAAS,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IACrD,SAAS,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI,CAAQ;IAClD,SAAS,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAQ;IAC1C,SAAS,SAAK;IAEd,QAAQ,CAAC,QAAQ,EAAE,OAAO;IAsC1B,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAIzB,QAAQ;IAMR,MAAM;IA2CN,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IA2B7D,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;CAgB7C"}
+{"version":3,"file":"PBackground.d.ts","sourceRoot":"","sources":["../../src/pcomponents/PBackground.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EACjB,cAAc,EACd,OAAO,EACR,MAAM,OAAO,CAAC;AAEf,OAAO,EAEL,UAAU,EACV,WAAW,IAAI,eAAe,EAC/B,MAAM,gBAAgB,CAAC;AAExB,OAAyB,EACvB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,OAAO,OAAO,WACnB,SAAQ,eACR,YAAW,kBAAkB,EAAE,uBAAuB,EAAE,UAAU;IAElE,SAAS,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IACrD,SAAS,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI,CAAQ;IAClD,SAAS,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAQ;IAE1C,QAAQ,CAAC,QAAQ,EAAE,OAAO;IAuB1B,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI;IAIzB,QAAQ;IAMR,MAAM;IA+CN,wBAAwB,GAAI,MAAM,gBAAgB,KAAG,IAAI,CAcvD;IAMF,mBAAmB,GAAI,MAAM,WAAW,KAAG,IAAI,CAc7C;CACH"}