reze-engine 0.61.2 → 0.61.3

package/dist/pmx-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pmx-loader.d.ts","sourceRoot":"","sources":["../src/pmx-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAcN,MAAM,SAAS,CAAA;AAGhB,OAAO,EAA0B,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEzE,qBAAa,SAAS;IACpB,OAAO,CAAC,IAAI,CAAU;IACtB,OAAO,CAAC,MAAM,CAAI;IAClB,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,QAAQ,CAAI;IACpB,OAAO,CAAC,mBAAmB,CAAI;IAC/B,OAAO,CAAC,eAAe,CAAI;IAC3B,OAAO,CAAC,gBAAgB,CAAI;IAC5B,OAAO,CAAC,iBAAiB,CAAI;IAC7B,OAAO,CAAC,aAAa,CAAI;IACzB,OAAO,CAAC,cAAc,CAAI;IAC1B,OAAO,CAAC,kBAAkB,CAAI;IAC9B,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,KAAK,CAAa;IAC1B,OAAO,CAAC,mBAAmB,CAA4B;IACvD,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,WAAW,CAAY;IAC/B,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,QAAQ,CAAe;IAE/B,OAAO;IAQP,OAAO,CAAC,IAAI;WAMC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAI9C,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,KAAK;WAIpC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAKxF,OAAO,CAAC,KAAK;IAiBb,OAAO,CAAC,WAAW;IAwDnB,OAAO,CAAC,aAAa;IA+FrB,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,aAAa;IAkBrB,OAAO,CAAC,cAAc;IAsEtB,OAAO,CAAC,UAAU;IAkLlB,OAAO,CAAC,WAAW;IAgMnB,OAAO,CAAC,iBAAiB;IAgDzB,OAAO,CAAC,gBAAgB;IA+FxB,OAAO,CAAC,WAAW;IAmGnB,OAAO,CAAC,kBAAkB;IAmC1B,OAAO,CAAC,OAAO;IAkJf,OAAO,CAAC,QAAQ;IAOhB,OAAO,CAAC,SAAS;IAUjB,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,SAAS;IAQjB,OAAO,CAAC,OAAO;IAwBf,OAAO,CAAC,QAAQ;CAIjB"}
+{"version":3,"file":"pmx-loader.d.ts","sourceRoot":"","sources":["../src/pmx-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAcN,MAAM,SAAS,CAAA;AAGhB,OAAO,EAA0B,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEzE,qBAAa,SAAS;IACpB,OAAO,CAAC,IAAI,CAAU;IACtB,OAAO,CAAC,MAAM,CAAI;IAClB,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,QAAQ,CAAI;IACpB,OAAO,CAAC,mBAAmB,CAAI;IAC/B,OAAO,CAAC,eAAe,CAAI;IAC3B,OAAO,CAAC,gBAAgB,CAAI;IAC5B,OAAO,CAAC,iBAAiB,CAAI;IAC7B,OAAO,CAAC,aAAa,CAAI;IACzB,OAAO,CAAC,cAAc,CAAI;IAC1B,OAAO,CAAC,kBAAkB,CAAI;IAC9B,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,KAAK,CAAa;IAC1B,OAAO,CAAC,mBAAmB,CAA4B;IACvD,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,WAAW,CAAY;IAC/B,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,QAAQ,CAAe;IAE/B,OAAO;IAQP,OAAO,CAAC,IAAI;WAMC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAI9C,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,KAAK;WAIpC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAKxF,OAAO,CAAC,KAAK;IAiBb,OAAO,CAAC,WAAW;IAwDnB,OAAO,CAAC,aAAa;IA0GrB,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,aAAa;IAkBrB,OAAO,CAAC,cAAc;IAsEtB,OAAO,CAAC,UAAU;IAkLlB,OAAO,CAAC,WAAW;IAgMnB,OAAO,CAAC,iBAAiB;IAgDzB,OAAO,CAAC,gBAAgB;IA+FxB,OAAO,CAAC,WAAW;IAmGnB,OAAO,CAAC,kBAAkB;IAmC1B,OAAO,CAAC,OAAO;IAkJf,OAAO,CAAC,QAAQ;IAOhB,OAAO,CAAC,SAAS;IAUjB,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,SAAS;IAQjB,OAAO,CAAC,OAAO;IAwBf,OAAO,CAAC,QAAQ;CAIjB"}

package/dist/pmx-loader.js

@@ -153,8 +153,13 @@ export class PmxLoader {
                 const j0 = this.getNonVertexIndex(this.boneIndexSize);
                 const j1 = this.getNonVertexIndex(this.boneIndexSize);
                 const w0f = this.getFloat32();
-                const w0 = Math.max(0, Math.min(255, Math.round(w0f * 255)));
-                const w1 = Math.max(0, Math.min(255, 255 - w0));
+                let w0 = Math.max(0, Math.min(255, Math.round(w0f * 255)));
+                // A side with no bone (-1) takes nothing: it would land on bone 0.
+                if (j1 < 0)
+                    w0 = 255;
+                else if (j0 < 0)
+                    w0 = 0;
+                const w1 = 255 - w0;
                 joints[base] = j0 >= 0 ? j0 : 0;
                 joints[base + 1] = j1 >= 0 ? j1 : 0;
                 weights[base] = w0;
@@ -167,27 +172,36 @@ export class PmxLoader {
             else if (type === 2 || type === 4) {
                 // BDEF4 or QDEF (treat as LBS4)
                 let sum = 0;
+                const valid = [false, false, false, false];
                 for (let k = 0; k < 4; k++) {
                     const j = this.getNonVertexIndex(this.boneIndexSize);
                     joints[base + k] = j >= 0 ? j : 0;
+                    valid[k] = j >= 0;
                 }
                 const wf = [this.getFloat32(), this.getFloat32(), this.getFloat32(), this.getFloat32()];
-                const ws = wf.map((x) => Math.max(0, Math.min(1, x)));
-                const w8 = ws.map((x) => Math.round(x * 255));
-                sum = w8[0] + w8[1] + w8[2] + w8[3];
-                if (sum === 0) {
+                // A slot with no bone (-1) takes nothing: its index lands on bone 0, the
+                // model's root, which a motion never moves with センター.
+                const ws = wf.map((x, k) => (valid[k] ? Math.max(0, Math.min(1, x)) : 0));
+                sum = ws[0] + ws[1] + ws[2] + ws[3];
+                if (sum <= 0) {
                     weights[base] = 255;
                 }
                 else {
-                    // Normalize to 255
-                    const scale = 255 / sum;
+                    // Normalize to 255, and the rounding's remainder to the HEAVIEST
+                    // slot. It went to the fourth, which is usually empty — bone 0 — and
+                    // a vertex one or two 255ths on the root is invisible at the origin
+                    // but trails a spike back to it from a figure a motion has carried
+                    // 58 m away.
                     let accum = 0;
-                    for (let k = 0; k < 3; k++) {
-                        const v = Math.max(0, Math.min(255, Math.round(w8[k] * scale)));
+                    let heaviest = 0;
+                    for (let k = 0; k < 4; k++) {
+                        const v = Math.round((ws[k] / sum) * 255);
                         weights[base + k] = v;
                         accum += v;
+                        if (ws[k] > ws[heaviest])
+                            heaviest = k;
                     }
-                    weights[base + 3] = Math.max(0, Math.min(255, 255 - accum));
+                    weights[base + heaviest] = Math.max(0, Math.min(255, weights[base + heaviest] + 255 - accum));
                 }
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reze-engine",
-  "version": "0.61.2",
+  "version": "0.61.3",
   "description": "A lightweight WebGPU engine for real-time 3D MMD/PMX model rendering",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/pmx-loader.ts

@@ -190,8 +190,11 @@ export class PmxLoader {
         const j0 = this.getNonVertexIndex(this.boneIndexSize)
         const j1 = this.getNonVertexIndex(this.boneIndexSize)
         const w0f = this.getFloat32()
-        const w0 = Math.max(0, Math.min(255, Math.round(w0f * 255)))
-        const w1 = Math.max(0, Math.min(255, 255 - w0))
+        let w0 = Math.max(0, Math.min(255, Math.round(w0f * 255)))
+        // A side with no bone (-1) takes nothing: it would land on bone 0.
+        if (j1 < 0) w0 = 255
+        else if (j0 < 0) w0 = 0
+        const w1 = 255 - w0
         joints[base] = j0 >= 0 ? j0 : 0
         joints[base + 1] = j1 >= 0 ? j1 : 0
         weights[base] = w0
@@ -203,26 +206,34 @@ export class PmxLoader {
       } else if (type === 2 || type === 4) {
         // BDEF4 or QDEF (treat as LBS4)
         let sum = 0
+        const valid = [false, false, false, false]
         for (let k = 0; k < 4; k++) {
           const j = this.getNonVertexIndex(this.boneIndexSize)
           joints[base + k] = j >= 0 ? j : 0
+          valid[k] = j >= 0
         }
         const wf = [this.getFloat32(), this.getFloat32(), this.getFloat32(), this.getFloat32()]
-        const ws = wf.map((x) => Math.max(0, Math.min(1, x)))
-        const w8 = ws.map((x) => Math.round(x * 255))
-        sum = w8[0] + w8[1] + w8[2] + w8[3]
-        if (sum === 0) {
+        // A slot with no bone (-1) takes nothing: its index lands on bone 0, the
+        // model's root, which a motion never moves with センター.
+        const ws = wf.map((x, k) => (valid[k] ? Math.max(0, Math.min(1, x)) : 0))
+        sum = ws[0] + ws[1] + ws[2] + ws[3]
+        if (sum <= 0) {
           weights[base] = 255
         } else {
-          // Normalize to 255
-          const scale = 255 / sum
+          // Normalize to 255, and the rounding's remainder to the HEAVIEST
+          // slot. It went to the fourth, which is usually empty — bone 0 — and
+          // a vertex one or two 255ths on the root is invisible at the origin
+          // but trails a spike back to it from a figure a motion has carried
+          // 58 m away.
           let accum = 0
-          for (let k = 0; k < 3; k++) {
-            const v = Math.max(0, Math.min(255, Math.round(w8[k] * scale)))
+          let heaviest = 0
+          for (let k = 0; k < 4; k++) {
+            const v = Math.round((ws[k] / sum) * 255)
             weights[base + k] = v
             accum += v
+            if (ws[k] > ws[heaviest]) heaviest = k
           }
-          weights[base + 3] = Math.max(0, Math.min(255, 255 - accum))
+          weights[base + heaviest] = Math.max(0, Math.min(255, weights[base + heaviest] + 255 - accum))
         }
       } else {
         throw new Error(`Invalid bone weight type: ${type}`)