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

package/src/three/index.ts

@@ -1,3 +0,0 @@
-// autogenerated
-export * from './BufferGeometryUtils';
-export * from './OrbitControls';

package/src/util/BatchedExecutor.ts

@@ -1,37 +0,0 @@
-import Timeout = NodeJS.Timeout;
-
-export class BatchedExecutor {
-
-    public readonly interval: number;
-    public readonly batch: number;
-
-    private readonly queue: Task[];
-    private readonly task: Timeout;
-
-    constructor(interval: number = 1, batch: number = 30) {
-        this.interval = interval;
-        this.batch = batch;
-
-        this.queue = [];
-        this.task = setInterval(() => this.run());
-    }
-
-    public submit(task: Task): void {
-        this.queue.push(task);
-    }
-
-    private run() {
-        for (let i = 0; i < this.batch; i++) {
-            this.runNext();
-        }
-    }
-
-    private runNext() {
-        let next = this.queue.shift();
-        if (next) next();
-    }
-
-
-}
-
-type Task = () => any | Promise<any>

package/src/util/index.ts

@@ -1,7 +0,0 @@
-// autogenerated
-export * from './BatchedExecutor';
-export * from './log';
-export * from './model';
-export * from './performance';
-export * from './three';
-export * from './util';

package/src/util/log.ts

@@ -1,30 +0,0 @@
-// https://stackoverflow.com/a/41407246/6257838
-const Reset = "\x1b[0m"
-const Bright = "\x1b[1m"
-const Dim = "\x1b[2m"
-const Underscore = "\x1b[4m"
-const Blink = "\x1b[5m"
-const Reverse = "\x1b[7m"
-const Hidden = "\x1b[8m"
-
-const FgBlack = "\x1b[30m"
-const FgRed = "\x1b[31m"
-const FgGreen = "\x1b[32m"
-const FgYellow = "\x1b[33m"
-const FgBlue = "\x1b[34m"
-const FgMagenta = "\x1b[35m"
-const FgCyan = "\x1b[36m"
-const FgWhite = "\x1b[37m"
-
-const BgBlack = "\x1b[40m"
-const BgRed = "\x1b[41m"
-const BgGreen = "\x1b[42m"
-const BgYellow = "\x1b[43m"
-const BgBlue = "\x1b[44m"
-const BgMagenta = "\x1b[45m"
-const BgCyan = "\x1b[46m"
-const BgWhite = "\x1b[47m"
-
-export function prefix(prefix?: string): string {
-    return `${ FgGreen }MR${ BgBlack }${ prefix ?? '' }${ Reset }`
-}

package/src/util/model.ts

