minerender 2.0.0-alpha.14 → 2.0.0-alpha.15

package/dist/cjs/world/MineRenderWorld.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MineRenderWorld = void 0;
 const three_1 = require("three");
@@ -38,50 +29,44 @@ class MineRenderWorld {
         this.validatePosBounds(posOrX);
         return chunk.getBlockAt(posOrX);
     }
-    setBlockAt(posOrX, yOrBlock, z, block) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (typeof posOrX == "number") {
-                return this.setBlockAt(new three_1.Vector3(posOrX, yOrBlock, z), block);
-            }
-            if ((0, Model_1.isTripleArray)(posOrX)) {
-                return this.setBlockAt(new three_1.Vector3(posOrX[0], posOrX[1], posOrX[2]), yOrBlock);
-            }
-            this.validatePosBounds(posOrX);
-            const chunk = this.getOrCreateChunkAt(posOrX);
-            return chunk.setBlockAt(posOrX, yOrBlock);
-        });
+    async setBlockAt(posOrX, yOrBlock, z, block) {
+        if (typeof posOrX == "number") {
+            return this.setBlockAt(new three_1.Vector3(posOrX, yOrBlock, z), block);
+        }
+        if ((0, Model_1.isTripleArray)(posOrX)) {
+            return this.setBlockAt(new three_1.Vector3(posOrX[0], posOrX[1], posOrX[2]), yOrBlock);
+        }
+        this.validatePosBounds(posOrX);
+        const chunk = this.getOrCreateChunkAt(posOrX);
+        return chunk.setBlockAt(posOrX, yOrBlock);
     }
