minerender 1.4.11 → 2.0.0-alpha.1

package/src/instance/Instanceable.d.ts

@@ -0,0 +1,15 @@
+import { InstanceReference } from "./InstanceReference";
+import { Euler, Matrix4, Vector3 } from "three";
+export interface Instanceable {
+    nextInstance(): InstanceReference<this>;
+    getMatrixAt(index: number, matrix?: Matrix4): Matrix4;
+    setMatrixAt(index: number, matrix: Matrix4): void;
+    setPositionRotationScaleAt(index: number, position?: Vector3, rotation?: Euler, scale?: Vector3): void;
+    setPositionAt(index: number, position: Vector3): void;
+    getPositionAt(index: number, vector?: Vector3): Vector3;
+    setRotationAt(index: number, rotation: Euler): void;
+    getRotationAt(index: number, euler?: Euler): Euler;
+    setScaleAt(index: number, scale: Vector3): void;
+    getScaleAt(index: number, vector?: Vector3): Vector3;
+}
+export declare function isInstanceable(obj: any): obj is Instanceable;

package/src/instance/Instanceable.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isInstanceable = void 0;
+function isInstanceable(obj) {
+    return 'nextInstance' in obj;
+}
+exports.isInstanceable = isInstanceable;
+//# sourceMappingURL=Instanceable.js.map

package/src/instance/Instanceable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Instanceable.js","sourceRoot":"./","sources":["src/instance/Instanceable.ts"],"names":[],"mappings":";;;AA6BA,SAAgB,cAAc,CAAC,GAAQ;IACnC,OAAO,cAAc,IAAI,GAAG,CAAC;AACjC,CAAC;AAFD,wCAEC"}

package/src/instance/Instanceable.ts

@@ -0,0 +1,33 @@
+import { InstanceReference } from "./InstanceReference";
+import { MineRenderError } from "../error/MineRenderError";
+import { Euler, Matrix4, Vector3 } from "three";
+import { isInstancedMesh } from "../util/three";
+import { SceneObject } from "../renderer/SceneObject";
+
+export interface Instanceable {
+
+    nextInstance(): InstanceReference<SceneObject>;
+
+    getMatrixAt(index: number, matrix?: Matrix4): Matrix4;
+
+    setMatrixAt(index: number, matrix: Matrix4): void;
+
+    setPositionRotationScaleAt(index: number, position?: Vector3, rotation?: Euler, scale?: Vector3): void;
+
+    setPositionAt(index: number, position: Vector3): void;
+
+    getPositionAt(index: number, vector?: Vector3): Vector3;
+
+    setRotationAt(index: number, rotation: Euler): void;
+
+    getRotationAt(index: number, euler?: Euler): Euler;
+
+    setScaleAt(index: number, scale: Vector3): void;
+
+    getScaleAt(index: number, vector?: Vector3): Vector3;
+
+}
+
+export function isInstanceable(obj: any): obj is Instanceable {
+    return 'nextInstance' in obj;
+}

package/src/model/DisplayPosition.ts

@@ -0,0 +1,12 @@
+export enum DisplayPosition {
+    THIRDPERSON_RIGHTHAND = "thirdperson_righthand",
+    THIRDPERSON_LEFTHAND = "thirdperson_lefthand",
+    FIRSTPERSON_RIGHTHAND = "firstperson_righthand",
+    FIRSTPERSON_LEFTHAND = "firstperson_lefthand",
+    GUI = "gui",
+    HEAD = "head",
+    GROUND = "ground",
+    FIXED = "fixed",
+}
+
+export const DISPLAY_POSITIONS = Object.values(DisplayPosition);

package/src/model/ElementFace.d.ts

@@ -0,0 +1,9 @@
+import { QuadArray } from "./Model";
+export interface ElementFace {
+    uv: QuadArray;
+    mappedUv?: QuadArray;
+    texture: string;
+    cullface?: string;
+    rotation?: number;
+    tintindex?: number;
+}

