npm - dsh-plugin-vrmpet3d - Versions diffs - 0.1.1 → 0.1.3 - Mend

dsh-plugin-vrmpet3d 0.1.1 → 0.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/README.md +1 -0
package/assets/game/levels.json +2925 -0
package/desktop/game-visibility.cjs +50 -0
package/desktop/main.js +60 -3
package/desktop/preload.js +11 -0
package/lib/client.core.js +279 -41
package/lib/client.js +144 -16
package/lib/client.menu.js +17 -4
package/lib/client.scene.js +134 -7
package/lib/config-page.html +11 -0
package/lib/config-page.js +153 -25
package/lib/core.js +279 -41
package/lib/desktop-page.js +167 -40
package/lib/desktop.js +18 -1
package/lib/global-page.html +34 -4
package/lib/index.js +94 -25
package/lib/menu.js +17 -4
package/lib/mini-game-core.js +329 -0
package/lib/mini-game-level-store.js +37 -0
package/lib/mini-game-page.js +615 -0
package/lib/mini-game.css +19 -0
package/lib/mini-game.html +50 -0
package/lib/scene.js +134 -7
package/lib/vrm-info.js +16 -1
package/package.json +3 -3

package/lib/mini-game.html ADDED Viewed

@@ -0,0 +1,50 @@
+<!doctype html>
+<html lang="zh-CN">
+<head>
+  <meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
+  <title>吃白饭 · 桌宠弹球</title>
+  <link rel="stylesheet" href="/vrmpet3d/window/lib/mini-game.css">
+  <style>.actions{flex-wrap:wrap}#test-controls{position:absolute;left:18px;bottom:64px;display:flex;flex-wrap:wrap;gap:8px;align-items:center;max-width:90%;padding:10px;border-radius:12px;background:#101b24e8;font-size:12px}#test-controls button{padding:6px 10px}</style>
+</head>
+<body>
+  <main id="game" aria-label="吃白饭，桌宠弹球游戏">
+    <div id="playfield">
+      <canvas id="arena" aria-label="鼠标移动横杆，左键发射，Esc 暂停"></canvas>
+      <canvas id="pet" aria-hidden="true"></canvas>
+      <div id="resume-countdown" hidden role="status" aria-live="polite" aria-atomic="true"><strong id="countdown-number">3</strong><span>准备继续 · Esc 返回暂停</span></div>
+    </div>
+    <header><div class="brand">吃白饭 <small>PET BREAKOUT</small></div><div></div><div class="controls"><button id="pause">暂停 <kbd>Esc</kbd></button><button id="fullscreen">全屏 ↗</button></div></header>
+    <div id="game-hud"><span id="level" aria-live="polite"></span><span id="score" aria-live="polite"></span></div>
+    <button id="notice" hidden></button>
+    <div id="lives" role="img" aria-label="备用 2 次机会"></div>
+    <p id="hint">移动鼠标控制横杆 · 左键发射 · Esc 暂停</p>
+    <p id="model-status" role="status">正在准备桌宠模型…</p>
+    <section id="overlay" hidden role="dialog" aria-modal="true" aria-labelledby="pause-title">
+      <fieldset id="debug-controls" class="model-controls" hidden><legend>DEBUG · 目前开放 2 关</legend>
+        <label for="debug-level">选择关卡</label><select id="debug-level"><option value="1">第1关 · DS / BALL</option><option value="2">第2关 · 蓝白大碗</option></select>
+        <small>切换关卡会重置所选关卡进度，保留当前机会和游戏设置。</small>
+      </fieldset>
+      <div class="panel"><span class="eyebrow">TAKE A LITTLE BREAK</span><h1 id="pause-title">休息一下</h1><p id="pause-copy">饭还热着，随时回来继续。</p><div id="sessions"></div><div class="actions"><button id="resume" class="primary">继续吃饭</button><button id="restart">重置当前关卡</button><button id="exit">保存并退出</button></div><p id="save-status" role="status"></p><p id="connection" role="status"></p></div>
+      <fieldset class="model-controls" hidden><legend>游戏模型</legend>
+        <label for="model-size">模型尺寸 <output id="model-size-value" for="model-size">90</output> px</label>
+        <input id="model-size" type="range" min="30" max="150" step="5" value="90">
+        <label for="spin-speed">旋转速度 <output id="spin-speed-value" for="spin-speed">7</output> rad/s</label>
+        <input id="spin-speed" type="range" min="0" max="30" step="1" value="7">
+        <label for="flight-speed">飞行速度 <output id="flight-speed-value" for="flight-speed">1</output> 倍</label>
+        <input id="flight-speed" type="range" min="0.5" max="2" step="0.1" value="1">
+        <label for="paddle-boost">每次撞杆加速 <output id="paddle-boost-value" for="paddle-boost">1.5</output> %</label>
+        <input id="paddle-boost" type="range" min="0" max="20" step="0.5" value="1.5">
+        <small>尺寸仅影响外观；自转设为 0 可停止旋转。飞行速度会改变游戏速度。</small>
+      </fieldset>
+    </section>
+    <aside id="test-controls" hidden aria-label="独立测试模式">
+      <strong>独立测试模式</strong><button id="test-rice">测试吃饭</button><button id="test-bowl">测试撞碗</button><button id="test-loss">模拟漏球</button><button id="test-clear">模拟通关</button><button id="test-notice">模拟消息</button>
+    </aside>
+  </main>
+  <script id="game-level-data" type="application/json">null</script>
+  <script src="/vrmpet3d/window/lib/core.js"></script>
+  <script src="/vrmpet3d/window/lib/client.vendor.js"></script>
+  <script src="/vrmpet3d/window/lib/scene.js"></script>
+  <script src="/vrmpet3d/window/lib/mini-game-core.js"></script>
+  <script src="/vrmpet3d/window/lib/mini-game-page.js"></script>
+</body></html>

