minerender 2.0.0-alpha.7 → 2.0.0-alpha.9

package/src/index.ts

@@ -1,66 +1,68 @@
-// 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 './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';
+// 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';

package/src/model/scene/ModelObject.ts

@@ -37,7 +37,7 @@ export class ModelObject extends SceneObject {
     constructor(readonly originalModel: Model, options?: Partial<ModelObjectOptions>) {
         super(options);
         this.options = merge({}, ModelObject.DEFAULT_OPTIONS, options ?? {});
-        console.log(this.options);
+        console.log("ModelObject options", this.options);
     }
 
     async init(): Promise<void> {

package/src/renderer/MineRenderScene.ts

@@ -64,17 +64,17 @@ export class MineRenderScene extends Scene {
         return this.add(...object);
     }
 
-    async addSceneObject<A extends BasicMinecraftAsset, T extends SceneObject, O extends SceneObjectOptions>(asset: A, objectSupplier: () => T | Promise<T>, options?: Partial<O>, parent: Object3D = this): Promise<T | InstanceReference<T>> {
-        console.log("addSceneObject")
+    async addSceneObject<A extends BasicMinecraftAsset, T extends SceneObject, O extends SceneObjectOptions>(asset: A, objectSupplier: () => T | Promise<T>, _options?: Partial<O>, parent: Object3D = this): Promise<T | InstanceReference<T>> {
+        console.log("addSceneObject", asset)
         console.log("parent", parent)
         this.dirty = true;
         // console.log(this.instanceCache)
-        if (options?.instanceMeshes && asset.key &&  (<AssetKey>asset.key)?.assetType === "models"/*TODO*/) {
+        const obj = await objectSupplier();
+        if (obj?.options?.instanceMeshes && asset.key &&  (<AssetKey>asset.key)?.assetType === "models"/*TODO*/) {
             // console.log("instanceMeshes + key")
             // check for existing instances
             const key = asset.key.serialize();
             return this.instanceManager.getOrCreate(key, async () => {
-                const obj = await objectSupplier();
                 obj.scene = this;
                 await obj.init();
                 parent.add(obj);
@@ -83,7 +83,6 @@ export class MineRenderScene extends Scene {
             });
         } else {
             // console.log("!instanceMeshes | !key")
-            const obj = await objectSupplier();
             obj.scene = this;
             // await this.initAndAdd(obj);
             await obj.init();

package/src/renderer/SceneObject.ts

@@ -44,6 +44,7 @@ export class SceneObject extends Object3D implements Disposable, Instanceable, T
     constructor(options?: Partial<SceneObjectOptions>) {
         super();
         this.options = merge({}, SceneObject.DEFAULT_OPTIONS, options ?? {});
+        console.log("SceneObject options", this.options);
     }
 
     public set scene(scene: MineRenderScene) {

package/src/three/index.ts

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