@luminocity/lemonate-engine 15.2.2 → 15.2.3

package/dist/items/FontItem.js

@@ -1,135 +0,0 @@
-// -----------------------------------------------------------------------------------------------------------
-//  __         ______     __    __     ______     __   __     ______     ______   ______
-// /\ \       /\  ___\   /\ "-./  \   /\  __ \   /\ "-.\ \   /\  __ \   /\__  _\ /\  ___\
-// \ \ \____  \ \  __\   \ \ \-./\ \  \ \ \/\ \  \ \ \-.  \  \ \  __ \  \/_/\ \/ \ \  __\
-//  \ \_____\  \ \_____\  \ \_\ \ \_\  \ \_____\  \ \_\\"\_\  \ \_\ \_\    \ \_\  \ \_____\
-//   \/_____/   \/_____/   \/_/  \/_/   \/_____/   \/_/ \/_/   \/_/\/_/     \/_/   \/_____/
-//
-//
-// Copyright 2023- Luminocity AG
-//
-// "It’s-a me, Mario!" - Super Mario 64 (1996)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-// and associated documentation files (the “Software”), to deal in the Software without restriction,
-// including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-// subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or substantial
-// portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-// -----------------------------------------------------------------------------------------------------------
-import { Item, ItemState } from './Item';
-import { FontLoader } from '@/subsystems/FontLoader';
-import { LoadingState } from "@/LoadingState";
-import { loadFontFace } from "@/tools/FontTools";
-export class FontItem extends Item {
-    font;
-    constructor(item, engine, renderer) {
-        super(item, engine, renderer);
-        this.font = undefined;
-    }
-    getType() {
-        return "Font";
-    }
-    getObject() {
-        return this.font;
-    }
-    isReadyForUse() {
-        return !!this.font;
-    }
-    async create() {
-        this.state = ItemState.Created;
-        return this;
-    }
-    async load() {
-        const { url, objectUrl } = await this.preloadAndReturnUrl(this.item._id, { returnObjectUrlAlso: true });
-        if (url) {
-            const fontData = await this._loadFont(this.item.name, url, objectUrl);
-            this._setFont(fontData);
-        }
-        else {
-            this._setFont(undefined);
-        }
-        this._loadingManagerReady();
-        this.state = ItemState.Finished;
-    }
-    async _loadFont(name, url, objectUrl) {
-        this._loadingManagerProgress(LoadingState.LOADING);
-        this._loadingManagerImport(url);
-        const fontLoader = new FontLoader(this.renderer.loadingManager);
-        try {
-            const fontFace = await this._loadFontFace(name, objectUrl);
-            const fontArraybuffer = await this._loadFontArrayBuffer(fontLoader, url);
-            const fontJson = fontLoader.parse(fontArraybuffer);
-            const font = {
-                arraybuffer: fontArraybuffer,
-                json: fontJson,
-                fontFace: fontFace
-            };
-            this._loadingManagerProgress(LoadingState.DONE);
-            return font;
-        }
-        catch (error) {
-            console.error("Error loading font:", error);
-            throw error;
-        }
-    }
-    async _loadFontFace(name, url) {
-        return loadFontFace(name, url);
-    }
-    _warmupFont(name) {
-        const canvas = document.createElement('canvas');
-        const ctx = canvas.getContext('2d');
-        if (ctx) {
-            // Force font to be registered in canvas by doing a dummy measureText
-            ctx.font = `30px ${name}`;
-            ctx.measureText(' '); // Force layout engine to sync font
-        }
-        else {
-            console.error("Could not warmup font. Did not get 2d context!");
-        }
-    }
-    async _loadFontArrayBuffer(fontLoader, url) {
-        return new Promise((resolve, reject) => {
-            fontLoader.load(url, (fontArraybuffer) => resolve(fontArraybuffer), undefined, (err) => reject(err));
-        });
-    }
-    _setFont(font) {
-        if (this.state !== ItemState.Destroyed) {
-            this.font = font;
-            this.$emit('item:objectUpdated', this);
-            this.state = ItemState.Alive;
-        }
-        else {
-            console.warn("Item was already destroyed. Freeing the Font.");
-            this.font = undefined;
-            this._loadingManagerUpdateInfo(this._getLoadingManagerId());
-            this.engine.eventBus.$emit('item:contentUpdated', this);
-        }
-        this._loadingManagerUpdateInfo(this._getLoadingManagerId());
-        this.engine.eventBus.$emit('item:contentUpdated', this);
-    }
-    _getLoadingManagerId() {
-        return this.item._id;
-    }
-    async destroy() {
-        this.state = ItemState.Destroyed;
-        if (this.font) {
-            if (this.font.fontFace) {
-                //@ts-ignore
-                document.fonts.delete(this.font.fontFace);
-            }
-            const result = this._loadingManagerUpdateInfo(this._getLoadingManagerId());
-            this.font = undefined;
-            return result;
-        }
-    }
-}
-//# sourceMappingURL=FontItem.js.map

