dsh-plugin-vrmpet3d 0.1.1 → 0.1.2

package/lib/index.js

@@ -1,4 +1,4 @@
-// dsh-plugin-vrmpet3d ?host half.
+// dsh-plugin-vrmpet3d — host half.
 //
 // Responsibilities, and deliberately nothing else:
 //
@@ -7,8 +7,8 @@
 //      text, tool arguments and attachments are never read, stored or forwarded.
 //   2. Serve the user's own model and authored-motion files to the page over the
 //      web carrier's `/vrmpet3d` routes. A plugin's `assets/` directory is NOT served
-//      to the browser by DSH ?the only plugin-owned browser routes are
-//      `/plugins/<id>/client*.js` ?so a model or a `.vrma` the user drops
+//      to the browser by DSH — the only plugin-owned browser routes are
+//      `/plugins/<id>/client*.js` — so a model or a `.vrma` the user drops
 //      on disk can only reach the page through a host route. Every route is
 //      allowlisted to the configured directories and never exposes an absolute
 //      path.
@@ -26,7 +26,7 @@ import { SettingsStore, settingsFileFor } from './settings.js';
 // `VRMPET3D_*` with the pre-rename `PET3D_*` names as a fallback — see the module's own note.
 import { envVar } from './env.js';
 
-// `lib/core.js` is a classic script that publishes itself on the global ?that is
+// `lib/core.js` is a classic script that publishes itself on the global — that is
 // how the client half reads it too, so importing it here is what keeps ONE list
 // of file extensions in the project. A host-side copy of the motion extensions is
 // exactly the kind of mirror that drifts: the browser would offer the user a