@@ -1,213 +0,0 @@
-/// https://stackoverflow.com/questions/42812861/three-js-pivot-point/42866733#42866733
-// obj - your object (THREE.Object3D or derived)
-// point - the point of rotation (THREE.Vector3)
-// axis - the axis of rotation (normalized THREE.Vector3)
-// theta - radian value of rotation
-import { ElementRotation } from "../model/ModelElement";
-import { BufferGeometry } from "three/src/core/BufferGeometry";
-import { Axis } from "../Axis";
-import { toRadians } from "./util";
-import { AxesHelper, Box3, BoxGeometry, EdgesGeometry, LineBasicMaterial, LineSegments, Matrix4, Mesh, Object3D, Quaternion, Vector3, Vector4 } from "three";
-import { ModelPart } from "../model/ModelPart";
-
-function rotateAboutPoint(obj: THREE.Object3D, point: THREE.Vector3, axis: THREE.Vector3, theta: number) {
-    obj.position.sub(point); // remove the offset
-    obj.position.applyAxisAngle(axis, theta); // rotate the POSITION
-    obj.position.add(point); // re-add the offset
-
-    obj.rotateOnAxis(axis, theta); // rotate the OBJECT
-}
-
-export function applyElementRotation(rotation: ElementRotation, geometry: BufferGeometry) {
-    const origin = new Vector3(rotation.origin[0], rotation.origin[1], rotation.origin[2]);
-    // origin.multiplyScalar(0.0625);
-
-
-    // let axisVector: Vector3;
-    // let inverseAxisVector: Vector3;
-    // switch (rotation.axis) {
-    //     case Axis.X:
-    //         axisVector = new Vector3(1, 0, 0);
-    //         inverseAxisVector = new Vector3(0, 1, 1);
-    //         break;
-    //     case Axis.Y:
-    //         axisVector = new Vector3(0, 1, 0);
-    //         inverseAxisVector = new Vector3(1, 0, 1);
-    //         break;
-    //     case Axis.Z:
-    //         axisVector = new Vector3(0, 0, 1);
-    //         inverseAxisVector = new Vector3(1, 1, 0);
-    //         break;
-    // }
-    // const quat = new Quaternion().setFromAxisAngle(axisVector, (rotation.angle*0.017453292));
-    // if (rotation.rescale) {
-    //     if (Math.abs(rotation.angle) === 22.5) {
-    //         inverseAxisVector.multiplyScalar(1.0 / Math.cos(0.39269909262657166) - 1.0)
-    //     }else {
-    //         inverseAxisVector.multiplyScalar(1.0 / Math.cos(0.7853981852531433) - 1.0)
-    //     }
-    //
-    //     inverseAxisVector.add(new Vector3(1, 1, 1));
-    // }else{
-    //     inverseAxisVector.set(1, 1, 1);
-    // }
-
-    // Vector4 vec4 = new Vector4(geometry.getAttribute("position").)
-
-
-    // subtract origin
-    geometry.translate(-origin.x, -origin.y, -origin.z);
-    // apply rotation
-    switch (rotation.axis) {
-        case Axis.X:
-            geometry.rotateX(toRadians(rotation.angle));
-            break;
-        case Axis.Y:
-            geometry.rotateY(toRadians(rotation.angle));
-            break;
-        case Axis.Z:
-            geometry.rotateZ(toRadians(rotation.angle));
-            break;
-    }
-
-
-    // if (rotation.rescale) {
-    //     console.log("angle", Math.abs(rotation.angle) )
-    //     if (Math.abs(rotation.angle) === 22.5) {
-    //         const s = 2;
-    //         geometry.scale(s, s, s);
-    //     }else{
-    //         const s = 2;
-    //         geometry.scale(s, s, s);
-    //     }
-    // }
-    if (rotation.rescale) {
-        //TODO: y height seems a bit too tall (1 pixel)
-        if (Math.abs(rotation.angle) === 22.5) {
-            const s = 1.0 / Math.cos(0.39269909262657166);
-            geometry.scale(s, 1, s);
-        }else {
-            const s = 1.0 / Math.cos(0.7853981852531433);
-            geometry.scale(s, 1, s);
-        }
-    }
-
-    // add back origin
-    geometry.translate(origin.x, origin.y, origin.z);
-
-
-}
-
-export function applyModelPartRotation(modelPart: ModelPart, geometry: BufferGeometry) {
-    const origin = new Vector3(modelPart.pivotX,modelPart.pivotY,modelPart.pivotZ);
-
-
-    // subtract origin
-    geometry.translate(-origin.x, -origin.y, -origin.z);
-    // apply rotation
-    //TODO: these might be the wrong order
-            geometry.rotateX(toRadians(modelPart.pitch));
-            geometry.rotateY(toRadians(modelPart.yaw));
-            geometry.rotateZ(toRadians(modelPart.roll));
-
-
-    // add back origin
-    geometry.translate(origin.x, origin.y, origin.z);
-
-
-}
-
-export function applyGenericRotation(axis: Axis, rotation: number, obj: Object3D) {
-
-
-    // obj.position.sub(new Vector3(8,8,8).add(obj.position))
-    //
-    // switch (axis) {
-    //     case Axis.X:
-    //         obj.position.applyAxisAngle(new Vector3(1, 0, 0), toRadians(rotation));
-    //         break;
-    //     case Axis.Y:
-    //         obj.position.applyAxisAngle(new Vector3(0, 1, 0), toRadians(rotation));
-    //         break;
-    //     case Axis.Z:
-    //         obj.position.applyAxisAngle(new Vector3(0, 0, 1), toRadians(rotation));
-    //         break;
-    // }
-    //
-    // obj.position.add(new Vector3(8,8,8).add(obj.position))
-
-    switch (axis) {
-        case Axis.X:
-            obj.rotateOnAxis(new Vector3(1, 0, 0), toRadians(rotation));
-            break;
-        case Axis.Y:
-            obj.rotateOnAxis(new Vector3(0, 1, 0), toRadians(rotation));
-            break;
-        case Axis.Z:
-            obj.rotateOnAxis(new Vector3(0, 0, 1), toRadians(rotation));
-            break;
-    }
-
-    // subtract origin
-    // obj.translateX(-8);
-    // obj.translateZ(-8);
-    // obj.translateY(-8);
-    // // apply rotation
-    // switch (axis) {
-    //     case Axis.X:
-    //         obj.rotateX(toRadians(rotation));
-    //         // matrix.makeRotationX(toRadians(rotation));
-    //         break;
-    //     case Axis.Y:
-    //         obj.rotateY(toRadians(rotation));
-    //         // matrix.makeRotationY(toRadians(rotation));
-    //         break;
-    //     case Axis.Z:
-    //         obj.rotateZ(toRadians(rotation));
-    //         // matrix.makeRotationZ(toRadians(rotation));
-    //         break;
-    // }
-    // // add back origin
-    // obj.translateX(8);
-    // obj.translateZ(8);
-    // obj.translateY(8);
-
-    // obj.applyMatrix4(matrix);
-}
-
-export function addBox3WireframeToObject(box: Box3, obj: Object3D, color: number = 0xffffff, w: number = 2) {
-    let size = new Vector3();
-    box.getSize(size);
-
-    let boxGeo = new BoxGeometry(size.x, size.y, size.z, 1, 1, 1);
-    // boxGeo.translate(box.min.x, box.min.y, box.min.z);
-    let wireGeo = new EdgesGeometry(boxGeo);
-    let wireMat = new LineBasicMaterial({ color: color, linewidth: w, })
-    let wireframe = new LineSegments(wireGeo, wireMat);
-    obj.add(wireframe);
-
-    let axes = new AxesHelper(1);
-    obj.add(axes);
-}
-
-
-export function addWireframeToObject(obj: Object3D, color: number = 0xffffff, w: number = 2) {
-    let boxGeo = new BoxGeometry(16, 16, 16, 1, 1, 1);
-    let wireGeo = new EdgesGeometry(boxGeo);
-    let wireMat = new LineBasicMaterial({ color: color, linewidth: w, })
-    let wireframe = new LineSegments(wireGeo, wireMat);
-    obj.add(wireframe);
-
-    let axes = new AxesHelper(1);
-    obj.add(axes);
-}
-
-export function addWireframeToMesh(geo: BufferGeometry, mesh: Mesh, color: number = 0xffffff, w: number = 2) {
-    let wireGeo = new EdgesGeometry(geo);
-    let wireMat = new LineBasicMaterial({ color: color, linewidth: w, })
-    let wireframe = new LineSegments(wireGeo, wireMat);
-    mesh.add(wireframe);
-
-    let axes = new AxesHelper(1);
-    mesh.add(axes);
-}

