minerender 2.1.0-alpha.13 → 2.1.0-alpha.15

package/dist/browser/index.d.mts

@@ -14,7 +14,7 @@ interface AnimatorFunction {
 }
 
 declare enum Axis {
-    X = "X",
+    X = "x",
     Y = "y",
     Z = "z"
 }

package/dist/browser/index.d.ts

@@ -14,7 +14,7 @@ interface AnimatorFunction {
 }
 
 declare enum Axis {
-    X = "X",
+    X = "x",
     Y = "y",
     Z = "z"
 }

package/dist/browser/index.js

@@ -434,7 +434,7 @@ registerBrowserEnv();
 // src/Axis.ts
 var import_three = require("three");
 var Axis = /* @__PURE__ */ ((Axis3) => {
-  Axis3["X"] = "X";
+  Axis3["X"] = "x";
   Axis3["Y"] = "y";
   Axis3["Z"] = "z";
   return Axis3;
@@ -442,7 +442,7 @@ var Axis = /* @__PURE__ */ ((Axis3) => {
 var AXES = Object.values(Axis);
 function axisToVec3(axis) {
   switch (axis) {
-    case "X" /* X */:
+    case "x" /* X */:
       return new import_three.Vector3(1, 0, 0);
     case "y" /* Y */:
       return new import_three.Vector3(0, 1, 0);
@@ -1332,9 +1332,9 @@ var ModelMerger = class {
     const models = await this.collectAllParents(model);
     let merged = {};
     for (let parentModel of models) {
-      merged = (0, import_ts_deepmerge.default)(merged, parentModel);
+      merged = import_ts_deepmerge.default.withOptions({ mergeArrays: false }, merged, parentModel);
     }
-    merged = (0, import_ts_deepmerge.default)(merged, model);
+    merged = import_ts_deepmerge.default.withOptions({ mergeArrays: false }, merged, model);
     merged.hierarchy = models.map((m) => m.parent).filter((p12) => `${p12}`);
     merged.hierarchy.push(`${merged.parent}`);
     return merged;
@@ -1594,7 +1594,7 @@ function applyElementRotation(rotation, geometry) {
   const origin = new import_three7.Vector3(rotation.origin[0], rotation.origin[1], rotation.origin[2]);
   geometry.translate(-origin.x, -origin.y, -origin.z);
   switch (rotation.axis) {
-    case "X" /* X */:
+    case "x" /* X */:
       geometry.rotateX(toRadians(rotation.angle));
       break;
     case "y" /* Y */:
@@ -1625,7 +1625,7 @@ function applyModelPartRotation(modelPart, geometry) {
 }
 function applyGenericRotation(axis, rotation, obj) {
   switch (axis) {
-    case "X" /* X */:
+    case "x" /* X */:
       obj.rotateOnAxis(new import_three7.Vector3(1, 0, 0), toRadians(rotation));
       break;
     case "y" /* Y */:
@@ -2503,17 +2503,13 @@ var UVMapper = class {
               this.setCubeFaceUvInArray(uv, faceIndex * 4, [0, 1, 8 / size, (size - 8) / size]);
               continue;
             }
+            if (!face.texture) continue;
             if (!face.uv) {
               face.uv = this.getFallbackUv(element, faceName);
             }
-            let faceTexture = face.texture;
-            let texPosition;
-            let texSize;
-            if (faceTexture) {
-              faceTexture = faceTexture.substr(1);
-              texPosition = positions[faceTexture] || [0, 0];
-              texSize = sizes[faceTexture] || [16, 16];
-            }
+            const faceTexture = face.texture.substr(1);
+            const texPosition = positions[faceTexture] || [0, 0];
+            const texSize = sizes[faceTexture] || [16, 16];
             let texPosV = new import_three8.Vector2(texPosition[0], texPosition[1]);
             const [tl, tr, bl, br] = this.expandAndRotateMcUvs(face.uv, face.rotation, texSize[0], texSize[1]);
             tl.add(texPosV);
@@ -4569,9 +4565,6 @@ var _BlockObject = class _BlockObject extends SceneObject {
       }
     }
     obj.setRotation(rotation);
-    setTimeout(() => {
-      obj.setRotation(rotation);
-    }, 150);
     console.log(obj);
     return obj;
   }
@@ -4662,10 +4655,11 @@ var _BlockObject = class _BlockObject extends SceneObject {
     }
   }
   setPosition(position) {
-    super.setPosition(position);
+    this.position.copy(position);
     for (let model of this._models) {
       model.setPosition(position);
     }
+    this.notifyDirty();
   }
   //TODO: should override rotation + scale methods
   //TODO