package/dist/items/FontItem.js.map

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

package/dist/items/GaussianSplatsItem.js

@@ -1,103 +0,0 @@
-// -----------------------------------------------------------------------------------------------------------
-//  __         ______     __    __     ______     __   __     ______     ______   ______
-// /\ \       /\  ___\   /\ "-./  \   /\  __ \   /\ "-.\ \   /\  __ \   /\__  _\ /\  ___\
-// \ \ \____  \ \  __\   \ \ \-./\ \  \ \ \/\ \  \ \ \-.  \  \ \  __ \  \/_/\ \/ \ \  __\
-//  \ \_____\  \ \_____\  \ \_\ \ \_\  \ \_____\  \ \_\\"\_\  \ \_\ \_\    \ \_\  \ \_____\
-//   \/_____/   \/_____/   \/_/  \/_/   \/_____/   \/_/ \/_/   \/_/\/_/     \/_/   \/_____/
-//
-//
-// Copyright 2023- Luminocity AG
-//
-// "All your base are belong to us." - Zero Wing (1989)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-// and associated documentation files (the “Software”), to deal in the Software without restriction,
-// including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-// subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or substantial
-// portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-// -----------------------------------------------------------------------------------------------------------
-import { Item, ItemState } from './Item';
-import SplatLoader from "../subsystems/gaussiansplatting/splatloader";
-import { Object3D } from "three";
-import { LoadingState } from "@/LoadingState";
-export class GaussianSplatsItem extends Item {
-    splats;
-    splatMesh;
-    splatBuffer;
-    constructor(item, engine, renderer) {
-        super(item, engine, renderer);
-    }
-    getType() {
-        return "GaussianSplats";
-    }
-    getObject() {
-        return this.splats;
-    }
-    isReadyForUse() {
-        return !!this.splats;
-    }
-    getGpuMemUsage(lodLevel) {
-        if (!this.splats)
-            return 0;
-        let size = 0;
-        this.splats.traverse(function (obj) {
-            if (obj.geometry) {
-                const att = obj.geometry.attributes;
-                if (att.position)
-                    size += att.position.array.length * 4;
-                if (att.normal)
-                    size += att.normal.array.length * 4;
-                if (att.color)
-                    size += att.color.array.length * 4;
-                if (att.uv)
-                    size += att.uv.array.length * 4;
-                if (att.uv2)
-                    size += att.uv2.array.length * 4;
-            }
-        });
-        return size;
-    }
-    async create() {
-        await this.destroy();
-        this.state = ItemState.Created;
-        this._loadingManagerProgress(LoadingState.LOADING);
-        this.splats = new Object3D();
-        this.preloadAndReturnUrl().then((url) => {
-            const profilerTask = this.engine.profiler.start('gaussiansplats.js', `Loading ${this.item.name}`);
-            const loader = new SplatLoader(this.renderer);
-            loader.loadFromFile(url).then((splatMesh) => {
-                this.splatMesh = splatMesh;
-                this._loadingManagerProgress(LoadingState.DONE);
-                this.splats.add(this.splatMesh);
-                this.state = ItemState.Finished;
-                profilerTask.done();
-                // This event needs to be called before content update. It will trigger the update on the scenegraph,
-                // essentially causing a previously loaded LOD to be removed and this new one to be inserted.
-                // only after this event has been triggered is the mesh integrated in the scene and we can trigger the next event...
-                this.$emit('item:objectUpdated', this);
-                // This event will let everyone know the new mesh is ready, which will among other things cause new bounding box
-                // calculations and replacement of the default camera during scene loading. if it is triggered before the above
-                // objectUpdated event, the scene graph will be traversed and bounding boxes calculated before the object is even
-                // part of the scene graph, causing issues
-                this.engine.eventBus.$emit('item:contentUpdated', this);
-            });
-        });
-        return this;
-    }
-    async destroy() {
-        this.splatBuffer = null;
-        this.splats = null;
-        this._loadingManagerUpdateInfo();
-        this.state = ItemState.Destroyed;
-    }
-}
-//# sourceMappingURL=GaussianSplatsItem.js.map

