minerender 2.0.0-alpha.4 → 2.0.0-alpha.6

package/src/instance/InstanceReference.ts

@@ -27,7 +27,7 @@ export class InstanceReference<T extends Instanceable> implements Transformable
     }
 
     setPosition(position: Vector3): void {
-        console.log("InstanceReference#setPosition",position)
+        // console.log("InstanceReference#setPosition",position)
         this.instanceable.setPositionAt(this.index, position);
     }
 
@@ -36,12 +36,12 @@ export class InstanceReference<T extends Instanceable> implements Transformable
     }
 
     setRotation(rotation: Euler): void {
-        console.log("InstanceReference#setRotation",rotation)
+        // console.log("InstanceReference#setRotation",rotation)
         this.instanceable.setRotationAt(this.index, rotation);
     }
 
     getRotation(): Euler {
-        console.log("InstanceReference#getRotation")
+        // console.log("InstanceReference#getRotation")
         return this.instanceable.getRotationAt(this.index);
     }
 

package/src/model/block/scene/BlockObject.ts

@@ -37,7 +37,7 @@ export class BlockObject extends SceneObject {
     private _models: (ModelObject | InstanceReference<ModelObject>)[] = [];
 
     constructor(readonly blockState: BlockState, options?: Partial<BlockObjectOptions>) {
-        super();
+        super(options);
         this.options = merge({}, BlockObject.DEFAULT_OPTIONS, options ?? {});
         //TODO
     }

package/src/model/index.ts

@@ -0,0 +1,5 @@
+export * from './Model'
+export * from './DisplayPosition'
+export * from './ModelElement'
+export * from './ModelMerger'
+export * from './ModelPart'

package/src/model/scene/ModelObject.ts

@@ -35,8 +35,9 @@ export class ModelObject extends SceneObject {
     private meshesCreated: boolean = false;
 
     constructor(readonly originalModel: Model, options?: Partial<ModelObjectOptions>) {
-        super();
+        super(options);
         this.options = merge({}, ModelObject.DEFAULT_OPTIONS, options ?? {});
+        console.log(this.options);
     }
 
     async init(): Promise<void> {

package/src/renderer/Renderer.ts

@@ -1,22 +1,22 @@
-import { AxesHelper, Camera, EventDispatcher, GridHelper, OrthographicCamera, PCFSoftShadowMap, PerspectiveCamera, Scene, Vector3, WebGLRenderer } from "three";
-import { MineRenderScene } from "./MineRenderScene";
+import {AxesHelper, Camera, EventDispatcher, GridHelper, OrthographicCamera, PCFSoftShadowMap, PerspectiveCamera, Scene, Vector3, warn, WebGLRenderer} from "three";
+import {MineRenderScene} from "./MineRenderScene";
 import merge from "ts-deepmerge";
 import Stats from "stats.js";
-import { DeepPartial, isVector3 } from "../util/util";
-import { EffectComposer } from "three/examples/jsm/postprocessing/EffectComposer";
-import { SSAARenderPass } from "three/examples/jsm/postprocessing/SSAARenderPass";
-import { ShaderPass } from "three/examples/jsm/postprocessing/ShaderPass";
-import { CopyShader } from "three/examples/jsm/shaders/CopyShader";
-import { RenderPass } from "three/examples/jsm/postprocessing/RenderPass";
-import { SAOPass } from "three/examples/jsm/postprocessing/SAOPass";
-import { SSAOPass } from "three/examples/jsm/postprocessing/SSAOPass";
-import { FXAAShader } from "three/examples/jsm/shaders/FXAAShader";
-import { SMAAPass } from "three/examples/jsm/postprocessing/SMAAPass";
-import { SSAOShader } from "three/examples/jsm/shaders/SSAOShader";
-import { BloomPass } from "three/examples/jsm/postprocessing/BloomPass";
-import { ToonShader1, ToonShader2 } from "three/examples/jsm/shaders/ToonShader";
-import { isTripleArray, TripleArray } from "../model/Model";
-import { isOrthographicCamera, isPerspectiveCamera } from "../util/three";
+import {DeepPartial, isVector3, Maybe} from "../util/util";
+import {EffectComposer} from "three/examples/jsm/postprocessing/EffectComposer";
+import {SSAARenderPass} from "three/examples/jsm/postprocessing/SSAARenderPass";
+import {ShaderPass} from "three/examples/jsm/postprocessing/ShaderPass";
+import {CopyShader} from "three/examples/jsm/shaders/CopyShader";
+import {RenderPass} from "three/examples/jsm/postprocessing/RenderPass";
+import {SAOPass} from "three/examples/jsm/postprocessing/SAOPass";
+import {SSAOPass} from "three/examples/jsm/postprocessing/SSAOPass";
+import {FXAAShader} from "three/examples/jsm/shaders/FXAAShader";
+import {SMAAPass} from "three/examples/jsm/postprocessing/SMAAPass";
+import {SSAOShader} from "three/examples/jsm/shaders/SSAOShader";
+import {BloomPass} from "three/examples/jsm/postprocessing/BloomPass";
+import {ToonShader1, ToonShader2} from "three/examples/jsm/shaders/ToonShader";
+import {isTripleArray, TripleArray} from "../model/Model";
+import {isOrthographicCamera, isPerspectiveCamera} from "../util/three";
 
 export class Renderer {
 
@@ -56,7 +56,7 @@ export class Renderer {
     });
     public readonly options: RendererOptions;
 
-    public readonly element: HTMLElement;
+    protected _element?: HTMLElement;
 
     protected _scene: MineRenderScene;
     protected _camera: Camera;
@@ -73,9 +73,8 @@ export class Renderer {
     protected _animationFrame?: number = undefined;
     protected _resizeListener?: () => void = undefined;
 
-    constructor(options?: DeepPartial<RendererOptions>, element = document.body) {
+    constructor(options?: DeepPartial<RendererOptions>) {
         this.options = merge({}, Renderer.DEFAULT_OPTIONS, options ?? {});
-        this.element = element;
 
         this._animationLoop = this.animate.bind(this);
         this._fpsTimer = this.options.render.fpsLimit > 0 ? (1000 / this.options.render.fpsLimit) : undefined;
@@ -185,7 +184,7 @@ export class Renderer {
 
     public init() {
         if (typeof window["__THREE_DEVTOOLS__"] !== 'undefined') {
-            window["__THREE_DEVTOOLS__"].dispatchEvent(new CustomEvent('observe', { detail: this.scene }));
+            window["__THREE_DEVTOOLS__"].dispatchEvent(new CustomEvent('observe', {detail: this.scene}));
         }
 
         /// DEBUG
@@ -228,16 +227,29 @@ export class Renderer {
             };
             window.addEventListener('resize', this._resizeListener);//TODO: remove listener
         }
+    }
 
-        // Add the canvas!
-        this.element.appendChild(this.renderer.domElement);
+    public get element(): Maybe<HTMLElement> {
+        return this._element;
+    }
+
+    public appendTo(element: HTMLElement): void {
+        this._element = element;
+        this._element.appendChild(this.renderer.domElement);
+        if (this.viewWidth == 0) {
+            console.warn('0 element width');
+        }
+        if (this.viewHeight == 0) {
+            console.warn('0 element height');
+        }
+        this.resize(this.viewWidth, this.viewHeight);
     }
 
     /**
      * Register an EventDispatcher which may update the scene or renderer in order to redraw the scene
      */
     public registerEventDispatcher(dispatcher: EventDispatcher, changeEvent: string = 'change') {
-        dispatcher.addEventListener(changeEvent,event=>{
+        dispatcher.addEventListener(changeEvent, event => {
             this._dirty = true;
         })
     }
@@ -320,6 +332,11 @@ export class Renderer {
 
     //</editor-fold>
 
+    public toImage(): string {
+        //TODO: mime type, trim transparent pixels
+        return this.renderer.domElement.toDataURL();
+    }
+
     ///
 
     protected get attachedToBody() {
@@ -327,11 +344,11 @@ export class Renderer {
     }
 
     protected get viewWidth() {
-        return this.attachedToBody ? window.innerWidth : this.element.offsetWidth;
+        return this.attachedToBody ? window.innerWidth : this.element?.offsetWidth || 0;
     }
 
     protected get viewHeight() {
-        return this.attachedToBody ? window.innerHeight : this.element.offsetHeight;
+        return this.attachedToBody ? window.innerHeight : this.element?.offsetHeight || 0;
     }
 
     public get scene(): MineRenderScene {

package/src/request/Requests.ts

@@ -11,9 +11,12 @@ if (typeof window === "undefined") {
 
 export class Requests {
 
-    private static axiosInstance: AxiosInstance = axios.create({});
+    private static axiosInstance: AxiosInstance = axios.create({
+        timeout: 5000
+    });
 
     private static mcAssetInstance: AxiosInstance = axios.create({
+        timeout: 5000
     })
 
     private static mcAssetRequestQueue: JobQueue<AxiosRequestConfig, AxiosResponse>

package/src/texture/TextureAtlas.ts

@@ -1,3 +1,4 @@
+import {ImageData} from "canvas";
 import { CanvasImage } from "../canvas/CanvasImage";
 import { DoubleArray, Model } from "../model/Model";
 import { AnimatorFunction } from "../AnimatorFunction";

package/src/three/OrbitControls.d.ts

@@ -1,4 +1,4 @@
-import { Camera, MOUSE, TOUCH, Vector3 } from '../../../src/Three';
+import { Camera, MOUSE, TOUCH, Vector3 } from 'three';
 
 export class OrbitControls {
     constructor(object: Camera, domElement?: HTMLElement);

package/src/three/index.ts

@@ -0,0 +1,2 @@
+export * from './BufferGeometryUtils'
+export * from './OrbitControls'

package/src/util/index.ts

@@ -0,0 +1,3 @@
+export * from './util'
+export * from './BatchedExecutor'
+export * from './three'

package/gulpfile.js

@@ -1,77 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-
-const gulp = require('gulp');
-const source = require('vinyl-source-stream');
-const buffer = require('vinyl-buffer');
-const sourcemaps = require('gulp-sourcemaps');
-
-const browserify = require('browserify');
-const watchify = require('watchify');
-const tsify = require('tsify');
-const babelify = require('babelify');
-
-function bundle(watch) {
-    let bundler = browserify('src/index.ts', Object.assign({}, watchify.args,
-        {
-            cache: {},
-            packageCache: {},
-            debug: true,
-            standalone: "MineRender",
-            insertGlobals: true,
-        }
-    ))
-        .plugin(tsify, {
-            project: 'tsconfig.json'
-        })
-        .transform(babelify, {
-            extensions: ['.tsc', '.ts', '.js'],
-            sourceMaps: true,
-            global: true,
-            compact: false,
-            plugins: ['@babel/plugin-transform-modules-commonjs']
-        })
-    bundler.on('log', l => console.log(l));
-
-    bundler.on('error', function (error) {
-        console.error("bundler error (1)");
-        console.error(error);
-    });
-
-    function rebundle() {
-        console.log("bundling...")
-        console.time("bundle")
-        return bundler
-
-            .bundle()
-            .on('error', function (error) {
-                console.error("bundler error (2)");
-                console.error(error);
-            })
-
-            .pipe(source('bundle.js'))
-            .pipe(buffer())
-            .pipe(sourcemaps.init({loadMaps: true}))
-            .pipe(sourcemaps.write('./'))
-            .pipe(gulp.dest('dist'))
-
-            .on('end', function () {
-                console.timeEnd("bundle");
-                console.log("bundle done!")
-            });
-    }
-
-    if (watch) {
-        // bundler = watchify(bundler);
-        bundler.plugin(watchify)
-        bundler.on('update', rebundle);
-    }
-    return rebundle();
-}
-
-gulp.task('bundle', function () {
-    return bundle(false);
-});
-gulp.task('bundle:w', function () {
-    return bundle(true);
-});