package/src/model/ElementFace.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ElementFace.js.map

package/src/model/ElementFace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ElementFace.js","sourceRoot":"./","sources":["src/model/ElementFace.ts"],"names":[],"mappings":""}

package/src/model/ElementFace.ts

@@ -0,0 +1,10 @@
+import { QuadArray } from "./Model";
+
+export interface ElementFace {
+    uv: QuadArray;
+    mappedUv?: QuadArray;
+    texture: string;
+    cullface?: string;
+    rotation?: number;
+    tintindex?: number;
+}

package/src/model/GuiLight.ts

@@ -0,0 +1,4 @@
+export enum GuiLight {
+    FRONT="front",
+    SIDE="side"
+}

package/src/model/Model.d.ts

@@ -0,0 +1,43 @@
+import { ModelElement } from "./ModelElement";
+import { DisplayPosition } from "./DisplayPosition";
+import { GuiLight } from "./GuiLight";
+import { MinecraftAsset } from "../MinecraftAsset";
+import { ImageInfo } from "../image/ImageLoader";
+export declare const ITEM_GENERATED = "item/generated";
+export declare const BUILTIN_GENERATED = "builtin/generated";
+export declare const BUILTIN_ENTITY = "builtin/entity";
+export declare const DEFAULT_ELEMENTS: ModelElement[];
+export interface Model extends MinecraftAsset {
+    textures?: ModelTextures;
+    parent?: string;
+    display?: ModelDisplay;
+    elements?: ModelElement[];
+    hierarchy?: string[];
+}
+export interface BlockModel extends Model {
+    textures?: BlockModelTextures;
+    ambientocclusion?: boolean;
+}
+export interface ItemModel extends Model {
+    textures?: ItemModelTextures;
+    gui_light?: GuiLight;
+}
+export interface TextureAsset extends MinecraftAsset, ImageInfo {
+}
+export interface ModelDisplay {
+    position?: DisplayPosition;
+    translation?: TripleArray;
+    rotation?: TripleArray;
+    scale?: TripleArray;
+}
+export interface ModelTextures {
+    [variable: string]: string;
+}
+export interface BlockModelTextures extends ModelTextures {
+    particle: string;
+}
+export interface ItemModelTextures extends BlockModelTextures {
+}
+export declare type DoubleArray<T = number> = [T, T];
+export declare type TripleArray<T = number> = [T, T, T];
+export declare type QuadArray<T = number> = [T, T, T, T];

package/src/model/Model.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_ELEMENTS = exports.BUILTIN_ENTITY = exports.BUILTIN_GENERATED = exports.ITEM_GENERATED = void 0;
+exports.ITEM_GENERATED = "item/generated";
+exports.BUILTIN_GENERATED = "builtin/generated";
+exports.BUILTIN_ENTITY = "builtin/entity";
+exports.DEFAULT_ELEMENTS = [];
+//# sourceMappingURL=Model.js.map

package/src/model/Model.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Model.js","sourceRoot":"./","sources":["src/model/Model.ts"],"names":[],"mappings":";;;AAMa,QAAA,cAAc,GAAG,gBAAgB,CAAC;AAClC,QAAA,iBAAiB,GAAG,mBAAmB,CAAC;AACxC,QAAA,cAAc,GAAG,gBAAgB,CAAC;AAElC,QAAA,gBAAgB,GAAmB,EAAE,CAAA"}

package/src/model/Model.ts

