@p100-web/core-three 100.0.63 → 100.0.65

package/dist/media/EnvironmentLoader.js

@@ -0,0 +1,120 @@
+import { EquirectangularReflectionMapping, PMREMGenerator, } from "three";
+import { RGBELoader } from "three/addons/loaders/RGBELoader.js";
+/**
+ * RGBE Loader
+ */
+export default class EnvironmentLoader {
+    constructor(url, context) {
+        this.debug = false;
+        this.debugDelay = false;
+        this.onLoaded = async (id, texture) => {
+            const queueItem = this._queue[id];
+            if (!queueItem) {
+                this._context?.error("[EnvironmentLoader] Missing QueueItem");
+                return;
+            }
+            const file = queueItem.file;
+            // Save id on loaded model
+            if (this.debug)
+                console.log("EnvironmentLoader.onLoaded: ", texture);
+            texture.mapping = EquirectangularReflectionMapping;
+            // Optionally process with PMREMGenerator for better reflections
+            const pcanvas = this._context.getPCanvas();
+            const pmremGenerator = new PMREMGenerator(pcanvas.getThreeRenderer());
+            const envMap = pmremGenerator.fromEquirectangular(texture).texture;
+            envMap.userData.id = id;
+            texture.dispose();
+            pmremGenerator.dispose();
+            // Remove from queue
+            delete this._queue[id];
+            if (queueItem.components.length > 0) {
+                for (const target of queueItem.components) {
+                    // Notify event listeners
+                    target.onEnvironmentLoaded(file, envMap);
+                }
+            }
+            else {
+                console.log("No textures were waiting for the media");
+            }
+            queueItem.resolve(file);
+        };
+        this.onError = (id, error) => {
+            console.log("ERROR value: ", id, error);
+            const queueItem = this._queue[id];
+            if (queueItem) {
+                // Remove from queue
+                delete this._queue[id];
+            }
+            this._context?.error("Failed to load: " + id);
+        };
+        this._loader = new RGBELoader();
+        this._queue = {};
+        this._baseUrl = url;
+        this._context = context;
+    }
+    dispose() {
+        this._context = null;
+        this._queue = {};
+    }
+    queue() {
+        return Promise.all(Object.values(this._queue).map((q) => q.promise));
+    }
+    disposeQueue() {
+        console.log("disposeQueue()");
+    }
+    //
+    //  LOADING
+    //
+    disposeEnvironment(owner, file) {
+        const id = file._id;
+        const queued = this._queue[id];
+        if (this.debug)
+            console.log("[IL] --> dipose environment", file.name);
+        if (queued) {
+            queued.components = queued.components.filter((t) => t !== owner);
+        }
+    }
+    /**
+     * Creates and returns a group that will be populated with the loaded model
+     * when it has been loaded. Non cached.
+     */
+    load(owner, file) {
+        //loader.setCrossOrigin(this.crossOrigin);
+        //loader.setPath(this.path);
+        const queue = this._queue;
+        // Are we loading the item?
+        if (queue[file._id]) {
+            if (this.debug)
+                console.log("--> Using queued environment item", file.url);
+            const item = queue[file._id];
+            // Add group to target list
+            item.components = [...item.components, owner];
+            return true;
+        }
+        if (this.debug)
+            console.log("--> Loading environment", file.url);
+        // No, we need to load it
+        const queueItem = {
+            file: file,
+            components: [owner],
+        };
+        queue[file._id] = queueItem;
+        queueItem.promise = new Promise((resolve, reject) => {
+            queueItem.resolve = resolve;
+            queueItem.reject = reject;
+            const url = this._baseUrl + file.url;
+            this._loader.load(url, (result) => this.onLoaded(file._id, result), undefined, (error) => this.onError(file._id, error));
+        });
+        return true;
+    }
+    getQueue() {
+        return this._queue;
+    }
+    hasQueue() {
+        return Object.keys(this._queue).length > 0;
+    }
+    debugLog() {
+        console.log(this._queue);
+    }
+}
+//# sourceMappingURL=EnvironmentLoader.js.map

package/dist/media/EnvironmentLoader.js.map

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

package/dist/media/ImageLoader.d.ts