package/lib/scene.js CHANGED Viewed

@@ -67,10 +67,20 @@
   var GAZE_YAW_LIMIT = ((80 * Math.PI) / 180) / GAZE_WEIGHT;
   /**
-   * Pitch is left where it was: a head does not tip 90° forward or back without looking broken, and the
-   * request was for the turn. Raise this the same way if a bigger nod is ever wanted.
+   * Automatic pitch limit, before the gaze weight. Settings expose separate actual
+   * upward/downward angles in degrees; both default to 60 degrees.
    */
-  var GAZE_PITCH_LIMIT = 0.3;
+  var GAZE_PITCH_LIMIT = (60 * Math.PI / 180) / GAZE_WEIGHT;
+  function gazePitchLimits(preferences) {
+    var prefs = preferences || {};
+    function limit(key) {
+      return Number.isFinite(prefs[key])
+        ? Math.max(0, Math.min(60, prefs[key])) * Math.PI / 180 / GAZE_WEIGHT
+        : GAZE_PITCH_LIMIT;
+    }
+    return { up: limit('gazePitchUp'), down: limit('gazePitchDown') };
+  }
   /**
    * How far the head may turn IN TOTAL while an authored clip is driving it, in radians.
@@ -786,7 +796,8 @@
     }
     var yaw = Math.max(-GAZE_YAW_LIMIT, Math.min(GAZE_YAW_LIMIT, aim.yaw)) * GAZE_WEIGHT * this.gazeBlend;
-    var pitch = Math.max(-GAZE_PITCH_LIMIT, Math.min(GAZE_PITCH_LIMIT, aim.pitch)) * GAZE_WEIGHT * this.gazeBlend;
+    var pitchLimits = gazePitchLimits(this.scene && this.scene.preferences);
+    var pitch = Math.max(-pitchLimits.down, Math.min(pitchLimits.up, aim.pitch)) * GAZE_WEIGHT * this.gazeBlend;
     var axes = rest ? this.gazeAxes(head) : null;
     if (layeredOnClip) {
@@ -799,8 +810,7 @@
       var budget = Math.max(0, HEAD_LAYER_LIMIT - clipTurn);
       yaw = Math.max(-budget, Math.min(budget, yaw));
       // Pitch keeps its own (smaller) limit, but never more than what is left of the budget either.
-      pitch = Math.max(-Math.min(GAZE_PITCH_LIMIT * GAZE_WEIGHT, budget),
-        Math.min(Math.min(GAZE_PITCH_LIMIT * GAZE_WEIGHT, budget), pitch));
+      pitch = Math.max(-budget, Math.min(budget, pitch));
       if (axes) {
         this._quat.setFromAxisAngle(axes.yaw, yaw);
         this._quat2.setFromAxisAngle(axes.pitch, pitch);
@@ -1669,6 +1679,9 @@
     if (this.disposed) return;
     var w = Math.max(1, Math.round(width));
     var h = Math.max(1, Math.round(height));
+    // Layout works in fractional CSS pixels. Reapplying the same rounded size clears
+    // the framebuffer between rAFs when a settings reply arrives during an orbit.
+    if (this.width === w && this.height === h) return;
     this.renderer.setSize(w, h, false);
     this.camera.aspect = w / h;
     this.camera.updateProjectionMatrix();
@@ -1755,6 +1768,8 @@
   /** Replace the current avatar with a hardware-ready one. */
   Scene.prototype.installAvatar = function (avatar, root) {
+    (this.toonMaterials || []).forEach(function (entry) { if (entry.plain) entry.plain.dispose(); });
+    this.toonMaterials = null;
     // Stop before the old avatar is replaced: stopping is what undoes the clip's
     // pose, and it has to happen while the old model is still installed. Every
     // clip is then dropped, because a clip is fitted to one model — the cached
@@ -1779,6 +1794,7 @@
     this.frameAvatar(root);
     this.stage.add(root);
     this.avatar = avatar;
+    this.captureToonMaterials(root);
     this.kind = avatar.kind;
     /**
      * …and the collider switch, applied to the avatar that was just adopted.
@@ -1844,6 +1860,7 @@
      * model is loaded, so on a fresh pet that call finds nothing to snapshot and the first sweep would have
      * had no gravity to lean against (measured: `windState().joints === 0` on a real model with two chains).
      */
+    this.applySprings(this.preferences);
     this.captureSpringBase();
     this.expressionBehaviour = { blink: 0, blinkExpression: 'blink', emotion: null, emotionWeight: 0 };
     this.expressionState = { nextBlinkAt: null, blinkUntil: 0, nextIdleEmotionAt: null, emotionUntil: 0 };
@@ -1852,6 +1869,73 @@
     this.motion.setGazeIdle(this.preferences.gazeIdleSeconds);
     this.updateShadowPlane();
     this.refitCamera();
+    this.applyToonPreferences();
+  };
+  /** Keep the loaded materials (and expression bindings) intact so the switch is reversible. */
+  Scene.prototype.captureToonMaterials = function (root) {
+    var self = this;
+    this.toonMeshes = [];
+    this.toonMaterials = [];
+    var seen = new Map();
+    root.traverse(function (node) {
+      if (!node.isMesh || !node.material) return;
+      var originals = Array.isArray(node.material) ? node.material : [node.material];
+      var entries = originals.map(function (material) {
+        if (!material.isMToonMaterial) return null;
+        if (seen.has(material)) return seen.get(material);
+        var entry = { material: material, toony: material.shadingToonyFactor, shift: material.shadingShiftFactor,
+          shade: material.shadeColorFactor.clone(), width: material.outlineWidthFactor, plain: null };
+        seen.set(material, entry);
+        self.toonMaterials.push(entry);
+        return entry;
+      });
+      if (entries.some(Boolean)) self.toonMeshes.push({ node: node, original: node.material, entries: entries, originals: originals });
+    });
+  };
+  Scene.prototype.applyToonPreferences = function () {
+    var self = this;
+    var id = this.currentModelId || this.preferences.modelId;
+    var prefs = (this.preferences.toon || {})[id] || {};
+    var disabled = prefs.enabled === false;
+    (this.toonMaterials || []).forEach(function (entry) {
+      var material = entry.material;
+      material.shadingToonyFactor = prefs.shadingToonyFactor === undefined ? entry.toony : prefs.shadingToonyFactor;
+      material.shadingShiftFactor = prefs.shadingShiftFactor === undefined ? entry.shift : prefs.shadingShiftFactor;
+      material.shadeColorFactor.copy(entry.shade);
+      if (prefs.shadeStrength !== undefined) material.shadeColorFactor.lerp(material.color, 1 - prefs.shadeStrength);
+      material.outlineWidthFactor = entry.width * (prefs.outlineScale === undefined ? 1 : prefs.outlineScale);
+      if (disabled && !entry.plain) {
+        var plain = new self.THREE.MeshStandardMaterial();
+        ['map', 'alphaMap', 'alphaTest', 'transparent', 'opacity', 'side', 'depthWrite', 'depthTest',
+          'normalMap', 'normalScale', 'emissive', 'emissiveMap', 'emissiveIntensity', 'color'].forEach(function (key) {
+          if (material[key] === undefined) return;
+          if (plain[key] && typeof plain[key].copy === 'function') plain[key].copy(material[key]);
+          else plain[key] = material[key];
+        });
+        plain.visible = !material.isOutline;
+        entry.plain = plain;
+      }
+    });
+    (this.toonMeshes || []).forEach(function (mesh) {
+      mesh.node.material = disabled
+        ? (Array.isArray(mesh.original) ? mesh.originals.map(function (m, i) { return mesh.entries[i] ? mesh.entries[i].plain : m; })
+          : mesh.entries[0].plain)
+        : mesh.original;
+    });
+    this.toonDisabled = disabled;
+  };
+  Scene.prototype.syncPlainMaterials = function () {
+    if (!this.toonDisabled) return;
+    (this.toonMaterials || []).forEach(function (entry) {
+      if (!entry.plain) return;
+      // Expressions still target the authored MToon material, including UV animation.
+      entry.plain.color.copy(entry.material.color);
+      entry.plain.emissive.copy(entry.material.emissive);
+      entry.plain.opacity = entry.material.opacity;
+    });
   };
   /** A soft ground blob, so the pet does not appear to float. */
