minerender 2.0.0-alpha.8 → 2.1.0-alpha.0

package/src/entity/index.ts

@@ -1,3 +0,0 @@
-// autogenerated
-export * from './EntityModel';
-export * from './scene';

package/src/entity/scene/EntityObject.ts

@@ -1,138 +0,0 @@
-import { SceneObject } from "../../renderer/SceneObject";
-import { BlockState, BlockStateVariant, BlockStateVariants, MultipartCondition } from "../../model/block/BlockState";
-import { SceneObjectOptions } from "../../renderer/SceneObjectOptions";
-import { Caching } from "../../cache/Caching";
-import { Models } from "../../assets/Models";
-import { Assets, DEFAULT_NAMESPACE } from "../../assets/Assets";
-import merge from "ts-deepmerge";
-import { AxesHelper, Euler, Matrix4, Object3D, Vector3 } from "three";
-import { Maybe, toRadians } from "../../util/util";
-import { addWireframeToMesh, addWireframeToObject, applyElementRotation, applyGenericRotation, applyModelPartRotation } from "../../util/model";
-import { ModelTextures } from "../../assets/ModelTextures";
-import { AssetKey } from "../../assets/AssetKey";
-import { ExtractableImageData } from "../../ExtractableImageData";
-import { Materials } from "../../Materials";
-import { MinecraftCubeTexture } from "../../MinecraftCubeTexture";
-import * as THREE from "three";
-import { Ticker } from "../../Ticker";
-import { EntityModel } from "../EntityModel";
-
-export class EntityObject extends SceneObject {
-
-    public readonly isEntityObject: true = true;
-
-    public static readonly DEFAULT_OPTIONS: EntityObjectOptions = merge({}, SceneObject.DEFAULT_OPTIONS, <EntityObjectOptions>{});
-    public readonly options: EntityObjectOptions;
-
-    private imageData?: ExtractableImageData;
-
-    private meshesCreated: boolean = false;
-
-    constructor(readonly entity: EntityModel, options?: Partial<EntityObjectOptions>) {
-        super();
-        this.options = merge({}, SceneObject.DEFAULT_OPTIONS, options ?? {});
-        //TODO
-    }
-
-    async init(): Promise<void> {
-        this.createMeshes();
-        await this.applyTextures();
-    }
-
-    dispose() {
-        super.dispose();
-    }
-
-    protected async loadTextures(): Promise<void> {
-        this.imageData = await ModelTextures.get(new AssetKey(
-            this.entity.key?.namespace ?? DEFAULT_NAMESPACE,
-            this.entity.key!.path, //TODO: texture may differ from entity name; most of them are in subdirectories for multiple variants etc.
-            "textures",
-            "entity",
-            "assets",
-            ".png"
-        ))
-    }
-
-    //TODO: abstract this, since extracted model data can be used for entities, blocks, players
-    protected createMeshes(force: boolean = false) {
-        if (this.meshesCreated && !force) return;
-
-        const mat = Materials.MISSING_TEXTURE;
-
-        //TODO: don't know which parts are actually meant to be rendered atm
-        for (let partName in this.entity.parts) {
-            const part = this.entity.parts[partName];
-            const texture = new MinecraftCubeTexture(part.textureOffsetU, part.textureOffsetV, part.textureWidth, part.textureHeight);
-            const partAnchor = new Object3D();
-            partAnchor.position.x = part.pivotX;
-            partAnchor.position.y = part.pivotY;
-            partAnchor.position.z = part.pivotZ;
-            for (let cube of part.cubes) {
-                const w = cube.maxX - cube.minX;
-                const h = cube.maxY - cube.minY;
-                const l = cube.maxZ - cube.minZ;
-                const uv = texture.toUvArray(w, h, l);
-
-                //TODO: mirror
-                // MC does it by flipping min and max X; might be easier than moving around all face UVs
-
-                const cubeGeo = this._getBoxGeometryForDimensionsAndUv(w, h, l, uv).clone();
-
-                cubeGeo.applyMatrix4(new THREE.Matrix4().makeTranslation(w / 2, h / 2, l / 2));
-                cubeGeo.applyMatrix4(new THREE.Matrix4().makeTranslation(cube.minX, cube.minY, cube.minZ));
-
-                applyModelPartRotation(part, cubeGeo);
-
-
-                // TODO: merge parts
-                // const mesh = this.createAndAddMesh(partName, undefined, cubeGeo, mat);
-                const mesh = this.createMesh(partName, cubeGeo, mat);
-                partAnchor.add(mesh);
-                if (this.options.wireframe) {
-                    addWireframeToMesh(cubeGeo, mesh);
-                }
-            }
-            this.add(partAnchor);
-        }
-
-        //TODO
-
-        this.meshesCreated = true;
-    }
-
-    protected async applyTextures() {
-
-        const textureAsset = await ModelTextures.preload(new AssetKey(
-            this.entity.key?.namespace ?? DEFAULT_NAMESPACE,
-            this.entity.key!.path,
-            "textures",
-            "entity",
-            "assets",
-            ".png"
-        ));
-        // if (this.atlas!.model.textures) {
-        //     for (let textureKey in this.atlas!.model.textures) {
-        //         let asset = this.textureMap[textureKey];
-        //         if (asset) {
-        //TODO: transparency
-        if (textureAsset) {
-            let mat = Materials.getImage({ texture: { src: textureAsset.src! } })
-            this.iterateAllMeshes(mesh => {
-                mesh.material = mat;
-            });
-        }
-        //         }
-        //     }
-        // }
-    }
-
-
-}
-
-export interface EntityObjectOptions extends SceneObjectOptions {
-}
-
-export function isEntityObject(obj: any): obj is EntityObject {
-    return (<EntityObject>obj).isEntityObject;
-}