@@ -0,0 +1,36 @@
+import { IImageLoader, IMediaLoader_Image, PFile, GameContext } from "@p100-web/core";
+interface ImageQueueItem {
+    file: PFile;
+    promise?: Promise<any>;
+    resolve?: (value: any) => void;
+    reject?: () => void;
+    components: IImageLoader[];
+}
+interface ImageQueue {
+    [key: string]: ImageQueueItem;
+}
+export default class ImageLoader implements IMediaLoader_Image {
+    private _imageLoader;
+    private _queue;
+    private _cache;
+    private _context;
+    debug: boolean;
+    debugDelay: boolean;
+    constructor(baseUrl: string, context: GameContext);
+    dispose(): void;
+    queue(): Promise<any>;
+    disposeImage(owner: IImageLoader, file: PFile, cacheKey: number): void;
+    onDelayedImageLoaded: (value: any) => void;
+    onImageLoaded: (value: any) => void;
+    onImageError: (value: any) => void;
+    /**
+     * Creates and returns a texture that will be populated with the map
+     * when it has been loaded.
+     */
+    load(owner: IImageLoader, file: PFile): void;
+    getQueue(): ImageQueue;
+    hasQueue(): boolean;
+    debugLog(): void;
+}
+export {};
+//# sourceMappingURL=ImageLoader.d.ts.map

package/dist/media/ImageLoader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImageLoader.d.ts","sourceRoot":"","sources":["../../src/media/ImageLoader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAEtF,UAAU,cAAc;IACtB,IAAI,EAAE,KAAK,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,EAAE,YAAY,EAAE,CAAC;CAC5B;AAID,UAAU,UAAU;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAC;CAC/B;AAiCD,MAAM,CAAC,OAAO,OAAO,WAAY,YAAW,kBAAkB;IAC5D,OAAO,CAAC,YAAY,CAAc;IAElC,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,QAAQ,CAA4B;IAE5C,KAAK,EAAE,OAAO,CAAS;IACvB,UAAU,EAAE,OAAO,CAAS;gBAEhB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;IAOjD,OAAO;IAMP,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAQrB,YAAY,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM;IAoB/D,oBAAoB,GAAI,OAAO,GAAG,UAGhC;IAEF,aAAa,GAAI,OAAO,GAAG,UAsBzB;IAEF,YAAY,GAAI,OAAO,GAAG,UAWxB;IAEF;;;OAGG;IAEH,IAAI,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK;IA8CrC,QAAQ;IAIR,QAAQ;IAIR,QAAQ;CAQT"}

package/dist/media/ImageLoader.js

@@ -0,0 +1,160 @@
+import MediaLoader from "./MediaLoader";
+let _cacheCounter = 1;
+class CacheItem {
+    constructor(cache, file, data) {
+        this.file = file;
+        this.data = data;
+        this.keys = [];
+        cache[file._id] = this;
+    }
+    cache() {
+        const key = _cacheCounter++;
+        this.keys.push(key);
+        return key;
+    }
+    uncache(key) {
+        this.keys = this.keys.filter((k) => k !== key);
+    }
+    empty() {
+        return this.keys.length === 0;
+    }
+}
+export default class ImageLoader {
+    constructor(baseUrl, context) {
+        this._context = null;
+        this.debug = false;
+        this.debugDelay = false;
+        this.onDelayedImageLoaded = (value) => {
+            if (this.debug)
+                console.log("[IL] --> Delaying image...");
+            setTimeout(this.onImageLoaded, 3000, value);
+        };
+        this.onImageLoaded = (value) => {
+            const id = value.dataset.id;
+            const queueItem = this._queue[id];
+            const file = queueItem.file;
+            if (this.debug)
+                console.log("[IL] --> onImageLoaded: ", file.name);
+            // Remove from queue
+            delete this._queue[id];
+            if (queueItem.components.length > 0) {
+                // Add to cache?
+                const cacheItem = file._refs > 1 ? new CacheItem(this._cache, file, value) : null;
+                for (const target of queueItem.components) {
+                    const cacheKey = cacheItem ? cacheItem.cache() : 0;
+                    target.onImageLoaded(file, value, cacheKey);
+                }
+            }
+            else {
+                console.log("[IL] --> No textures were waiting for the media");
+            }
+            queueItem.resolve(file);
+        };
+        this.onImageError = (value) => {
+            console.log("ERROR value: ", value);
+            const id = value.dataset.id;
+            const queueItem = this._queue[id];
+            if (queueItem) {
+                // Remove from queue
+                delete this._queue[id];
+            }
+            this._context?.error("Failed to load: " + id);
+        };
+        this._imageLoader = new MediaLoader(baseUrl);
+        this._queue = {};
+        this._cache = {};
+        this._context = context;
+    }
+    dispose() {
+        this._queue = {};
+        this._cache = {};
+        this._context = null;
+    }
+    queue() {
+        return Promise.all(Object.values(this._queue).map((q) => q.promise));
+    }
+    //
+    //  Images
+    //
+    disposeImage(owner, file, cacheKey) {
+        const id = file._id;
+        const queued = this._queue[id];
+        if (this.debug)
+            console.log("[IL] --> dipose image", file.name);
+        if (queued) {
+            queued.components = queued.components.filter((t) => t !== owner);
+        }
+        if (cacheKey) {
+            const cached = this._cache[id];
+            if (this.debug)
+                console.log("[IL] --> deleting from cache");
+            cached.uncache(cacheKey);
+            if (cached.empty()) {
+                if (this.debug)
+                    console.log("[IL] --> last cached item");
+                delete this._cache[id];
+            }
+        }
+    }
+    /**
+     * Creates and returns a texture that will be populated with the map
+     * when it has been loaded.
+     */
+    // colorSpace: ColorSpace = SRGBColorSpace
+    load(owner, file) {
+        // texture.colorSpace = colorSpace;
+        const loader = this._imageLoader;
+        const url = file.url;
+        const queue = this._queue;
+        // Are we loading the item?
+        if (queue[file._id]) {
+            if (this.debug)
+                console.log("[IL] --> Using QUEUED image item", url);
+            const item = queue[file._id];
+            // Add texture to target list
+            item.components = [...item.components, owner];
+            return;
+        }
+        // Do we have it cached?
+        const cached = this._cache[file._id];
+        if (cached) {
+            if (this.debug)
+                console.log("[IL] --> Using CACHED image item", url);
+            owner.onImageLoaded(file, cached.data, cached.cache());
+            return;
+        }
+        if (this.debug)
+            console.log("[IL] --> Loading image", url);
+        // No, we need to load it
+        const queueItem = {
+            file: file,
+            components: [owner],
+        };
+        queue[file._id] = queueItem;
+        queueItem.promise = new Promise((resolve, reject) => {
+            queueItem.resolve = resolve;
+            queueItem.reject = reject;
+            if (this.debugDelay) {
+                loader.loadMedia(file, this.onDelayedImageLoaded, this.onImageError);
+            }
+            else {
+                loader.loadMedia(file, this.onImageLoaded, this.onImageError);
+            }
+        });
+    }
+    getQueue() {
+        return this._queue;
+    }
+    hasQueue() {
+        return Object.keys(this._queue).length > 0;
+    }
+    debugLog() {
+        console.log("CACHE");
+        const cached = {};
+        for (const key of Object.keys(this._cache)) {
+            cached[key] = this._cache[key].keys;
+        }
+        console.log(cached);
+    }
+}
+//# sourceMappingURL=ImageLoader.js.map