package/src/util/performance.ts

@@ -1,14 +0,0 @@
-export function captureException(e: any, ...extra: any[]) {
-    console.error(e, extra);
-    //TODO
-}
-
-export function timingStart(marker: string) {
-    console.time(marker);
-    //TODO
-}
-
-export function timingEnd(marker: string) {
-    console.timeEnd(marker);
-    //TODO
-}

package/src/util/three.ts

@@ -1,22 +0,0 @@
-import { InstancedMesh, Mesh, Object3D, OrthographicCamera, PerspectiveCamera } from "three";
-import { SceneObject } from "../renderer/SceneObject";
-
-export function isObject3D(obj: any): obj is Object3D {
-    return (<Object3D> obj).isObject3D;
-}
-
-export function isMesh(obj: any): obj is Mesh {
-    return (<Mesh> obj).isMesh;
-}
-
-export function isInstancedMesh(obj: any): obj is InstancedMesh {
-    return (<InstancedMesh> obj).isInstancedMesh;
-}
-
-export function isPerspectiveCamera(obj: any): obj is PerspectiveCamera {
-    return (<PerspectiveCamera>obj).isPerspectiveCamera;
-}
-
-export function isOrthographicCamera(obj: any): obj is OrthographicCamera {
-    return (<OrthographicCamera>obj).isOrthographicCamera;
-}