package/src/entity/scene/index.ts

@@ -1,2 +0,0 @@
-// autogenerated
-export * from './EntityObject';

package/src/error/MineRenderError.ts

@@ -1,11 +0,0 @@
-// https://stackoverflow.com/a/60323233/6257838
-export class MineRenderError extends Error {
-    constructor(msg) {
-        super(msg);
-        Object.setPrototypeOf(this, MineRenderError.prototype);
-    }
-
-    get name(): string {
-        return 'MineRenderError';
-    }
-}

package/src/error/index.ts

@@ -1,2 +0,0 @@
-// autogenerated
-export * from './MineRenderError';

package/src/gui/index.ts

@@ -1,2 +0,0 @@
-// autogenerated
-export * from './scene';

package/src/gui/scene/GuiObject.ts

@@ -1,13 +0,0 @@
-import { Renderer, RendererOptions } from "../../renderer/Renderer";
-import { SceneObject } from "../../renderer/SceneObject";
-import { SceneObjectOptions } from "../../renderer/SceneObjectOptions";
-
-export class GuiObject extends SceneObject {
-
-    //TODO
-
-}
-
-export interface GuiObjectOptions extends SceneObjectOptions {
-
-}

package/src/gui/scene/index.ts

@@ -1,2 +0,0 @@
-// autogenerated
-export * from './GuiObject';

package/src/image/ImageLoader.ts