package/dist/media/ImageLoader.js.map

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

package/dist/media/MediaLoader.d.ts

@@ -0,0 +1,14 @@
+import { PFile } from "@p100-web/core";
+import { Loader } from "three";
+/**
+ * This was added to not use threejs cache. But we could have just
+ * disabled the cache. And it looks like it is disabled by default.
+ */
+declare class MediaLoader extends Loader {
+    videoLoader: boolean;
+    baseUrl: string;
+    constructor(baseUrl: string, videoLoader?: boolean);
+    loadMedia(file: PFile, onLoad: any, onError: any): any;
+}
+export default MediaLoader;
+//# sourceMappingURL=MediaLoader.d.ts.map

package/dist/media/MediaLoader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MediaLoader.d.ts","sourceRoot":"","sources":["../../src/media/MediaLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAM/B;;;GAGG;AACH,cAAM,WAAY,SAAQ,MAAM;IAC9B,WAAW,EAAE,OAAO,CAAC;IAErB,OAAO,EAAE,MAAM,CAAC;gBAEJ,OAAO,EAAE,MAAM,EAAE,WAAW,GAAE,OAAe;IAMzD,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;CAqDjD;AAED,eAAe,WAAW,CAAC"}

package/dist/media/MediaLoader.js

@@ -0,0 +1,70 @@
+import { Loader } from "three";
+function createElementNS(name) {
+    return document.createElementNS("http://www.w3.org/1999/xhtml", name);
+}
+/**
+ * This was added to not use threejs cache. But we could have just
+ * disabled the cache. And it looks like it is disabled by default.
+ */
+class MediaLoader extends Loader {
+    constructor(baseUrl, videoLoader = false) {
+        super();
+        this.baseUrl = baseUrl;
+        this.videoLoader = videoLoader;
+    }
+    loadMedia(file, onLoad, onError) {
+        let url = this.baseUrl + file.url;
+        if (this.path !== undefined)
+            url = this.path + url;
+        url = this.manager.resolveURL(url);
+        const scope = this;
+        const image = this.videoLoader
+            ? createElementNS("video")
+            : createElementNS("img");
+        image.dataset.id = file._id;
+        if (this.videoLoader) {
+            image.playsinline = true;
+            image.style.display = "none";
+        }
+        function onImageLoad(args) {
+            removeEventListeners();
+            if (onLoad)
+                onLoad(args.target);
+            scope.manager.itemEnd(url);
+        }
+        function onImageError(event) {
+            removeEventListeners();
+            if (onError)
+                onError(event.target);
+            scope.manager.itemError(url);
+            scope.manager.itemEnd(url);
+        }
+        function removeEventListeners() {
+            image.removeEventListener("canplay", onImageLoad, false);
+            image.removeEventListener("load", onImageLoad, false);
+            image.removeEventListener("error", onImageError, false);
+        }
+        if (this.videoLoader)
+            image.addEventListener("canplay", onImageLoad, false);
+        else
+            image.addEventListener("load", onImageLoad, false);
+        image.addEventListener("error", onImageError, false);
+        if (url.slice(0, 5) !== "data:") {
+            if (this.crossOrigin !== undefined)
+                image.crossOrigin = this.crossOrigin;
+        }
+        scope.manager.itemStart(url);
+        image.src = url;
+        return image;
+    }
+}
+export default MediaLoader;
+// interface IMediaLoader {
+//   getQueue(): any;
+//   hasQueue(): boolean;
+//   debugLog(): void;
+//   load(owner: any, file: PFile): void;
+//   dispose(owner: any, file: PFile): void;
+// }
+// export type { IMediaLoader };
+//# sourceMappingURL=MediaLoader.js.map