@@ -0,0 +1,67 @@
+import { ModelElement } from "./ModelElement";
+import { DisplayPosition } from "./DisplayPosition";
+import { GuiLight } from "./GuiLight";
+import { MinecraftAsset } from "../MinecraftAsset";
+import { ImageInfo } from "../image/ImageLoader";
+
+export const ITEM_GENERATED = "item/generated";
+export const BUILTIN_GENERATED = "builtin/generated";
+export const BUILTIN_ENTITY = "builtin/entity";
+
+export const DEFAULT_ELEMENTS: ModelElement[] = []
+
+export interface Model extends MinecraftAsset {
+    textures?: ModelTextures;
+    parent?: string;
+    display?: ModelDisplay;
+    elements?: ModelElement[];
+    hierarchy?: string[];
+}
+
+export interface BlockModel extends Model {
+    textures?: BlockModelTextures;
+    ambientocclusion?: boolean;
+}
+
+export interface ItemModel extends Model {
+    textures?: ItemModelTextures;
+    gui_light?: GuiLight;
+}
+
+export interface TextureAsset extends MinecraftAsset, ImageInfo {
+}
+
+export interface ModelDisplay {
+    position?: DisplayPosition;
+    translation?: TripleArray;
+    rotation?: TripleArray;
+    scale?: TripleArray;
+}
+
+export interface ModelTextures {
+    [variable: string]: string;
+}
+
+export interface BlockModelTextures extends ModelTextures {
+    particle: string;
+}
+
+export interface ItemModelTextures extends BlockModelTextures {
+    /*layerN: number*/
+}
+
+export type DoubleArray<T = number> = [T, T];
+export type TripleArray<T = number> = [T, T, T];
+export type QuadArray<T = number> = [T, T, T, T];
+
+export function isDoubleArray(obj: any): obj is DoubleArray {
+    return Array.isArray(obj) && obj.length === 2;
+}
+
+export function isTripleArray(obj: any): obj is TripleArray {
+    return Array.isArray(obj) && obj.length === 3;
+}
+
+export function isQuadArray(obj: any): obj is QuadArray {
+    return Array.isArray(obj) && obj.length === 4;
+}

package/src/model/ModelElement.ts

@@ -0,0 +1,30 @@
+import { TripleArray } from "./Model";
+import { Axis } from "../Axis";
+import { CubeFace } from "../CubeFace";
+import { ElementFace } from "./ElementFace";
+
+export interface FromTo {
+    from: TripleArray;
+    to: TripleArray;
+}
+
+export interface ModelElement extends FromTo {
+    rotation?: ElementRotation;
+
+    shade?: boolean;
+
+    faces: ModelFaces;
+
+    mappedUv?: number[];
+}
+
+export type ModelFaces = Partial<Record<CubeFace, Partial<ElementFace>>>;
+
+export interface ElementRotation {
+    origin: TripleArray;
+    axis: Axis;
+    angle: number;
+    rescale: boolean;
+}
+
+

package/src/model/ModelGenerator.ts

@@ -0,0 +1,32 @@
+import { Model } from "./Model";
+import { BufferGeometry } from "three/src/core/BufferGeometry";
+import { ImageData } from "canvas";
+import { BoxGeometry, PlaneGeometry } from "three";
+import { UVMapper } from "../UVMapper";
+import { ModelElement } from "./ModelElement";
+
+export class ModelGenerator {
+
+    public static readonly ITEM_LAYERS: string[] = ["layer0", "layer1", "layer2", "layer3", "layer4"];
+
+    public static generateItemModel(imageData: ImageData, layer: string): ModelElement[] {
+        const mainElement: ModelElement = {
+            from: [0,0,7.5],
+            to: [16,16,8.5],
+            faces: {
+                "south": {
+                    uv: [0,0,16,16],
+                    texture: `#${layer}`
+                },
+                "north": {
+                    uv: [16,0,0,16],
+                    texture: `#${layer}`
+                }
+            },
+            shade: true
+        };
+        //TODO: wrapped edges
+        return [mainElement];
+    }
+
+}

package/src/model/ModelMerger.ts