-    placeMultiBlock(multiblock, useBatches = true, executor = new BatchedExecutor_1.BatchedExecutor()) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // preload blockstates
-            const keys = new Set(multiblock.blocks.map(block => AssetKey_1.AssetKey.parse("blockstates", block.type)));
-            yield BlockStates_1.BlockStates.getAll(keys);
-            const place = (block) => __awaiter(this, void 0, void 0, function* () {
-                if (useBatches && typeof executor !== "undefined") {
-                    yield new Promise((resolve, reject) => {
-                        executor.submit(() => {
-                            this.setBlockAt(block.position, block).then(resolve).catch(reject);
-                        });
+    async placeMultiBlock(multiblock, useBatches = true, executor = new BatchedExecutor_1.BatchedExecutor()) {
+        // preload blockstates
+        const keys = new Set(multiblock.blocks.map(block => AssetKey_1.AssetKey.parse("blockstates", block.type)));
+        await BlockStates_1.BlockStates.getAll(keys);
+        const place = async (block) => {
+            if (useBatches && typeof executor !== "undefined") {
+                await new Promise((resolve, reject) => {
+                    executor.submit(() => {
+                        this.setBlockAt(block.position, block).then(resolve).catch(reject);
                     });
-                }
-                else {
-                    yield this.setBlockAt(block.position, block);
-                }
-            });
-            for (let block of multiblock.blocks) {
-                yield place(block);
+                });
             }
-        });
-    }
-    clear() {
-        return __awaiter(this, void 0, void 0, function* () {
-            console.log("CHUNKS", this._chunks);
-            for (let chunk of this._chunks.values()) {
-                console.log("dispose chunk", chunk);
-                yield (chunk === null || chunk === void 0 ? void 0 : chunk.dispose());
+            else {
+                await this.setBlockAt(block.position, block);
             }
-            this._chunks.clear();
-        });
+        };
+        for (let block of multiblock.blocks) {
+            await place(block);
+        }
+    }
+    async clear() {
+        console.log("CHUNKS", this._chunks);
+        for (let chunk of this._chunks.values()) {
+            console.log("dispose chunk", chunk);
+            await chunk?.dispose();
+        }
+        this._chunks.clear();
     }
     getOrCreateChunkAt(pos) {
         const key = this.worldPosToChunkKey(pos);

package/dist/cjs/world/MineRenderWorld.js.map

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

package/dist/esm/UVMapper.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { Float32BufferAttribute, Vector2 } from "three";
 import { CUBE_FACES, CubeFace } from "./CubeFace";
 import { ModelTextures } from "./assets/ModelTextures";
@@ -131,12 +122,10 @@ export class UVMapper {
     static facesToUv(faces, originalTextureSize, actualTextureSize) {
         return new Float32BufferAttribute(this.facesToUvArray(faces, originalTextureSize, actualTextureSize), 2);
     }
-    static getAtlas(model) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const keyStr = model.key.serialize();
-            return Caching.modelTextureAtlasCache.get(keyStr, k => {
-                return this.createAtlas(model);
-            });
+    static async getAtlas(model) {
+        const keyStr = model.key.serialize();
+        return Caching.modelTextureAtlasCache.get(keyStr, k => {
+            return this.createAtlas(model);
         });
     }
     static fillMissingTextureKeys(textures, target) {
@@ -204,210 +193,206 @@ export class UVMapper {
         }
         return [tl, tr, bl, br];
     }
-    static createAtlas(originalModel) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const textureMap = {};
-            const metaMap = {};
-            const model = Object.assign({}, originalModel);
-            const isItemModel = !("elements" in model);
-            console.debug(p, "Creating Atlas for", model.key);
-            if (model.textures) {
-                const promises = [];
-                const uniqueTextureNames = []; // TODO: make these actually unique
-                const textureReferences = {};
-                for (let textureKey in model.textures) {
-                    let textureValue = model.textures[textureKey];
-                    if (textureValue.startsWith("#")) {
-                        textureReferences[textureKey] = textureValue.substr(1);
+    static async createAtlas(originalModel) {
+        const textureMap = {};
+        const metaMap = {};
+        const model = { ...originalModel };
+        const isItemModel = !("elements" in model);
+        console.debug(p, "Creating Atlas for", model.key);
+        if (model.textures) {
+            const promises = [];
+            const uniqueTextureNames = []; // TODO: make these actually unique
+            const textureReferences = {};
+            for (let textureKey in model.textures) {
+                let textureValue = model.textures[textureKey];
+                if (textureValue.startsWith("#")) {
+                    textureReferences[textureKey] = textureValue.substr(1);
+                }
+                else {
+                    uniqueTextureNames.push(textureKey);
+                    const assetKey = AssetKey.parse("textures", textureValue, model.key);
+                    promises.push(ModelTextures.get(assetKey).then(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;
+                    }));
+                }
+            }
+            await Promise.all(promises);
+            const textureCount = uniqueTextureNames.length;
+            console.debug(p, "Creating Atlas for", textureCount, "textures");
+            // console.log(model.textures)
+            this.fillMissingTextureKeys(model.textures, textureMap);
+            this.fillMissingTextureKeys(model.textures, metaMap);
+            const sizes = {};
+            // Find largest texture dimensions
+            let maxWidth = 0;
+            let maxHeight = 0;
+            for (let textureKey of uniqueTextureNames) {
+                let texture = textureMap[textureKey];
+                if (!texture)
+                    continue;
+                sizes[textureKey] = [texture.frameWidth, texture.frameHeight];
+                if (texture.frameWidth > maxWidth) {
+                    maxWidth = texture.width;
+                }
+                if (texture.frameHeight > maxHeight) {
+                    maxHeight = texture.frameHeight;
+                }
+            }
+            this.fillMissingTextureKeys(model.textures, sizes);
+            // console.log("sizes", sizes);
+            const s = (Math.ceil(Math.sqrt(textureCount + 1))); // +1 for transparency
+            const size = Math.ceil(s * maxWidth);
+            console.debug(p, "Atlas size:", size);
+            // console.log("size: " + size);
+            const squaredSize = size * size;
+            const missing = await ImageLoader.getData("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQMAAACQp+OdAAAABlBMVEX/AP8AAACfphTyAAAAFUlEQVQoz2MIhQKGVVAwKjIqQrwIAHRz/wFI17TEAAAAAElFTkSuQmCC");
+            const empty = await ImageLoader.getData("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQMAAACQp+OdAAAAA1BMVEUAAACnej3aAAAAAXRSTlMAQObYZgAAAA5JREFUKM9jGAWjgAIAAAJAAAFSSwuTAAAAAElFTkSuQmCC");
+            //TODO: add transparent texture and use as default uv
+            // Create image
+            const image = new CanvasImage(size, size);
+            image.putData(missing, 0, 0); // fill with invalid texture image
+            image.putData(empty, 0, 0, 0, 0, maxWidth, maxWidth); // add transparent section in the top-left corner
+            const positions = {};
+            let hasTransparency = false;
+            let hasAnimation = false;
+            const animatorFunctions = {};
+            // Draw all textures onto a single image
+            let tx = 1; // start one over to leave room for the transparent space
+            let ty = 0;
+            for (let textureIndex = 0; textureIndex < uniqueTextureNames.length; textureIndex++) {
+                let textureKey = uniqueTextureNames[textureIndex];
+                let texture = textureMap[textureKey];
+                let x = tx * maxWidth;
+                let y = ty * maxWidth;
+                if (texture) {
+                    console.log(texture);
+                    positions[textureKey] = [x, y];
+                    image.putData(texture.data, x, y, 0, 0, maxWidth, maxWidth);
+                    // console.log(image.toDataURL())
+                    //TODO: only first frame for animated textures
+                    if (texture.hasTransparency) {
+                        hasTransparency = true;
                     }
-                    else {
-                        uniqueTextureNames.push(textureKey);
-                        const assetKey = AssetKey.parse("textures", textureValue, model.key);
-                        promises.push(ModelTextures.get(assetKey).then(asset => {
-                            if (!asset) {
-                                console.warn(p, "Missing texture", assetKey);
-                                return;
+                    console.log("texture", textureKey, "animated", texture.animated);
+                    if (texture.animated) {
+                        hasAnimation = true;
+                        const meta = metaMap[textureKey];
+                        const frameTime = meta?.animation?.frametime ?? 1;
+                        console.log(meta);
+                        console.log(frameTime);
+                        let t = 0;
+                        let f = 0;
+                        animatorFunctions[textureKey] = () => {
+                            // console.log("animating", textureKey)
+                            //TODO: use mcmeta for frame count, delays, etc
+                            //TODO: interpolate?
+                            if (t++ >= frameTime) {
+                                t = 0;
+                                const frames = meta?.animation?.frames;
+                                const frame = frames ? frames[f] : f; //TODO: frame.time support
+                                image.putData(texture.getFrameSectionData(frame), x, y, 0, 0, maxWidth, maxWidth);
+                                f++;
+                                if (f >= (frames ? frames.length : texture.frameCount)) {
+                                    f = 0;
+                                }
                             }
-                            textureMap[textureKey] = new WrappedImage(asset);
-                        }));
-                        promises.push(ModelTextures.getMeta(assetKey).then(meta => {
-                            metaMap[textureKey] = meta;
-                        }));
+                        };
                     }
                 }
-                yield Promise.all(promises);
-                const textureCount = uniqueTextureNames.length;
-                console.debug(p, "Creating Atlas for", textureCount, "textures");
-                // console.log(model.textures)
-                this.fillMissingTextureKeys(model.textures, textureMap);
-                this.fillMissingTextureKeys(model.textures, metaMap);
-                const sizes = {};
-                // Find largest texture dimensions
-                let maxWidth = 0;
-                let maxHeight = 0;
-                for (let textureKey of uniqueTextureNames) {
-                    let texture = textureMap[textureKey];
-                    if (!texture)
-                        continue;
-                    sizes[textureKey] = [texture.frameWidth, texture.frameHeight];
-                    if (texture.frameWidth > maxWidth) {
-                        maxWidth = texture.width;
-                    }
-                    if (texture.frameHeight > maxHeight) {
-                        maxHeight = texture.frameHeight;
-                    }
+                tx++;
+                if (tx >= s) {
+                    tx = 0;
+                    ty++;
                 }
-                this.fillMissingTextureKeys(model.textures, sizes);
-                // console.log("sizes", sizes);
-                const s = (Math.ceil(Math.sqrt(textureCount + 1))); // +1 for transparency
-                const size = Math.ceil(s * maxWidth);
-                console.debug(p, "Atlas size:", size);
-                // console.log("size: " + size);
-                const squaredSize = size * size;
-                const missing = yield ImageLoader.getData("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQMAAACQp+OdAAAABlBMVEX/AP8AAACfphTyAAAAFUlEQVQoz2MIhQKGVVAwKjIqQrwIAHRz/wFI17TEAAAAAElFTkSuQmCC");
-                const empty = yield ImageLoader.getData("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABAAQMAAACQp+OdAAAAA1BMVEUAAACnej3aAAAAAXRSTlMAQObYZgAAAA5JREFUKM9jGAWjgAIAAAJAAAFSSwuTAAAAAElFTkSuQmCC");
-                //TODO: add transparent texture and use as default uv
-                // Create image
-                const image = new CanvasImage(size, size);
-                image.putData(missing, 0, 0); // fill with invalid texture image
-                image.putData(empty, 0, 0, 0, 0, maxWidth, maxWidth); // add transparent section in the top-left corner
-                const positions = {};
-                let hasTransparency = false;
-                let hasAnimation = false;
-                const animatorFunctions = {};
-                // Draw all textures onto a single image
-                let tx = 1; // start one over to leave room for the transparent space
-                let ty = 0;
-                for (let textureIndex = 0; textureIndex < uniqueTextureNames.length; textureIndex++) {
-                    let textureKey = uniqueTextureNames[textureIndex];
-                    let texture = textureMap[textureKey];
-                    let x = tx * maxWidth;
-                    let y = ty * maxWidth;
-                    if (texture) {
-                        console.log(texture);
-                        positions[textureKey] = [x, y];
-                        image.putData(texture.data, x, y, 0, 0, maxWidth, maxWidth);
-                        // console.log(image.toDataURL())
-                        //TODO: only first frame for animated textures
-                        if (texture.hasTransparency) {
-                            hasTransparency = true;
-                        }
-                        console.log("texture", textureKey, "animated", texture.animated);
-                        if (texture.animated) {
-                            hasAnimation = true;
-                            const meta = metaMap[textureKey];
-                            const frameTime = (_b = (_a = meta === null || meta === void 0 ? void 0 : meta.animation) === null || _a === void 0 ? void 0 : _a.frametime) !== null && _b !== void 0 ? _b : 1;
-                            console.log(meta);
-                            console.log(frameTime);
-                            let t = 0;
-                            let f = 0;
-                            animatorFunctions[textureKey] = () => {
-                                var _a;
-                                // console.log("animating", textureKey)
-                                //TODO: use mcmeta for frame count, delays, etc
-                                //TODO: interpolate?
-                                if (t++ >= frameTime) {
-                                    t = 0;
-                                    const frames = (_a = meta === null || meta === void 0 ? void 0 : meta.animation) === null || _a === void 0 ? void 0 : _a.frames;
-                                    const frame = frames ? frames[f] : f; //TODO: frame.time support
-                                    image.putData(texture.getFrameSectionData(frame), x, y, 0, 0, maxWidth, maxWidth);
-                                    f++;
-                                    if (f >= (frames ? frames.length : texture.frameCount)) {
-                                        f = 0;
-                                    }
-                                }
-                            };
-                        }
-                    }
-                    tx++;
-                    if (tx >= s) {
-                        tx = 0;
-                        ty++;
+            }
+            const atlasImageData = image.toDataURL();
+            console.log(p, "Atlas Image for", model.key, atlasImageData);
+            this.fillMissingTextureKeys(model.textures, positions);
+            // console.log("positions", positions);
+            if (isItemModel) {
+                console.debug(p, "Generating item model for", model);
+                model.elements = [];
+                for (let layerName of ModelGenerator.ITEM_LAYERS) {
+                    const textureImage = textureMap[layerName];
+                    if (textureImage) {
+                        model.elements.push(...ModelGenerator.generateItemModel(textureImage.data, layerName));
                     }
                 }
-                const atlasImageData = image.toDataURL();
-                console.log(p, "Atlas Image for", model.key, atlasImageData);
-                this.fillMissingTextureKeys(model.textures, positions);
-                // console.log("positions", positions);
-                if (isItemModel) {
-                    console.debug(p, "Generating item model for", model);
-                    model.elements = [];
-                    for (let layerName of ModelGenerator.ITEM_LAYERS) {
-                        const textureImage = textureMap[layerName];
-                        if (textureImage) {
-                            model.elements.push(...ModelGenerator.generateItemModel(textureImage.data, layerName));
-                        }
+                console.debug(p, "Item model elements", model.elements);
+            }
+            if (!model.elements) {
+                //TODO: default elements
+            }
+            // Adjust UV positions
+            if (model.elements) {
+                for (let elementIndex = 0; elementIndex < model.elements.length; elementIndex++) {
+                    let element = model.elements[elementIndex];
+                    let uv = [];
+                    // Set default uvs to missing texture
+                    for (let i = 0; i < CUBE_FACES.length; i++) {
+                        this.setCubeFaceUvInArray(uv, i * 4, [0, 0, 8 / size, 8 / size]);
                     }
-                    console.debug(p, "Item model elements", model.elements);
-                }
-                if (!model.elements) {
-                    //TODO: default elements
-                }
-                // Adjust UV positions
-                if (model.elements) {
-                    for (let elementIndex = 0; elementIndex < model.elements.length; elementIndex++) {
-                        let element = model.elements[elementIndex];
-                        let uv = [];
-                        // Set default uvs to missing texture
-                        for (let i = 0; i < CUBE_FACES.length; i++) {
-                            this.setCubeFaceUvInArray(uv, i * 4, [0, 0, 8 / size, 8 / size]);
+                    for (let faceIndex = 0; faceIndex < CUBE_FACES.length; faceIndex++) {
+                        let faceName = CUBE_FACES[faceIndex];
+                        // console.log(faceName)
+                        let face = element.faces[faceName];
+                        if (!face) {
+                            // set uv transparent
+                            this.setCubeFaceUvInArray(uv, faceIndex * 4, [0, 1, 8 / size, (size - 8) / size]);
+                            continue;
                         }
-                        for (let faceIndex = 0; faceIndex < CUBE_FACES.length; faceIndex++) {
-                            let faceName = CUBE_FACES[faceIndex];
-                            // console.log(faceName)
-                            let face = element.faces[faceName];
-                            if (!face) {
-                                // set uv transparent
-                                this.setCubeFaceUvInArray(uv, faceIndex * 4, [0, 1, 8 / size, (size - 8) / size]);
-                                continue;
-                            }
-                            if (!face.uv) {
-                                face.uv = this.getFallbackUv(element, faceName);
-                            }
-                            let faceTexture = face.texture;
-                            let texPosition;
-                            let texSize;
-                            if (faceTexture) {
-                                faceTexture = faceTexture.substr(1); // remove #
-                                texPosition = positions[faceTexture] || [0, 0];
-                                texSize = sizes[faceTexture] || [16, 16];
-                            }
-                            let texPosV = new Vector2(texPosition[0], texPosition[1]);
-                            const [tl, tr, bl, br] = this.expandAndRotateMcUvs(face.uv, face.rotation, texSize[0], texSize[1]);
-                            // move to atlas position
-                            tl.add(texPosV);
-                            tr.add(texPosV);
-                            bl.add(texPosV);
-                            br.add(texPosV);
-                            // divide to 0-1
-                            tl.divideScalar(size);
-                            tr.divideScalar(size);
-                            bl.divideScalar(size);
-                            br.divideScalar(size);
-                            // flip y coordinates
-                            tl.y = 1 - tl.y;
-                            tr.y = 1 - tr.y;
-                            bl.y = 1 - bl.y;
-                            br.y = 1 - br.y;
-                            //TODO: figure out how uv lock works
-                            let uvs = [tl, tr, bl, br];
-                            // console.log("uvs", uvs);
-                            this.setFaceUvInArrayV(uv, faceIndex * 4, uvs);
+                        if (!face.uv) {
+                            face.uv = this.getFallbackUv(element, faceName);
+                        }
+                        let faceTexture = face.texture;
+                        let texPosition;
+                        let texSize;
+                        if (faceTexture) {
+                            faceTexture = faceTexture.substr(1); // remove #
+                            texPosition = positions[faceTexture] || [0, 0];
+                            texSize = sizes[faceTexture] || [16, 16];
                         }
-                        element.mappedUv = uv;
+                        let texPosV = new Vector2(texPosition[0], texPosition[1]);
+                        const [tl, tr, bl, br] = this.expandAndRotateMcUvs(face.uv, face.rotation, texSize[0], texSize[1]);
+                        // move to atlas position
+                        tl.add(texPosV);
+                        tr.add(texPosV);
+                        bl.add(texPosV);
+                        br.add(texPosV);
+                        // divide to 0-1
+                        tl.divideScalar(size);
+                        tr.divideScalar(size);
+                        bl.divideScalar(size);
+                        br.divideScalar(size);
+                        // flip y coordinates
+                        tl.y = 1 - tl.y;
+                        tr.y = 1 - tr.y;
+                        bl.y = 1 - bl.y;
+                        br.y = 1 - br.y;
+                        //TODO: figure out how uv lock works
+                        let uvs = [tl, tr, bl, br];
+                        // console.log("uvs", uvs);
+                        this.setFaceUvInArrayV(uv, faceIndex * 4, uvs);
                     }
+                    element.mappedUv = uv;
                 }
-                else {
-                    //TODO: item model
-                }
-                return new TextureAtlas(model, image, sizes, positions, hasAnimation, animatorFunctions, hasTransparency);
             }
             else {
-                console.warn(p, "Model does not have any textures", model);
+                //TODO: item model
             }
-            return undefined;
-        });
+            return new TextureAtlas(model, image, sizes, positions, hasAnimation, animatorFunctions, hasTransparency);
+        }
+        else {
+            console.warn(p, "Model does not have any textures", model);
+        }
+        return undefined;
     }
 }
 // Based on net.minecraft.client.renderer.block.model.BlockFaceUV