minerender 2.0.0-alpha.8 → 2.0.0-alpha.9

package/dist/esm/renderer/MineRenderScene.js

@@ -54,19 +54,19 @@ export class MineRenderScene extends Scene {
             return this.add(...object);
         });
     }
-    addSceneObject(asset, objectSupplier, options, parent = this) {
-        var _a;
+    addSceneObject(asset, objectSupplier, _options, parent = this) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            console.log("addSceneObject");
+            console.log("addSceneObject", asset);
             console.log("parent", parent);
             this.dirty = true;
             // console.log(this.instanceCache)
-            if ((options === null || options === void 0 ? void 0 : options.instanceMeshes) && asset.key && ((_a = asset.key) === null || _a === void 0 ? void 0 : _a.assetType) === "models" /*TODO*/) {
+            const obj = yield objectSupplier();
+            if (((_a = obj === null || obj === void 0 ? void 0 : obj.options) === null || _a === void 0 ? void 0 : _a.instanceMeshes) && asset.key && ((_b = asset.key) === null || _b === void 0 ? void 0 : _b.assetType) === "models" /*TODO*/) {
                 // console.log("instanceMeshes + key")
                 // check for existing instances
                 const key = asset.key.serialize();
                 return this.instanceManager.getOrCreate(key, () => __awaiter(this, void 0, void 0, function* () {
-                    const obj = yield objectSupplier();
                     obj.scene = this;
                     yield obj.init();
                     parent.add(obj);
@@ -76,7 +76,6 @@ export class MineRenderScene extends Scene {
             }
             else {
                 // console.log("!instanceMeshes | !key")
-                const obj = yield objectSupplier();
                 obj.scene = this;
                 // await this.initAndAdd(obj);
                 yield obj.init();

package/dist/esm/renderer/MineRenderScene.js.map

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

package/dist/esm/renderer/SceneObject.js

@@ -27,6 +27,7 @@ export class SceneObject extends Object3D {
         this._isInstanced = false;
         this._instanceCounter = 0;
         this.options = merge({}, SceneObject.DEFAULT_OPTIONS, options !== null && options !== void 0 ? options : {});
+        console.log("SceneObject options", this.options);
     }
     set scene(scene) {
         if (!!this._scene)

package/dist/esm/renderer/SceneObject.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minerender",
-  "version": "2.0.0-alpha.8",
+  "version": "2.0.0-alpha.9",
   "description": "",
   "main": "./dist/cjs/index.js",
   "types": "./dist/cjs/index.d.ts",
@@ -81,6 +81,7 @@
     "@types/node": "^14.14.31",
     "@types/node-persist": "^3.1.1",
     "@types/three": "^0.125.2",
+    "@zip.js/zip.js": "^2.7.30",
     "ava": "^5.3.1",
     "browserify-fs": "^1.0.0",
     "browserify-incremental": "^3.1.1",
@@ -93,6 +94,7 @@
     "event-stream": "^4.0.1",
     "glob": "^7.1.6",
     "progress-stream": "^2.0.0",
+    "typedoc": "^0.25.3",
     "typescript": "^4.1.5"
   }
 }

package/src/UVMapper.ts

@@ -242,7 +242,7 @@ export class UVMapper {
     public static async createAtlas(originalModel: Model): Promise<Maybe<TextureAtlas>> {
         const textureMap: { [key: string]: Maybe<WrappedImage>; } = {};
         const metaMap: { [key: string]: Maybe<MinecraftTextureMeta>; } = {};
-        const model = { ...originalModel };
+        const model = {...originalModel};
         const isItemModel = !("elements" in model);
 
         console.debug(p, "Creating Atlas for", model.key);
@@ -259,7 +259,11 @@ export class UVMapper {
                     uniqueTextureNames.push(textureKey);
                     const assetKey = AssetKey.parse("textures", textureValue, model.key);
                     promises.push(ModelTextures.get(assetKey).then(asset => {
-                        textureMap[textureKey] = new WrappedImage(asset!);
+                        if (!asset) {
+                            console.warn(p, "Missing texture", assetKey)
+                            return;
+                        }
+                        textureMap[textureKey] = new WrappedImage(asset);
                     }));
                     promises.push(ModelTextures.getMeta(assetKey).then(meta => {
                         metaMap[textureKey] = meta;
@@ -292,7 +296,7 @@ export class UVMapper {
             }
             this.fillMissingTextureKeys(model.textures, sizes);
 
-            // console.log(sizes);
+            // console.log("sizes", sizes);
 
             const s = (Math.ceil(Math.sqrt(textureCount + 1))); // +1 for transparency
             const size = Math.ceil(s * maxWidth)
@@ -373,11 +377,11 @@ export class UVMapper {
                 }
             }
             const atlasImageData = image.toDataURL();
-            console.log(p,"Atlas Image for", model.key, atlasImageData);
+            console.log(p, "Atlas Image for", model.key, atlasImageData);
 
             this.fillMissingTextureKeys(model.textures, positions);
 
-            // console.log(positions);
+            // console.log("positions", positions);
 
             if (isItemModel) {
                 console.debug(p, "Generating item model for", model);
@@ -388,7 +392,7 @@ export class UVMapper {
                         model.elements.push(...ModelGenerator.generateItemModel(textureImage.data, layerName))
                     }
                 }
-                console.debug(p,"Item model elements",model.elements)
+                console.debug(p, "Item model elements", model.elements)
             }
 
             if (!model.elements) {

package/src/assets/AssetLoader.ts

@@ -24,23 +24,47 @@ export class AssetLoader {
 
     private static _SOURCES: AssetSourceReference[] = [];
 
-    public static addSource(key: string, source: AssetSource) {
+    public static addSource(key: string, source: AssetSource, override: boolean = true) {
+        if (override) {
+            const existing = this.removeSource(key);
+            if (existing) {
+                console.log(p, "Removed existing AssetSource", key);
+            }
+        }
+
         this._SOURCES.unshift({key, source});
         console.log(p, "Added AssetSource", key);
     }
 
+    public static removeSource(key: string): Maybe<AssetSource> {
+        const index = this._SOURCES.findIndex(s => s.key === key);
+        if (index != -1) {
+            const spliced = this._SOURCES.splice(index, 1);
+            if (spliced.length > 0) {
+                return spliced[0].source;
+            }
+        }
+        return undefined;
+    }
+
     static {
         this.addSource("mcassets", new HostedAssetSource(DEFAULT_ROOT));
     }
 
     public static async get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<Maybe<T>> {
+        console.log(this._SOURCES)
+        let promises: Promise<Maybe<T>>[] = [];
         for (const source of this._SOURCES) {
-            const result = await source.source.get<T>(key, parser);
-            if (result) {
-                return result;
-            }
+            promises.push(source.source.get<T>(key, parser));
         }
-        return undefined;
+        return Promise.all(promises).then(results => {
+            for (const result of results) {
+                if (result) {
+                    return result;
+                }
+            }
+            return undefined;
+        });
     }
 
 }

package/src/assets/source/archive/ArchiveAssetSource.ts

@@ -0,0 +1,124 @@
+import { AssetSource } from "../AssetSource";
+import { ArchiveProxy } from "./ArchiveProxy";
+import { ArchiveEntry } from "./ArchiveEntry";
+import { MinecraftAsset } from "../../../MinecraftAsset";
+import { AssetKey } from "../../AssetKey";
+import { AssetParser, ResponseParser } from "../parser";
+import { Maybe, prefix } from "../../../util";
+import { Requests } from "../../../request";
+import { HostedAssetSource } from "../HostedAssetSource";
+import { AssetLoader } from "../../AssetLoader";
+import { AxiosRequestConfig, AxiosResponse } from "axios";
+import { BrowserArchiveProxy } from "./BrowserArchiveProxy";
+
+const p = prefix("ArchiveAssetSource");
+
+export class ArchiveAssetSource extends AssetSource implements ArchiveProxy {
+
+    readonly _archiveProxy: ArchiveProxy;
+
+    constructor(archiveProxy: ArchiveProxy) {
+        super();
+        console.log(archiveProxy)
+        this._archiveProxy = archiveProxy;
+    }
+
+    public static blob(blob: Blob): ArchiveAssetSource {
+        return new ArchiveAssetSource(new BrowserArchiveProxy(blob));
+    }
+
+    public async getEntries(): Promise<ArchiveEntry[]> {
+        return this._archiveProxy.getEntries();
+    }
+
+    public async getEntry(path: string): Promise<Maybe<ArchiveEntry>> {
+        const entries = await this.getEntries();
+        return entries.find(e => e.filename === path);
+    }
+
+    async get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<Maybe<T>> {
+        const responseParser = HostedAssetSource.PARSER_MAP.get(parser as AssetParser) as ResponseParser<T>;
+
+        console.log("ArchiveAssetSource.get", key, parser);
+        let entries = (await this.getEntries());
+
+        const path = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
+        console.log(path);
+        const entry = await this.getEntry(path);
+        console.log(entry);
+        if (!entry) {
+            return undefined;
+        }
+
+        let blob = await entry.getData();
+        const url = URL.createObjectURL(blob);
+        console.log(url);
+        let req = {
+            url: url,
+        };
+        responseParser.config(req);
+        return Requests.genericRequest(req)
+            .then(response => {
+                if (response && response.data) {
+                    try {
+                        return responseParser.parse(response);
+                    } catch (e) {
+                        console.warn("Parser failed to process response", response, e);
+                        throw e;
+                    }
+                }
+                return undefined;
+            })
+            .catch(err => {
+                if (err.response) {
+                    let response = err.response as AxiosResponse;
+                    if (response.status === 404) {
+                        console.debug(p, key, "not found");
+                        return undefined;
+                    }
+                }
+                console.debug(p, "Failed to load", key, err?.message);
+                return undefined;
+            })
+    }
+
+    //TODO: abstract this
+    protected async load<T extends MinecraftAsset>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>> {
+        console.info(p, "Loading", key);
+        const url = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
+        console.debug(p, url);
+        let req: AxiosRequestConfig = {
+            url: url
+        };
+        parser.config(req);
+        // @ts-ignore
+        return await Requests.genericRequest(req)
+            .then(response => {
+                if (response && response.data) {
+                    try {
+                        return parser.parse(response);
+                    } catch (e) {
+                        console.warn("Parser failed to process response", response, e);
+                        throw e;
+                    }
+                }
+                return undefined;
+            })
+            .catch(err => {
+                if (err.response) {
+                    let response = err.response as AxiosResponse;
+                    if (response.status === 404) {
+                        console.debug(p, key, "not found");
+                        return undefined;
+                    }
+                }
+                console.debug(p, "Failed to load", key, err?.message);
+                return undefined;
+            })
+    }
+
+    public assetBasePath(key: AssetKey) {
+        return `${key.rootType !== undefined ? key.rootType + '/' : ''}${key.namespace !== undefined ? key.namespace + '/' : ''}${key.assetType !== undefined ? key.assetType + '/' : ''}`;
+    }
+
+}

package/src/assets/source/archive/ArchiveEntry.ts

@@ -0,0 +1,5 @@
+export interface ArchiveEntry {
+    filename: string;
+    directory: boolean;
+    getData(): Promise<Blob>;
+}

package/src/assets/source/archive/ArchiveProxy.ts

@@ -0,0 +1,7 @@
+import { ArchiveEntry } from "./ArchiveEntry";
+
+export interface ArchiveProxy {
+
+    getEntries(): Promise<ArchiveEntry[]>;
+
+}

package/src/assets/source/archive/BrowserArchiveProxy.ts

@@ -0,0 +1,27 @@
+import { ArchiveProxy } from "./ArchiveProxy";
+import { BlobReader, BlobWriter, ZipReader } from "@zip.js/zip.js";
+import { ArchiveEntry } from "./ArchiveEntry";
+
+export class BrowserArchiveProxy implements ArchiveProxy {
+
+    readonly _blob: Blob;
+    readonly _reader: ZipReader<Blob>;
+
+    constructor(blob: Blob) {
+        this._blob = blob;
+        this._reader = new ZipReader(new BlobReader(this._blob));
+    }
+
+    public async getEntries(): Promise<ArchiveEntry[]> {
+        return (await this._reader.getEntries()).map(e => {
+            return {
+                filename: e.filename,
+                directory: e.directory,
+                getData(): Promise<Blob> {
+                    return e.getData!(new BlobWriter())
+                }
+            }
+        })
+    }
+
+}

package/src/assets/source/archive/index.ts

@@ -0,0 +1,4 @@
+export * from "./ArchiveEntry";
+export * from "./ArchiveProxy";
+export * from "./BrowserArchiveProxy";
+export * from "./ArchiveAssetSource";

package/src/assets/source/index.ts

@@ -1,4 +1,5 @@
 // autogenerated
 export * from './AssetSource';
 export * from './HostedAssetSource';
-export * from './parser';
+export * from './parser';
+export * from './archive';

package/src/cache/Caching.ts

@@ -97,6 +97,15 @@ export class Caching {
     public static clear() {
         this.rawImageCache.invalidateAll();
         this.textureCache.invalidateAll();
+        this.imageDataCache.invalidateAll();
+        this.wrappedImageCache.invalidateAll();
+        this.canvasImageDataCache.invalidateAll();
+        this.materialCache.invalidateAll();
+        this.modelTextureAtlasCache.invalidateAll();
+        this.textureAssetCache.invalidateAll();
+        //TODO: add all
+        this.rawModelCache.invalidateAll();
+        this.mergedModelCache.invalidateAll();
     }
 
     public static end() {

package/src/model/scene/ModelObject.ts

@@ -37,7 +37,7 @@ export class ModelObject extends SceneObject {
     constructor(readonly originalModel: Model, options?: Partial<ModelObjectOptions>) {
         super(options);
         this.options = merge({}, ModelObject.DEFAULT_OPTIONS, options ?? {});
-        console.log(this.options);
+        console.log("ModelObject options", this.options);
     }
 
     async init(): Promise<void> {

package/src/renderer/MineRenderScene.ts

@@ -64,17 +64,17 @@ export class MineRenderScene extends Scene {
         return this.add(...object);
     }
 
-    async addSceneObject<A extends BasicMinecraftAsset, T extends SceneObject, O extends SceneObjectOptions>(asset: A, objectSupplier: () => T | Promise<T>, options?: Partial<O>, parent: Object3D = this): Promise<T | InstanceReference<T>> {
-        console.log("addSceneObject")
+    async addSceneObject<A extends BasicMinecraftAsset, T extends SceneObject, O extends SceneObjectOptions>(asset: A, objectSupplier: () => T | Promise<T>, _options?: Partial<O>, parent: Object3D = this): Promise<T | InstanceReference<T>> {
+        console.log("addSceneObject", asset)
         console.log("parent", parent)
         this.dirty = true;
         // console.log(this.instanceCache)
-        if (options?.instanceMeshes && asset.key &&  (<AssetKey>asset.key)?.assetType === "models"/*TODO*/) {
+        const obj = await objectSupplier();
+        if (obj?.options?.instanceMeshes && asset.key &&  (<AssetKey>asset.key)?.assetType === "models"/*TODO*/) {
             // console.log("instanceMeshes + key")
             // check for existing instances
             const key = asset.key.serialize();
             return this.instanceManager.getOrCreate(key, async () => {
-                const obj = await objectSupplier();
                 obj.scene = this;
                 await obj.init();
                 parent.add(obj);
@@ -83,7 +83,6 @@ export class MineRenderScene extends Scene {
             });
         } else {
             // console.log("!instanceMeshes | !key")
-            const obj = await objectSupplier();
             obj.scene = this;
             // await this.initAndAdd(obj);
             await obj.init();

package/src/renderer/SceneObject.ts

@@ -44,6 +44,7 @@ export class SceneObject extends Object3D implements Disposable, Instanceable, T
     constructor(options?: Partial<SceneObjectOptions>) {
         super();
         this.options = merge({}, SceneObject.DEFAULT_OPTIONS, options ?? {});
+        console.log("SceneObject options", this.options);
     }
 
     public set scene(scene: MineRenderScene) {