@@ -3380,7 +3464,8 @@
     var x = Math.max(-1, Math.min(1, aim.x));
     var y = Math.max(-1, Math.min(1, aim.y));
     // Screen y grows downward, pitch grows upward.
-    return { yaw: x * GAZE_YAW_LIMIT, pitch: -y * GAZE_PITCH_LIMIT };
+    var limits = gazePitchLimits(this.preferences);
+    return { yaw: x * GAZE_YAW_LIMIT, pitch: -y * (y < 0 ? limits.up : limits.down) };
   };
   /** Advance one frame. `dt` is in seconds. */
@@ -3437,6 +3522,7 @@
     this.advanceExpressions(dt);
     this.applyExpressions(this.preferences);
+    this.syncPlainMaterials();
     this.renderer.render(this.scene, this.camera);
     this.frame += 1;
   };
@@ -3448,6 +3534,7 @@
   Scene.prototype.applyPreferences = function (preferences) {
     var raw = preferences && typeof preferences === 'object' ? preferences : {};
     this.preferences = this.core.cleanPreferences(preferences);
+    this.applyToonPreferences();
     // A preferences push only carries `motions` when the caller meant to change
     // it. cleanPreferences always produces a (possibly empty) key, so adopting it
     // unconditionally would silently wipe a map set through setMotionMap.
@@ -3641,6 +3728,40 @@
     };
   };