@@ -0,0 +1,36 @@
+import { Model } from "./Model";
+import { Models } from "../assets/Models";
+import merge from "ts-deepmerge";
+import { Assets } from "../assets/Assets";
+import { AssetKey } from "../assets/AssetKey";
+
+export class ModelMerger {
+
+    public static async mergeWithParents(model: Model): Promise<Model> {
+        const models = await this.collectAllParents(model);
+        let merged: Model = {};
+        for (let parentModel of models) {
+            merged = merge(merged, parentModel);
+        }
+        merged = merge(merged, model);
+        merged.hierarchy = models.map(m => m.parent).filter(p => `${p}`) as string[];
+        merged.hierarchy.push(`${merged.parent}`);
+        // delete merged.parent;
+        return merged;
+    }
+
+    protected static async collectAllParents(model: Model): Promise<Model[]> {
+        if (!model.parent) {
+            return [];
+        }
+        const models: Model[] = [];
+        const parentKey = AssetKey.parse("models", model.parent);
+        const parentModel = await Models.getRaw(parentKey);
+        if (parentModel) {
+            models.unshift(parentModel);
+            models.unshift(...await this.collectAllParents(parentModel));
+        }
+        return models;
+    }
+
+}

package/src/model/ModelPart.d.ts

@@ -0,0 +1,23 @@
+export interface ModelPart {
+    textureWidth: number;
+    textureHeight: number;
+    textureOffsetU: number;
+    textureOffsetV: number;
+    pivotX: number;
+    pivotY: number;
+    pivotZ: number;
+    pitch: number;
+    yaw: number;
+    roll: number;
+    mirror: boolean;
+    cubes: Cube[];
+    children: ModelPart[];
+}
+export interface Cube {
+    minX: number;
+    minY: number;
+    minZ: number;
+    maxX: number;
+    maxY: number;
+    maxZ: number;
+}

package/src/model/ModelPart.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ModelPart.js.map

package/src/model/ModelPart.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelPart.js","sourceRoot":"./","sources":["src/model/ModelPart.ts"],"names":[],"mappings":""}

package/src/model/ModelPart.ts

@@ -0,0 +1,25 @@
+export interface ModelPart {
+    textureWidth: number;
+    textureHeight: number;
+    textureOffsetU: number;
+    textureOffsetV: number;
+    pivotX: number;
+    pivotY: number;
+    pivotZ: number;
+    pitch: number;
+    yaw: number;
+    roll: number;
+    mirror: boolean;
+    cubes: Cube[];
+    children: ModelPart[];
+}
+
+export interface Cube {
+    minX: number;
+    minY: number;
+    minZ: number;
+    maxX: number;
+    maxY: number;
+    maxZ: number;
+}
+

package/src/model/block/Block.ts

@@ -0,0 +1,10 @@
+import { BlockStateProperties } from "./BlockStateProperties";
+import { TripleArray } from "../Model";
+
+export interface Block {
+
+    type: string;
+    properties?: BlockStateProperties;
+    nbt?: any;
+
+}

package/src/model/block/BlockState.ts

@@ -0,0 +1,25 @@
+import { MinecraftAsset } from "../../MinecraftAsset";
+
+export interface BlockState extends MinecraftAsset {
+    variants?: BlockStateVariants;
+    multipart?: BlockStateMultipart[];
+}
+
+export type BlockStateVariants = { [key: string]: BlockStateVariant | BlockStateVariant[] };
+
+export interface BlockStateVariant {
+    model?: string;
+    y?: number;
+    x?: number;
+    uvlock?: boolean;
+}
+
+
+export interface BlockStateMultipart {
+    when?: MultipartCondition | { OR: MultipartCondition[] };
+    apply?: BlockStateVariant;
+}
+
+export interface MultipartCondition {
+    [key: string]: string;
+}

package/src/model/block/BlockStateProperties.ts

@@ -0,0 +1,12 @@
+export type BlockStatePropertyValue = string | boolean | number;
+
+export interface BlockStateProperty {
+    default: BlockStatePropertyValue;
+    type: "boolean" | "int" | "enum";
+    valueType: "boolean" | "int" | string;
+    values: BlockStatePropertyValue[];
+}
+
+export type BlockStatePropertyDefaults = { [key: string]: BlockStateProperty; };
+
+export type BlockStateProperties = { [key: string]: string; };