@@ -1,161 +0,0 @@
-import { CompatImage, createCanvas, createImage } from "../canvas/CanvasCompat";
-import { serializeImageKey } from "../cache/CacheKey";
-import { Caching } from "../cache/Caching";
-import { AxiosResponse } from "axios";
-import imageSize from "image-size";
-import { Requests } from "../request/Requests";
-import { SSAOPassOUTPUT } from "three/examples/jsm/postprocessing/SSAOPass";
-import { WrappedImage } from "../WrappedImage";
-import { ExtractableImageData } from "../ExtractableImageData";
-import { Buffer } from "buffer";
-import { prefix } from "../util/log";
-
-const p = prefix("ImageLoader");
-
-export interface ImageInfo {
-    src?: string;
-    width: number;
-    height: number;
-    type?: string;
-    data: Buffer;
-}
-
-export class ImageLoader {
-
-    protected static _createImage(): CompatImage {
-        //TODO: probably needs cross-origin stuff set for browser
-        return createImage();
-    }
-
-    public static async loadAsync(src: string): Promise<CompatImage> {
-        return new Promise<CompatImage>((resolve, reject) => {
-            const image = this._createImage();
-            image.src = src;
-            image.onload = () => resolve(image);
-            image.onerror = (err: Error) => reject(err);
-        });
-    }
-
-    public static loadElement(src: string, onload?: () => void, onerr?: (err: Error) => void): CompatImage {
-        const image = this._createImage();
-        image.src = src;
-        if (onload)
-            image.onload = onload;
-        if (onerr)
-            image.onerror = onerr;
-        return image;
-    }
-
-    public static async loadData(src: string): Promise<ImageData> {
-        console.debug(p, "loadData", src);
-        return await this.infoToData(await this.getInfo(src));
-    }
-
-    public static async loadCanvasData(src: string): Promise<ExtractableImageData> {
-        return await this.infoToCanvasData(await this.getInfo(src));
-    }
-
-    public static async infoToCanvasData(info: ImageInfo): Promise<ExtractableImageData> {
-        const image = await ImageLoader.loadAsync(info.src!);
-        const canvas = createCanvas(info.width, info.height);
-        const context = canvas.getContext("2d") as CanvasRenderingContext2D;
-        context.drawImage(image as CanvasImageSource, 0, 0);
-        return {
-            data: context,
-            width: info.width,
-            height: info.height
-        }
-
-        // return new ImageData(new Uint8ClampedArray(info.data), info.width, info.height)
-    }
-
-
-    public static async infoToData(info: ImageInfo): Promise<ImageData> {
-        const image = await ImageLoader.loadAsync(info.src!);
-        const canvas = createCanvas(info.width, info.height);
-        const context = canvas.getContext("2d") as CanvasRenderingContext2D;
-        context.drawImage(image as CanvasImageSource, 0, 0);
-        return context.getImageData(0, 0, canvas.width, canvas.height);
-
-
-        // return new ImageData(new Uint8ClampedArray(info.data), info.width, info.height)
-    }
-
-    public static async getData(src: string): Promise<ImageData> {
-        const keyStr = serializeImageKey({ src });
-        return (await Caching.imageDataCache.get(keyStr, k => {
-            return ImageLoader.loadData(src);
-        }))!;
-    }
-
-    public static async getCanvasData(src: string): Promise<ExtractableImageData> {
-        const keyStr = serializeImageKey({ src });
-        return (await Caching.canvasImageDataCache.get(keyStr, k => {
-            return ImageLoader.loadCanvasData(src);
-        }))!;
-    }
-
-    public static async processResponse(response: Partial<AxiosResponse>): Promise<ImageInfo> {
-        const src = response.config!.url;
-        const data = Buffer.from(response.data!);
-        const { width, height, type } = imageSize(data);
-        return {
-            src,
-            width: width || 0,
-            height: height || 0,
-            type,
-            data: data
-        }
-    }
-
-
-    public static async loadInfo(src: string): Promise<ImageInfo> {
-
-        // axios doesn't like data urls
-        if (src.startsWith("data:image/png;base64")) {
-            return this.processResponse({
-                config: {
-                    url: src
-                },
-                data: Buffer.from(src.substr("data:image/png;base64,".length), "base64")
-            })
-        }
-
-        //TODO: figure out a way to allow data/base64 requests
-        return Requests.genericRequest({
-            url: src,
-            responseType: "arraybuffer"
-        })
-            .then(this.processResponse)
-            .catch(err => {
-                return {
-                    src,
-                    width: 0,
-                    height: 0,
-                    type: undefined,
-                    data: Buffer.from([0])
-                };
-            });
-    }
-
-    public static async getInfo(src: string): Promise<ImageInfo> {
-        const keyStr = serializeImageKey({ src });
-        return (await Caching.rawImageCache.get(keyStr, k => {
-            return ImageLoader.loadInfo(src);
-        }))!;
-    }
-
-    public static async loadWrapped(src: string): Promise<WrappedImage> {
-        const data = await this.getCanvasData(src);
-        return new WrappedImage(data);
-    }
-
-    public static async getWrapped(src: string): Promise<WrappedImage> {
-        const keyStr = serializeImageKey({ src });
-        return (await Caching.wrappedImageCache.get(keyStr, k => {
-            return ImageLoader.loadWrapped(src);
-        }))!;
-    }
-
-
-}

package/src/image/index.ts

@@ -1,2 +0,0 @@
-// autogenerated
-export * from './ImageLoader';

package/src/index.ts

@@ -1,68 +0,0 @@
-// autogenerated
-export * from './AnimatorFunction';
-export * from './Axis';
-export * from './CubeFace';
-export * from './Disposable';
-export * from './Env';
-export * from './ExtractableImageData';
-export * from './Geometries';
-export * from './ListAsset';
-export * from './Materials';
-export * from './Meshes';
-export * from './MinecraftAsset';
-export * from './MinecraftCubeTexture';
-export * from './MinecraftTextureMeta';
-export * from './SceneStats';
-export * from './Serializable';
-export * from './Ticker';
-export * from './TintColors';
-export * from './Transformable';
-export * from './UVMapper';
-export * from './WrappedImage';
-export * from './assets';
-export * from './bedrock';
-export * from './cache';
-export * from './canvas';
-export * from './entity';
-export * from './error';
-export * from './gui';
-export * from './image';
-export * from './inspector';
-export * from './instance';
-export * from './model';
-export * from './nbt';
-export * from './renderer';
-export * from './request';
-export * from './skin';
-export * from './texture';
-export * from './three';
-export * from './util';
-export * from './world';
-export * from './assets';
-export * from './assets/source';
-export * from './assets/source/parser';
-export * from './bedrock';
-export * from './cache';
-export * from './canvas';
-export * from './entity';
-export * from './entity/scene';
-export * from './error';
-export * from './gui';
-export * from './gui/scene';
-export * from './image';
-export * from './inspector';
-export * from './instance';
-export * from './model';
-export * from './model/block';
-export * from './model/block/scene';
-export * from './model/multiblock';
-export * from './model/scene';
-export * from './nbt';
-export * from './renderer';
-export * from './request';
-export * from './skin';
-export * from './skin/scene';
-export * from './texture';
-export * from './three';
-export * from './util';
-export * from './world';