package/dist/media/MediaLoader.js.map

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

package/dist/media/ModelLoader.d.ts

@@ -0,0 +1,49 @@
+import { AnimationAction, AnimationMixer, Group } from "three";
+import { type IModelLoader, PFile, GameContext } from "@p100-web/core";
+declare const MAPS: string[];
+export { MAPS };
+interface ModelQueueItem {
+    file: PFile;
+    promise?: Promise<any>;
+    resolve?: (value: any) => void;
+    reject?: () => void;
+    components: IModelLoader[];
+}
+interface IModel {
+    modelScene: any | null;
+    mixer: AnimationMixer | null;
+    actions: AnimationAction[] | null;
+}
+export { type IModel };
+interface ModelQueue {
+    [key: string]: ModelQueueItem;
+}
+export default class ModelLoader {
+    private _fbxLoader;
+    private _gltfLoader;
+    private _queue;
+    private _baseUrl;
+    private _context;
+    debug: boolean;
+    debugDelay: boolean;
+    constructor(url: string, context: GameContext);
+    dispose(): void;
+    queue(): Promise<any>;
+    disposeQueue(): void;
+    disposeMaterial(material: any): void;
+    disposeModel(owner: IModelLoader, model: Group): void;
+    onDelayedModelLoaded: (id: string, group: any) => void;
+    parseGLTF(root: any, castShadow: boolean, receiveShadow: boolean): Promise<IModel | null>;
+    onModelLoaded: (id: string, value: any) => Promise<void>;
+    onModelError: (id: string, error: unknown) => void;
+    onProgress: (queueItem: ModelQueueItem, e: ProgressEvent) => void;
+    /**
+     * Creates and returns a group that will be populated with the loaded model
+     * when it has been loaded. Non cached.
+     */
+    load(owner: IModelLoader, file: PFile): boolean;
+    getQueue(): ModelQueue;
+    hasQueue(): boolean;
+    debugLog(): void;
+}
+//# sourceMappingURL=ModelLoader.d.ts.map

package/dist/media/ModelLoader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelLoader.d.ts","sourceRoot":"","sources":["../../src/media/ModelLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAG/D,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGvE,QAAA,MAAM,IAAI,UAOT,CAAC;AACF,OAAO,EAAE,IAAI,EAAE,CAAC;AAEhB,UAAU,cAAc;IACtB,IAAI,EAAE,KAAK,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,EAAE,YAAY,EAAE,CAAC;CAC5B;AAED,UAAU,MAAM;IACd,UAAU,EAAE,GAAG,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,cAAc,GAAG,IAAI,CAAC;IAC7B,OAAO,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;CACnC;AAED,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;AAEvB,UAAU,UAAU;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAC;CAC/B;AAED,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAA4B;IAE5C,KAAK,EAAE,OAAO,CAAS;IACvB,UAAU,EAAE,OAAO,CAAS;gBAEhB,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;IAQ7C,OAAO;IAKP,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAIrB,YAAY;IAQZ,eAAe,CAAC,QAAQ,EAAE,GAAG;IAU7B,YAAY,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK;IAiC9C,oBAAoB,GAAI,IAAI,MAAM,EAAE,OAAO,GAAG,UAG5C;IAEI,SAAS,CACb,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,OAAO,EACnB,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA2CzB,aAAa,GAAU,IAAI,MAAM,EAAE,OAAO,GAAG,mBA2C3C;IAEF,YAAY,GAAI,IAAI,MAAM,EAAE,OAAO,OAAO,UAUxC;IAEF,UAAU,GAAI,WAAW,cAAc,EAAE,GAAG,aAAa,UAKvD;IAEF;;;OAGG;IACH,IAAI,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;IA2D/C,QAAQ;IAIR,QAAQ;IAIR,QAAQ;CAGT"}