minerender 2.1.0-alpha.15 → 2.1.0-alpha.17

package/dist/node/index.d.mts

@@ -690,16 +690,17 @@ interface BlockStateVariant {
     y?: number;
     x?: number;
     uvlock?: boolean;
+    weight?: number;
 }
 interface BlockStateMultipart {
-    when?: MultipartCondition | {
-        OR: MultipartCondition[];
-    };
-    apply?: BlockStateVariant;
-}
-interface MultipartCondition {
-    [key: string]: string;
+    when?: MultipartCondition;
+    apply?: BlockStateVariant | BlockStateVariant[];
 }
+type MultipartCondition = Record<string, string> | {
+    OR: MultipartCondition[];
+} | {
+    AND: MultipartCondition[];
+};
 
 declare const DEFAULT_ROOT = "https://assets.mcasset.cloud/1.21.11";
 declare const DEFAULT_NAMESPACE = "minecraft";

package/dist/node/index.d.ts

@@ -690,16 +690,17 @@ interface BlockStateVariant {
     y?: number;
     x?: number;
     uvlock?: boolean;
+    weight?: number;
 }
 interface BlockStateMultipart {
-    when?: MultipartCondition | {
-        OR: MultipartCondition[];
-    };
-    apply?: BlockStateVariant;
-}
-interface MultipartCondition {
-    [key: string]: string;
+    when?: MultipartCondition;
+    apply?: BlockStateVariant | BlockStateVariant[];
 }
+type MultipartCondition = Record<string, string> | {
+    OR: MultipartCondition[];
+} | {
+    AND: MultipartCondition[];
+};
 
 declare const DEFAULT_ROOT = "https://assets.mcasset.cloud/1.21.11";
 declare const DEFAULT_NAMESPACE = "minecraft";

package/dist/node/index.js

@@ -1112,7 +1112,11 @@ var Materials = class _Materials {
 
                 if (SHADE) {
 
-                    vec3 N = vec3( modelMatrix * instanceMatrix * vec4(normal, 0.0) );
+                    #ifdef USE_INSTANCING
+                        vec3 N = vec3( modelMatrix * instanceMatrix * vec4(normal, 0.0) );
+                    #else
+                        vec3 N = vec3( modelMatrix * vec4(normal, 0.0) );
+                    #endif
 
                     float yLight = (1.0+N.y) * 0.5;
                     light = yLight * (1.0-AMBIENT) + N.x*N.x * XFAC + N.z*N.z * ZFAC + AMBIENT;
@@ -4405,6 +4409,16 @@ function isModelObject(obj) {
 var import_ts_deepmerge6 = __toESM(require_dist());
 var import_three16 = require("three");
 var p10 = prefix("BlockObject");
+function matchesCondition(condition, state) {
+  return Object.entries(condition).every(([key, value]) => {
+    if (Array.isArray(value)) {
+      if (key === "OR") return value.some((child) => matchesCondition(child, state));
+      if (key === "AND") return value.every((child) => matchesCondition(child, state));
+      return false;
+    }
+    return typeof value === "string" && state[key] !== void 0 && value.split("|").includes(`${state[key]}`);
+  });
+}
 var BlockObject = class _BlockObject extends SceneObject {
   constructor(blockState, options) {
     super(options);
@@ -4438,15 +4452,9 @@ var BlockObject = class _BlockObject extends SceneObject {
         if (this.blockState.variants) {
           await this.setState(Object.keys(this.blockState.variants)[0]);
         } else if (this.blockState.multipart) {
-          for (let part of this.blockState.multipart) {
-            if (part.when && !("OR" in part.when)) {
-              const k = Object.keys(part.when)[0];
-              if (k) {
-                await this.setState(k, part.when[k].split("|")[0]);
-                break;
-              }
-            }
-          }
+          const condition = this.blockState.multipart.map((part) => part.when).find((when) => when !== void 0 && Object.values(when).every((value) => typeof value === "string"));
+          const state = Object.fromEntries(Object.entries(condition ?? {}).map(([key, value]) => [key, value.split("|")[0]]));
+          await this.setState(state);
         }
       }
     } else {
@@ -4506,52 +4514,8 @@ var BlockObject = class _BlockObject extends SceneObject {
           console.debug(p10, "Missing apply for blockState part", part);
           continue;
         }
-        if (!part.when) {
+        if (!part.when || matchesCondition(part.when, state)) {
           out.push(this.getSingleVariant(part.apply));
-        } else {
-          let matches = true;
-          if ("OR" in part.when) {
-            const or = part.when.OR;
-            let anyMatch = false;
-            for (let o of or) {
-              for (let k in o) {
-                const split = o[k].split("|");
-                let m = false;
-                for (let s of split) {
-                  if (`${state[k]}` === `${s}`) {
-                    m = true;
-                    break;
-                  }
-                }
-                if (m) {
-                  anyMatch = true;
-                  break;
-                }
-              }
-            }
-            if (!anyMatch) {
-              matches = false;
-            }
-          } else {
-            for (let k in part.when) {
-              const split = part.when[k].split("|");
-              let m = false;
-              for (let s of split) {
-                if (`${state[k]}` === `${s}`) {
-                  m = true;
-                  break;
-                }
-              }
-              if (!m) {
-                matches = false;
-                break;
-              }
-            }
-          }
-          if (matches) {
-            const variants = part.apply;
-            out.push(this.getSingleVariant(variants));
-          }
         }
       }
     }
@@ -4581,11 +4545,21 @@ var BlockObject = class _BlockObject extends SceneObject {
     }
   }
   getSingleVariant(variants) {
-    if (Array.isArray(variants)) {
-      return variants[0];
-    } else {
-      return variants;
-    }
+    if (!Array.isArray(variants)) return variants;
+    if (!variants.length) throw new MineRenderError("Blockstate variant arrays must not be empty");
+    const total = variants.reduce((sum, variant) => {
+      const weight = variant.weight ?? 1;
+      if (!Number.isInteger(weight) || weight < 1) {
+        throw new MineRenderError(`Invalid blockstate variant weight: ${weight}`);
+      }
+      return sum + weight;
+    }, 0);
+    let choice = Math.random() * total;
+    for (const variant of variants) {
+      choice -= variant.weight ?? 1;
+      if (choice < 0) return variant;
+    }
+    return variants[variants.length - 1];
   }
   // @deprecated
   async createAVariant(variants, instanceInfo) {