+  /** The rendered eyes' midpoint, in canvas CSS pixels, independent of framing and camera orbit. */
+  Scene.prototype.gazeOrigin = function () {
+    var avatar = this.avatar;
+    if (!avatar || !this.THREE || !this.camera) return null;
+    var point = this._gazeOriginVec || (this._gazeOriginVec = new this.THREE.Vector3());
+    var other = this._gazeOtherEyeVec || (this._gazeOtherEyeVec = new this.THREE.Vector3());
+    var humanoid = avatar.vrm && avatar.vrm.humanoid;
+    var left = humanoid && typeof humanoid.getRawBoneNode === 'function' ? humanoid.getRawBoneNode('leftEye') : null;
+    var right = humanoid && typeof humanoid.getRawBoneNode === 'function' ? humanoid.getRawBoneNode('rightEye') : null;
+    left = left || (avatar.bones && avatar.bones.leftEye);
+    right = right || (avatar.bones && avatar.bones.rightEye);
+    var source;
+    if (left && right) {
+      left.getWorldPosition(point); right.getWorldPosition(other);
+      point.add(other).multiplyScalar(0.5);
+      source = 'eyes';
+    } else if (avatar.vrm && avatar.vrm.lookAt && typeof avatar.vrm.lookAt.getLookAtWorldPosition === 'function') {
+      // The loader has already converted VRM 0/1 coordinate conventions for this offset.
+      if (avatar.root) avatar.root.updateWorldMatrix(true, true);
+      avatar.vrm.lookAt.getLookAtWorldPosition(point);
+      source = 'lookAt';
+    } else {
+      var head = gazeNodeFor(avatar);
+      if (!head) return null;
+      head.getWorldPosition(point);
+      source = 'head';
+    }
+    this.camera.updateMatrixWorld(true);
+    var projected = this.projectToCanvas(point);
+    if (!projected || projected.z < -1 || projected.z > 1) return null;
+    projected.source = source;
+    return projected;
+  };
   /**
    * Apply the draught to the chains, decay it, and keep it LOCAL.
    *
@@ -3865,6 +3986,10 @@
    */
   Scene.prototype.setSpringDefaults = function (defaults) {
     this.springDefaults = defaults && typeof defaults === 'object' ? defaults : null;
+    // Catalog defaults can arrive after the avatar and preferences on either surface.
+    // Apply them now; waiting for another preference edit makes a reload appear to fix physics.
+    this.applySprings(this.preferences);
+    this.captureSpringBase();
   };
   /**
@@ -4931,6 +5056,8 @@
   Scene.prototype.dispose = function () {
     if (this.disposed) return;
+    (this.toonMeshes || []).forEach(function (mesh) { mesh.node.material = mesh.original; });
+    (this.toonMaterials || []).forEach(function (entry) { if (entry.plain) entry.plain.dispose(); });
     this.disposed = true;
     // Stop and uncache every mixer before the renderer goes: a mixer holds a
     // binding table that references the model's bones, so leaving them behind

package/lib/vrm-info.js CHANGED Viewed

@@ -437,7 +437,7 @@ export function describeGlb(glb, label) {
   (gltf.materials || []).forEach((material, index) => {
     const pbr = material.pbrMetallicRoughness || {};
     const extensions = material.extensions || {};
-    const mtoon = extensions.VRM && extensions.VRM.materialProperties;
+    const mtoon = vrm0 && (vrm0.materialProperties || [])[index];
     const mtoon1 = extensions.VRMC_materials_mtoon || null;
     report.materials.push({
       index,
@@ -826,6 +826,21 @@ export function cacheStats() {
  */
 export function compactModelInfo(info) {
   return {
+    toon: {
+      total: (info.materials || []).length,
+      materials: (info.materials || []).filter((m) => m.mtoon1 || (m.mtoon && m.mtoon.shader === 'VRM/MToon')).map((m) => {
+        // Same VRM 0 -> MToon 1 conversion as the pinned three-vrm loader.
+        const legacy = m.mtoon && m.mtoon.floatProperties || {};
+        const shift = legacy._ShadeShift ?? 0;
+        const toony = (legacy._ShadeToony ?? 0.9) + (1 - (legacy._ShadeToony ?? 0.9)) * (0.5 + 0.5 * shift);
+        return {
+        name: m.name,
+        shadingToonyFactor: m.mtoon1 ? (m.mtoon1.shadingToonyFactor ?? 0.9) : toony,
+        shadingShiftFactor: m.mtoon1 ? (m.mtoon1.shadingShiftFactor ?? 0) : -shift - (1 - toony),
+        outline: m.mtoon1 ? Boolean(m.mtoon1.outlineWidthMode && m.mtoon1.outlineWidthMode !== 'none' && m.mtoon1.outlineWidthFactor > 0)
+          : Boolean(m.mtoon.floatProperties._OutlineWidthMode && m.mtoon.floatProperties._OutlineWidth > 0),
+      }; }),
+    },
     supported: info.supported === true,
     vrmSpec: info.vrmSpec,
     generator: info.generator,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-vrmpet3d",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "DeepSeek Harness 的 VRM 3D 桌宠：任务状态联动、独立悬浮窗、模型动作与 AI 碎碎念。",
   "type": "module",
   "license": "MIT",
@@ -36,7 +36,6 @@
       ]
     }
   },
-  "displayName": "桌宠 3D · VRM Pet 3D",
   "repository": {
     "type": "git",
     "url": "https://github.com/drliuhuan/dsh-plugin-vrmpet3d.git"
@@ -53,5 +52,6 @@
     "vrma",
     "threejs",
     "electron"
-  ]
+  ],
+  "displayName": "桌宠 3D · VRM Pet 3D"
 }