@@ -78,7 +78,7 @@ const IGNORED_DIRECTORIES = new Set(['node_modules', '.git', '.svn', '__pycache_
  *
  * Taken from `lib/core.js` rather than listed again here. The motion catalog
  * beside it is built from `core.MOTION_EXTENSIONS`, and the two must stay
- * disjoint ?a file offered by both catalogs, or by neither, is a class of bug
+ * disjoint — a file offered by both catalogs, or by neither, is a class of bug
  * that no single route can see, so membership is decided in one place.
  */
 const MODEL_EXTENSIONS = new Set(core.MODEL_EXTENSIONS);
@@ -130,14 +130,14 @@ export const ROUTES = {
   /** The desktop window's page, its sources, and its on/off control. */
   window: '/vrmpet3d/window',
   /**
-   * The page's own sources, as a prefix ?WITHOUT a trailing slash.
+   * The page's own sources, as a prefix — WITHOUT a trailing slash.
    *
    * DSH's matcher decides a prefix hit with `pathname === prefix || pathname.startsWith(prefix + '/')`,
    * so a registered prefix that already ends in `/` can only ever match the literal
    * `/vrmpet3d/window/lib//...`, which no browser sends. The first version of this route had the
    * trailing slash and every source 404'd: the window opened, the page loaded, the glue never
    * ran, and the pet was simply invisible. Every other prefix here works because it has no
-   * trailing slash ?which is the tell that this one was wrong.
+   * trailing slash — which is the tell that this one was wrong.
    */
   windowLib: '/vrmpet3d/window/lib',
   desktop: '/vrmpet3d/desktop',
@@ -1230,7 +1230,7 @@ export function motionLoops(manifest, name) {
  *
  * Compares by ID, never by object identity. `agents.list()` is a live registry
  * whose returned objects are not guaranteed to be the same references that
- * `agents.roots()` holds ?a copy, a proxy or a re-read all produce
+ * `agents.roots()` holds — a copy, a proxy or a re-read all produce
  * `roots().includes(agent) === false` and would silently classify EVERY session
  * as a subagent, which turns the whole pet off. That failure is invisible: the
  * pet simply never reacts.
@@ -1284,7 +1284,7 @@ export function isInside(root, absolute) {
  * directory that holds it, but a legitimate request also addresses the model's own
  * file, so paths are interpreted relative to that directory. With `..` permitted,
  * a path can climb above the declared directory and still resolve to something
- * inside the root's parent ?a containment check against the wrong baseline serves
+ * inside the root's parent — a containment check against the wrong baseline serves
  * it quite happily. Rejecting `..` outright removes the class instead of arguing
  * about which baselines happen to be safe.
  */
@@ -1313,7 +1313,7 @@ export function resolveAssetPath(root, relative) {
 
 let modelIdCounter = 0;
 
-/** Absolute path ?id, so a rescan hands the same file back the same id. */
+/** Absolute path → id, so a rescan hands the same file back the same id. */
 const modelIdsByPath = new Map();
 
 /**
@@ -1327,7 +1327,7 @@ const modelIdsByPath = new Map();
  *
  * That breaks the page in a way that looks like a broken model rather than a broken
  * id: the client persists the selected `modelId`, reloads it on mount and after a
- * page refresh, and asks `/vrmpet3d/asset?m=<saved id>` ?which then 404s and drops the
+ * page refresh, and asks `/vrmpet3d/asset?m=<saved id>` — which then 404s and drops the
  * pet back to the placeholder. The id is therefore a property of the path, not of the
  * scan.
  *
@@ -1430,7 +1430,7 @@ function scanDirectory(root, options = {}) {
 }
 
 /**
- * Build the catalog and the id ?file mapping in one pass.
+ * Build the catalog and the id → file mapping in one pass.
  *
  * @param {object} config
  * @param {string[]} [config.modelDirs] extra directories supplied by the user
@@ -1498,7 +1498,7 @@ export function buildCatalog(config = {}, limits = {}) {
 
 let motionIdCounter = 0;
 
-/** Absolute path ?id, so a rescan hands the same file back the same id. */
+/** Absolute path → id, so a rescan hands the same file back the same id. */
 const motionIdsByPath = new Map();
 
 /**
@@ -1508,7 +1508,7 @@ const motionIdsByPath = new Map();
  *
  *   * The `'a'` prefix gives motions a namespace of their own. Model ids carry an
  *     `'m'` and come from a separate counter that also starts at 1, so without
- *     the prefix the first motion and the first model would both be `1` ?the two
+ *     the prefix the first motion and the first model would both be `1` — the two
  *     maps hold different files, and a page asking one route for the other's id
  *     would be served the wrong kind of file by a lookup that reported success.
  *   * The id does not encode the path, because an id travels to the browser and
@@ -1539,7 +1539,7 @@ export function bundledMotionDir() {
 }
 
 /**
- * Build the motion catalog and the id ?file mapping in one pass.
+ * Build the motion catalog and the id → file mapping in one pass.
  *
  * The plugin's own `assets/motions` is scanned FIRST (source `bundled`), exactly as `assets/models` is for
  * models, so the shipped pack is offered out of the box instead of waiting for a user to import a directory.
@@ -1548,7 +1548,7 @@ export function bundledMotionDir() {
  * apart by the same key the model catalog uses.
  *
  * Membership is decided by the extension, never by the bytes. That is the only
- * test that can keep this catalog disjoint from the model catalog ?a GLB that
+ * test that can keep this catalog disjoint from the model catalog — a GLB that
  * happens to carry `VRMC_vrm_animation` is still a `.glb`, and it must not turn
  * up in both lists because the page fetches the two lists by different routes.
  * `core.detectMotionFormat` remains the client's check that a file it was handed
@@ -1805,7 +1805,7 @@ function sendJson(req, res, payload) {
  * Read a small JSON request body, or answer 413/400 and return without calling back.
  *
  * One policy for every POST route: a bounded body, an honest status for each refusal. Two
- * copies of this drifted before ?one capped at 64 KB and one not ?and the route without the
+ * copies of this drifted before — one capped at 64 KB and one not — and the route without the
  * cap is the one that reads an arbitrary upload into memory.
  */
 function readJsonBody(req, res, limit, onBody) {
@@ -2015,7 +2015,7 @@ export function createModelInfoHandler(store) {
 }
 
 /**
- * `/vrmpet3d/asset?m=<id>&p=<relative>` ?stream one model or texture file.
+ * `/vrmpet3d/asset?m=<id>&p=<relative>` — stream one model or texture file.
  *
  * Streamed rather than buffered: VRM files are routinely tens of MB and
  * a read-into-memory route would spike the host's heap on every reload. Only
@@ -2163,11 +2163,11 @@ export function createModelThumbnailHandler(store) {
 }
 
 /**
- * `/vrmpet3d/motion?m=<id>` ?stream one authored-motion file.
+ * `/vrmpet3d/motion?m=<id>` — stream one authored-motion file.
  *
  * Deliberately has no `p` parameter. A model needs one because its textures sit
  * in the same directory; a `.vrma` is self-contained, so the only file
- * this route can ever name is the exact one an id was scanned from ?nothing
+ * this route can ever name is the exact one an id was scanned from — nothing
  * beside it becomes reachable, and there is no relative path to get wrong.
  *
  * A COMPRESSED clip (`<name>.vrma.br`, the dance pack) is unpacked HERE, so the bytes that reach the renderer
@@ -2420,7 +2420,7 @@ export function apply(ctx, config = {}) {
   };
 
   /**
-   * `/vrmpet3d/motions` ?the motion catalog, shaped like `/vrmpet3d/catalog`.
+   * `/vrmpet3d/motions` — the motion catalog, shaped like `/vrmpet3d/catalog`.
    *
    * Its own route rather than a field of the model catalog: the two are rebuilt
    * from separate directories, and the settings panel opens one picker at a time.
@@ -2797,7 +2797,7 @@ export function apply(ctx, config = {}) {
    * The always-on-top window, as a separate process.
    *
    * A plugin cannot ask DSH for a window (the host half has no Electron, the client half's IPC
-   * surface has no such channel ?see HANDOFF sec.12), so the window is started here: the
+   * surface has no such channel — see HANDOFF sec.12), so the window is started here: the
    * launcher in `desktop/` is run against a bare-Electron runtime borrowed from the
    * installation by hard links. `lib/desktop.js` owns all of that; this half owns the routes
    * that switch it on and off, and the requirement that it dies with the plugin.
@@ -2861,10 +2861,12 @@ export function apply(ctx, config = {}) {
    * repeatable, the counter is not, so a preview that is set twice in a row is still noticed once.
    */
   let previewValue = null;
+  let navigation = { seq: 0, sessionId: null };
+  const navigationCursor = { waiting: null, completed: null };
   let previewSeq = 0;
   const previewHandler = (req, res) => {
     if (req.method === 'GET' || req.method === 'HEAD') {
-      sendJson(req, res, { seq: previewSeq, preview: previewValue });
+      sendJson(req, res, { seq: previewSeq, preview: previewValue, navigation });
       return;
     }
     if (req.method !== 'POST') {
@@ -2936,9 +2938,13 @@ export function apply(ctx, config = {}) {
       const value = Number(raw[key]);
       if (Number.isFinite(value)) out[key] = Math.floor(value);
     }
-    for (const key of ['scope', 'session', 'interaction']) {
+    for (const key of ['scope', 'session', 'interaction', 'statusSessionId', 'completedSessionId']) {
       if (typeof raw[key] === 'string' && raw[key]) out[key] = raw[key].slice(0, 64);
     }
+    for (const key of ['waitingSessionIds', 'completedSessionIds']) {
+      if (Array.isArray(raw[key])) out[key] = [...new Set(raw[key].filter(id => typeof id === 'string' && id))]
+        .slice(0, 256).map(id => id.slice(0, 64));
+    }
     if (Array.isArray(raw.runningIds)) {
       out.runningIds = raw.runningIds
         .filter((id) => typeof id === 'string' && id)
@@ -4056,6 +4062,21 @@ export function apply(ctx, config = {}) {
     }
     readJsonBody(req, res, 16 * 1024, (body) => {
       const action = typeof body?.action === 'string' ? body.action : '';
+      if (action === 'open-status-session' || action === 'open-completed-session') {
+        let sessionId = petStateStale ? null : action === 'open-completed-session'
+          ? (['working', 'waiting'].includes(petStateValue) && petStateUnread > 0 ? petStateWhy?.completedSessionId : null)
+          : (['done', 'waiting', 'error'].includes(petStateValue) ? petStateWhy?.statusSessionId : null);
+        const kind = action === 'open-completed-session' || petStateValue === 'done' ? 'completed' : 'waiting';
+        const ids = petStateWhy?.[kind === 'completed' ? 'completedSessionIds' : 'waitingSessionIds'];
+        if (sessionId && petStateValue !== 'error' && Array.isArray(ids) && ids.length) {
+          sessionId = ids[(ids.indexOf(navigationCursor[kind]) + 1) % ids.length];
+          navigationCursor[kind] = sessionId;
+        }
+        if (!sessionId) { sendJson(req, res, { ok: false }); return; }
+        navigation = { seq: navigation.seq + 1, sessionId };
+        sendJson(req, res, { ok: true });
+        return;
+      }
       /**
        * The window reporting its own bubble numbers — see pageMetrics in the GET above. Answered by the HOST rather than
        * forwarded to the launcher, so an older launcher cannot reject it.
@@ -4209,7 +4230,7 @@ export function apply(ctx, config = {}) {
    *
    * `ctx.inject` is the declarative fix: Cordis calls the callback with a scope in
    * which `webServer` exists, whenever that becomes true, and disposes the scope if
-   * it goes away. The service is an OPTIONAL dependency on purpose ?a hard
+   * it goes away. The service is an OPTIONAL dependency on purpose — a hard
    * `inject: ['webServer']` would leave the plugin waiting for activation forever
    * in a composition with no web server, which is a far worse failure than a pet
    * that cannot load model files.

package/lib/menu.js

@@ -105,7 +105,7 @@
     reloadModel: 'Reload model',
     dance: 'Dance for me',
       modelSettings: "This model's parameters",
-      surfaceWindow: 'Move to the floating window',
+      surfaceWindow: 'Switch to an independent pet',
       surfaceApp: 'Move back inside the app',
       surfaceOff: 'disabled while debug mode is on',
       gravity: 'Gravity',
@@ -133,7 +133,7 @@
     reloadModel: '重载模型',
     dance: '跳支舞',
       modelSettings: '当前模型参数设置',
-      surfaceWindow: '切换回窗口外',
+      surfaceWindow: '切换为独立宠物',
       surfaceApp: '切换回窗口内',
       surfaceOff: '调试模式下不生效',
       gravity: '重力',
@@ -228,6 +228,7 @@
     var onChoose = typeof options.onChoose === 'function' ? options.onChoose : function () {};
     var toSurface = options.toSurface === 'app' ? 'app' : 'window';
     var surfaceAllowed = options.surfaceAllowed !== false;
+    var danceState = 'resting';
     /** Whether this surface offers the 切换 row at all. See the `showSurface` option. */
     var showSurface = options.showSurface !== false;
 
@@ -254,6 +255,8 @@
 
     /** The label for one id, from the state this menu was built with. */
     function labelFor(id) {
+      if (id === 'dance') return danceState === 'dancing' ? (options.language === 'en' ? 'Another dance' : '换一支舞')
+        : (['resting', 'offline'].indexOf(danceState) === -1 ? (options.language === 'en' ? 'The pet is busy…' : '宠物目前很忙…') : text.dance);
       if (id === 'surface') return toSurface === 'app' ? text.surfaceApp : text.surfaceWindow;
       if (id === 'closePet') return toSurface === 'app' ? text.closePetWindow : text.closePetApp;
       return text[id] || id;
@@ -267,7 +270,8 @@
       ITEMS.forEach(function (id) {
         // The 切换 row is the one entry a surface may omit — the window's 关闭独立宠物 already does its job.
         if (id === 'surface' && !showSurface) return;
-        var disabled = id === 'surface' && surfaceAllowed !== true;
+        var disabled = (id === 'surface' && surfaceAllowed !== true)
+          || (id === 'dance' && ['resting', 'offline', 'dancing'].indexOf(danceState) === -1);
         var toggle = TOGGLES.indexOf(id) !== -1;
         var checked = toggle && checkedState[id] === true;
         var item = doc.createElement('button');
@@ -292,7 +296,7 @@
            * waiting to happen ("the switch does nothing"). The reason is the operator's own qualifier —
            * 非debug模式生效 — spelled out for the mode that turns it off.
            */
-          item.title = text.surfaceOff;
+          item.title = id === 'dance' ? label : text.surfaceOff;
         } else {
           if (toggle && !checked) item.title = text.gravityOff;
           item.addEventListener('click', function (event) {
@@ -448,6 +452,12 @@
       setSurface: function (next) { toSurface = next === 'app' ? 'app' : 'window'; },
       /** Whether that row may be used at all (false in debug mode). */
       setSurfaceAllowed: function (allowed) { surfaceAllowed = allowed !== false; },
+      setSurfaceVisible: function (visible) { showSurface = visible === true; },
+      setDanceState: function (state) {
+        if (danceState === state) return;
+        danceState = state;
+        if (!element.hidden) render();
+      },
       /**
        * Which way a SWITCH row is thrown, read at OPEN time by the surface that owns the preference.
        *

package/lib/scene.js

@@ -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

@@ -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

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-vrmpet3d",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "DeepSeek Harness 的 VRM 3D 桌宠：任务状态联动、独立悬浮窗、模型动作与 AI 碎碎念。",
   "type": "module",
   "license": "MIT",