package/dist/items/GaussianSplatsItem.js.map

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

package/dist/items/GridMapItem.js

@@ -1,202 +0,0 @@
-// -----------------------------------------------------------------------------------------------------------
-//  __         ______     __    __     ______     __   __     ______     ______   ______
-// /\ \       /\  ___\   /\ "-./  \   /\  __ \   /\ "-.\ \   /\  __ \   /\__  _\ /\  ___\
-// \ \ \____  \ \  __\   \ \ \-./\ \  \ \ \/\ \  \ \ \-.  \  \ \  __ \  \/_/\ \/ \ \  __\
-//  \ \_____\  \ \_____\  \ \_\ \ \_\  \ \_____\  \ \_\\"\_\  \ \_\ \_\    \ \_\  \ \_____\
-//   \/_____/   \/_____/   \/_/  \/_/   \/_____/   \/_/ \/_/   \/_/\/_/     \/_/   \/_____/
-//
-//
-// Copyright 2023- Luminocity AG
-//
-// "Look at you hacker." - System Shock (1994)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-// and associated documentation files (the “Software”), to deal in the Software without restriction,
-// including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-// subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or substantial
-// portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-// -----------------------------------------------------------------------------------------------------------
-import { LoadingState } from "@/LoadingState";
-import { Item, ItemState } from './Item';
-import { FileLoader, Object3D } from "three";
-import { parse } from 'yaml';
-import { GridMapBuilder } from "@/subsystems/gridmap/GridMapBuilder";
-import { ListField } from "./helpers/ListField";
-import { MaterialCollectionItem } from "./MaterialCollectionItem";
-import { MeshCollectionItem } from "./MeshCollectionItem";
-export class GridMapItem extends Item {
-    map;
-    code = "";
-    mapData;
-    fileContentModified = false;
-    materialCollectionList;
-    meshCollectionList;
-    getType() {
-        return "GridMap";
-    }
-    getObject() {
-        return this.map;
-    }
-    containsCode() {
-        if (!this.code)
-            return false;
-        return this.code.trim().length > 0;
-    }
-    getCode() {
-        return this.code || "";
-    }
-    setCode(value, notModified = false) {
-        if (this.code === value)
-            return;
-        this.code = value;
-        this.fileContentModified = !notModified;
-        this.setDirty(true);
-        if (this.recreateMap()) {
-            this.codeUpdated();
-        }
-    }
-    codeUpdated() {
-        this.engine.eventBus.$emit("gridmap:codeUpdated", { id: this.getId(), code: this.code });
-    }
-    isFileContentModified() {
-        return this.fileContentModified;
-    }
-    async saveFileContent() {
-        if (this.fileContentModified) {
-            return this._saveFileContent(this.code, "map.yaml").then(() => {
-                this.fileContentModified = false;
-            });
-        }
-    }
-    recreateMap() {
-        if (!this.containsCode())
-            return;
-        try {
-            this.mapData = parse(this.code);
-        }
-        catch (err) {
-            console.error("Error parsing gridmap: " + err.toString());
-            return false;
-        }
-        try {
-            const materialCollections = this.materialCollectionList?.getItemInstances() || [];
-            const meshCollections = this.meshCollectionList?.getItemInstances() || [];
-            const gridMapBuilder = new GridMapBuilder(this.mapData, materialCollections, meshCollections);
-            this.map = gridMapBuilder.build();
-        }
-        catch (err) {
-            console.error("Error building gridmap: " + err.toString());
-            return false;
-        }
-        this.$emit('item:objectUpdated', this);
-        return true;
-    }
-    _enumerateChildren() {
-        return [...this.materialCollectionList.enumerateChildren(), ...this.meshCollectionList.enumerateChildren()];
-    }
-    isReadyForUse() {
-        return this.materialCollectionList.isReadyForUse() && this.meshCollectionList.isReadyForUse();
-    }
-    async create() {
-        await this.destroy();
-        this.materialCollectionList = new ListField(this, "MaterialCollections", "MaterialCollection", MaterialCollectionItem, this.engine);
-        this.materialCollectionList.$on("listfield:updated", this.onMaterialsChanged);
-        this.meshCollectionList = new ListField(this, "MeshCollections", "MeshCollection", MeshCollectionItem, this.engine);
-        this.meshCollectionList.$on("listfield:updated", this.onMeshesChanged);
-        this.map = new Object3D();
-        this.state = ItemState.Created;
-        return this;
-    }
-    onMaterialsChanged = () => {
-        this.recreateMap();
-    };
-    onMeshesChanged = () => {
-        this.recreateMap();
-    };
-    async load() {
-        const _this = this;
-        this._loadingManagerProgress(LoadingState.IMPORTING);
-        try {
-            await this._updateMaterialCollections();
-            await this._updateMeshCollections();
-            await this.preloadAndReturnUrl().then(async function (url) {
-                if (url) {
-                    let fileLoader = new FileLoader(_this.renderer.loadingManager);
-                    await new Promise((resolve, reject) => {
-                        try {
-                            fileLoader.load(url, function (code) {
-                                _this.setCode(code, true);
-                                resolve();
-                            });
-                        }
-                        catch (err) {
-                            reject(err);
-                        }
-                    });
-                }
-                else {
-                    console.error("Could not load gridmap. No URL found!");
-                    _this.setCode("", true);
-                }
-            });
-            await this.$emit('item:objectUpdated', this);
-            this.state = ItemState.Finished;
-            this._loadingManagerProgress(LoadingState.DONE);
-        }
-        catch (err) {
-            console.error(err);
-            this.state = ItemState.Error;
-            this._loadingManagerProgress(LoadingState.DONE);
-        }
-    }
-    async _updateMaterialCollections() {
-        await this.materialCollectionList.update();
-    }
-    async _updateMeshCollections() {
-        await this.meshCollectionList.update();
-    }
-    _destroyMaterialCollections() {
-        if (this.materialCollectionList) {
-            this.materialCollectionList.$off("listfield:updated", this.onMaterialsChanged);
-            this.materialCollectionList.destroy();
-        }
-    }
-    _destroyMeshCollections() {
-        if (this.meshCollectionList) {
-            this.meshCollectionList.$off("listfield:updated", this.onMeshesChanged);
-            this.meshCollectionList.destroy();
-        }
-    }
-    async destroy() {
-        this._destroyMaterialCollections();
-        this._destroyMeshCollections();
-        this.map = null;
-        this.mapData = null;
-        this.code = "";
-        this.state = ItemState.Destroyed;
-    }
-    updateEvent(field, value, type) {
-        switch (field) {
-            case "MaterialCollection":
-                this._updateMaterialCollections().catch(function (err) {
-                    console.error(err);
-                });
-                break;
-            case "MeshCollections":
-                this._updateMeshCollections().catch(function (err) {
-                    console.error(err);
-                });
-                break;
-        }
-    }
-}
-//# sourceMappingURL=GridMapItem.js.map

package/dist/items/GridMapItem.js.map

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