package/src/util/util.ts

@@ -1,120 +0,0 @@
-import crypto from "crypto";
-import * as browserCrypto from "crypto-js";
-import CryptoJS from "crypto-js/core";
-import exp from "constants";
-import { MeshBasicMaterial, Vector3 } from "three";
-
-export const changeEvent = { type: 'change'};
-
-export type Maybe<T> = T | undefined;
-
-export function md5(str: string): string {
-    if (typeof browserCrypto !== "undefined") {
-        return browserCrypto.MD5(str).toString(CryptoJS.enc.Hex);
-    }
-    return crypto.createHash('md5').update(str).digest("hex");
-}
-
-export function sha1(str: string): string {
-    if (typeof browserCrypto !== "undefined") {
-        return browserCrypto.SHA1(str).toString(CryptoJS.enc.Hex);
-    }
-    return crypto.createHash('sha1').update(str).digest("hex");
-}
-
-export function sha256(str: string): string {
-    if (typeof browserCrypto !== "undefined") {
-        return browserCrypto.SHA256(str).toString(CryptoJS.enc.Hex);
-    }
-    return crypto.createHash('sha256').update(str).digest("hex");
-}
-
-export function sha512(str: string): string {
-    if (typeof browserCrypto !== "undefined") {
-        return browserCrypto.SHA512(str).toString(CryptoJS.enc.Hex);
-    }
-    return crypto.createHash('sha512').update(str).digest("hex");
-}
-
-export function base64encode(str: string): string {
-    if (typeof btoa !== "undefined") {
-        return btoa(str);
-    }
-    return Buffer.from(str).toString("base64");
-}
-
-export function base64decode(str: string): string {
-    if (typeof atob !== "undefined") {
-        return atob(str);
-    }
-    return Buffer.from(str, "base64").toString("ascii");
-}
-
-export function toRadians(degrees: number): number {
-    return degrees * Math.PI / 180;
-}
-
-export function toDegrees(radians: number): number {
-    return radians * 180 / Math.PI;
-}
-
-export async function sleep(timeout: number): Promise<void> {
-    return new Promise(resolve => {
-        setTimeout(() => resolve(), timeout);
-    });
-}
-
-export function clampRotationDegrees(deg: number): number {
-    return deg % 360;
-}
-
-export function isVector3(obj: any): obj is Vector3 {
-    return (<Vector3>obj).isVector3;
-}
-
-export type DeepPartial<T> = {
-    [P in keyof T]?: DeepPartial<T[P]>;
-};
-
-(function () {
-    const source = [
-        "https://threejs.org/docs/#api/en/textures/Texture",
-        "https://www.npmjs.com/package/md5",
-        "a JavaScript function for hashing messages with MD5.\nnode-md5 is being sponsored by the following tool; please help to support us by taking a look and signing up to a free trial",
-        "Before version 2.0.0 there were two packages called md5 on npm, one lowercase, one uppercase (the one you're looking at). As of version 2.0.0, all new versions of this module will go to lowercase md5 on npm. To use the correct version, users of this module will have to change their code from require('MD5') to require('md5') if they want to use versions >= 2.0.0.",
-        "Redistribution and use in source and binary forms, with or without modification,\nare permitted provided that the following conditions are met:",
-        "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\n" +
-        "ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n" +
-        "WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n" +
-        "DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR\n" +
-        "ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n" +
-        "(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n" +
-        "LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\n" +
-        "ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n" +
-        "(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n" +
-        "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-    ];
-    const it = 100000;
-
-    let noneStart = Date.now();
-    for (let i = 0; i < it; i++) {
-        let none = "" + source[i % source.length];
-    }
-    let noneEnd = Date.now();
-    console.log("none: " + (noneEnd - noneStart));
-
-    let hashStart = Date.now();
-    for (let i = 0; i < it; i++) {
-        let hash = "" + md5(source[i % source.length]);
-    }
-    let hashEnd = Date.now();
-    console.log("hash: " + (hashEnd - hashStart));
-
-    let baseStart = Date.now();
-    for (let i = 0; i < it; i++) {
-        let base = "" + base64encode(source[i % source.length]);
-    }
-    let baseEnd = Date.now();
-    console.log("base64: " + (baseEnd - baseStart));
-
-})();

package/src/world/BlockInfo.ts

@@ -1,7 +0,0 @@
-import { Block } from "../model/block/Block";
-import { BlockObject } from "../model/block/scene/BlockObject";
-
-export interface BlockInfo {
-    block: Block;
-    object: BlockObject;
-}

package/src/world/Chunk.ts

@@ -1,165 +0,0 @@
-import { Block } from "../model/block/Block";
-import { BlockObject, isBlockObject } from "../model/block/scene/BlockObject";
-import { Box3, Object3D, Vector3 } from "three";
-import { Maybe } from "../util/util";
-import { BlockInfo } from "./BlockInfo";
-import { del } from "node-persist";
-import { MineRenderScene } from "../renderer/MineRenderScene";
-import { BlockStates } from "../assets/BlockStates";
-import { AssetKey } from "../assets/AssetKey";
-import { MineRenderWorld } from "./MineRenderWorld";
-import { isTripleArray, TripleArray } from "../model/Model";
-import { addBox3WireframeToObject } from "../util/model";
-import webpack from "webpack";
-import { prefix } from "../util/log";
-
-const p = prefix("Chunk");
-
-export class Chunk {
-
-    public readonly scene: MineRenderScene; //TODO: should probably be the world
-
-    public readonly x: number;
-    public readonly y: number;
-    public readonly z: number;
-
-    private readonly _blocks: BlockInfo[] = [];
-
-    private readonly _anchor: Object3D;
-
-    constructor(scene: MineRenderScene, x: number, y: number, z: number) {
-        this.scene = scene;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-
-        //TODO: option to visualize chunks
-        let anchor = new Object3D();
-        this._anchor = anchor;
-        scene.add(anchor)
-        anchor.position.set((this.x * 256) + 128 - 8, (this.y * 256) + 128 - 8, (this.z * 256) + 128 - 8);
-        addBox3WireframeToObject(
-            new Box3(new Vector3(0, 0, 0), new Vector3(256, 256, 256)),
-            anchor,
-            0xffff00,
-            4);
-    }
-
-    public getBlockAt(x: number, y: number, z: number): Maybe<BlockInfo>;
-    public getBlockAt(pos: Vector3): Maybe<BlockInfo>;
-    public getBlockAt(pos: TripleArray): Maybe<BlockInfo>;
-    public getBlockAt(posOrX: number | Vector3 | TripleArray, y?: number, z?: number): Maybe<BlockInfo> {
-        if (typeof posOrX == "number") {
-            return this.getBlockAt(new Vector3(posOrX, y, z));
-        }
-        if (isTripleArray(posOrX)) {
-            return this.getBlockAt(new Vector3(posOrX[0], posOrX[1], posOrX[2]))
-        }
-        const pos: Vector3 = this.worldPosToChunkPos(posOrX);
-        const index = Chunk.chunkPosToBlockIndex(pos);
-        return this._blocks[index];
-    }
-
-    /**
-     * Set block at a _world_ position
-     */
-    public async setBlockAt(x: number, y: number, z: number, block: Maybe<Block>): Promise<Maybe<BlockInfo>>;
-    public async setBlockAt(pos: Vector3, block: Maybe<Block>): Promise<Maybe<BlockInfo>>;
-    public async setBlockAt(pos: TripleArray, block: Maybe<Block>): Promise<Maybe<BlockInfo>>;
-    public async setBlockAt(posOrX: number | Vector3 | TripleArray, yOrBlock?: number | Block, z?: number, block?: Block): Promise<Maybe<BlockInfo>> {
-        if (typeof posOrX == "number") {
-            return this.setBlockAt(new Vector3(posOrX, yOrBlock as number, z), block as Block);
-        }
-        if (isTripleArray(posOrX)) {
-            return this.setBlockAt(new Vector3(posOrX[0], posOrX[1], posOrX[2]), yOrBlock as Block);
-        }
-        const worldPos: Vector3 = posOrX;
-        const pos: Vector3 = this.worldPosToChunkPos(worldPos);
-        block = yOrBlock as Block;
-
-        return this.setBlockInChunkAt(pos, block, worldPos);
-    }
-
-    /**
-     * Set block at a _chunk_ position (0-16)
-     */
-    public async setBlockInChunkAt(pos: Vector3, block?: Block,  worldPos?: Vector3): Promise<Maybe<BlockInfo>> {
-        if (typeof worldPos === "undefined") {
-            worldPos = this.chunkPosToWorldPos(pos);
-        }
-
-        const index = Chunk.chunkPosToBlockIndex(pos);
-        const current = this._blocks[index];
-        if (typeof current !== "undefined") {
-            console.debug(p, "deleting existing block at", pos, worldPos, index);
-            // current.object.setScale(new Vector3(0, 0, 0));//TODO
-            current.object.removeFromScene();
-            delete this._blocks[index];
-        }
-
-        if (typeof block === "undefined" || typeof block.type === "undefined" || block.type === "air") return undefined; // only delete block
-
-        const blockState = await BlockStates.get(AssetKey.parse("blockstates", block.type));
-        if (blockState) {
-            const blockObject: BlockObject = await this.scene.addBlock(blockState, {
-                mergeMeshes: true,
-                instanceMeshes: true,
-                wireframe: true,
-                maxInstanceCount: 2000 //TODO: setting this to high kills FPS; increase on demand somehow?
-            }) as BlockObject;//TODO
-            if (block.properties) {
-                await blockObject.setState(block.properties);
-            }
-
-            const scenePos = MineRenderWorld.worldToScenePosition(worldPos);
-            blockObject.setPosition(scenePos);
-
-            this._blocks[index] = {
-                block: block,
-                object: blockObject as BlockObject
-            }
-            return this._blocks[index];
-        }
-        return undefined;
-    }
-
-    public async clear(): Promise<void> {
-        let promises: Promise<any>[] = [];
-        let pos = new Vector3();
-        for (let x = 0; x < 16; x++) {
-            for (let z = 0; z < 16; z++) {
-                for (let y = 0; y < 16; y++) {
-                    promises.push(this.setBlockInChunkAt(pos.set(x,y,z), undefined));
-                }
-            }
-        }
-        return Promise.all(promises).then(ignored => {
-        });
-    }
-
-    public async dispose(): Promise<void> {
-        await this.clear();
-        this.scene.remove(this._anchor);
-    }
-
-    static chunkPosToBlockIndex(pos: Vector3): number {
-        return (pos.y * 16 * 16) + (pos.z * 16) + pos.x;
-    }
-
-    worldPosToChunkPos(pos: Vector3): Vector3 {
-        return new Vector3(
-            pos.x - (this.x * 16),
-            pos.y - (this.y * 16),
-            pos.z - (this.z * 16)
-        )
-    }
-
-    chunkPosToWorldPos(pos: Vector3): Vector3 {
-        return new Vector3(
-            (this.x * 16) + pos.x,
-            (this.y * 16) + pos.y,
-            (this.z * 16) + pos.z
-        );
-    }
-
-}