castle-web-cli 0.4.101 → 0.4.103

package/kits/physics-2d/behaviors/Collider.jsx

@@ -29,6 +29,9 @@ const linkBtn = {
 const deleteBtn = { ...linkBtn, color: '#ff7a7a' };
 const actionRow = { display: 'flex', justifyContent: 'space-between', alignItems: 'center', margin: '4px 0 12px' };
 const noteStyle = { fontSize: 12, color: 'var(--castle-inspector-muted, #888)', margin: '2px 0 10px' };
+const resetRow = { display: 'flex', justifyContent: 'space-between', alignItems: 'center', margin: '2px 0 10px' };
+const overrideNote = { fontSize: 12, color: '#b58dff' };
+const resetLink = { ...linkBtn, color: '#b58dff' };
 
 // --- shape helpers ---------------------------------------------------------
 const FULL_BOX = { type: 'box', x: 0.5, y: 0.5, w: 1, h: 1 };
@@ -177,21 +180,11 @@ export class Collider {
     const offXPx = Math.round(((shape.x ?? 0.5) - 0.5) * bw);
     const offYPx = Math.round(((shape.y ?? 0.5) - 0.5) * bh);
 
-    // Per-subfield override state vs the blueprint's version of THIS shape. The
-    // shape fields don't go through AutoFields, so without this an instance that
-    // changed e.g. box 3's offset X wouldn't show the tint / Default / Reset.
-    // Null override (editing the blueprint template itself) shows nothing.
-    const bpShapes = override?.baseline?.('shapes');
-    const bShape = Array.isArray(bpShapes) ? bpShapes[i] : null;
-    const shapeOv = (key, dflt, toPx) => {
-      if (!bShape || bShape.type !== shape.type) return {};
-      const bv = bShape[key] ?? dflt;
-      return {
-        overridden: Math.abs((shape[key] ?? dflt) - bv) > 1e-4,
-        defaultValue: toPx(bv),
-        onReset: () => patchSel({ [key]: bv }),
-      };
-    };
+    // The shapes list is one array prop, so it's overridden as a whole (not per
+    // field). The Panel title already tints when the instance diverges (via
+    // override.anyOverridden); this drives a single "reset the whole shape set
+    // back to the blueprint" affordance -- coarse on purpose, to stay simple.
+    const shapesOverridden = Boolean(override?.isOverridden?.('shapes'));
 
     const density = component.density > 0 ? component.density : 0.001;
 
@@ -217,6 +210,14 @@ export class Collider {
             +
           </button>
         </div>
+        {shapesOverridden ? (
+          <div style={resetRow}>
+            <span style={overrideNote}>Shapes overridden</span>
+            <button type="button" style={resetLink} onClick={() => override.reset('shapes')}>
+              Reset to blueprint
+            </button>
+          </div>
+        ) : null}
         {addOpen ? (
           <div style={addMenu}>
             {/* triangle/polygon are supported by the data model + runtime but not
@@ -238,50 +239,24 @@ export class Collider {
           <>
             <SelectField label="Shape" value={shape.type} onChange={setType} options={['box', 'circle']} />
             {isCircle ? (
-              <NumberField
-                label="Radius"
-                value={radiusPx}
-                onChange={(v) => patchSel({ r: v / Math.min(bw, bh) })}
-                {...shapeOv('r', 0.5, (f) => Math.round(f * Math.min(bw, bh)))}
-              />
+              <NumberField label="Radius" value={radiusPx} onChange={(v) => patchSel({ r: v / Math.min(bw, bh) })} />
             ) : (
               <>
-                <NumberField
-                  label="Width"
-                  value={widthPx}
-                  onChange={(v) => patchSel({ w: v / bw })}
-                  {...shapeOv('w', 1, (f) => Math.round(f * bw))}
-                />
-                <NumberField
-                  label="Height"
-                  value={heightPx}
-                  onChange={(v) => patchSel({ h: v / bh })}
-                  {...shapeOv('h', 1, (f) => Math.round(f * bh))}
-                />
+                <NumberField label="Width" value={widthPx} onChange={(v) => patchSel({ w: v / bw })} />
+                <NumberField label="Height" value={heightPx} onChange={(v) => patchSel({ h: v / bh })} />
                 <NumberField
                   label="Angle"
                   value={Math.round(shape.angle ?? 0)}
                   min={-180}
                   max={180}
                   onChange={(v) => patchSel({ angle: v })}
-                  {...shapeOv('angle', 0, (f) => Math.round(f))}
                 />
               </>
             )}
           </>
         )}
-        <NumberField
-          label="Offset X"
-          value={offXPx}
-          onChange={(v) => patchSel({ x: 0.5 + v / bw })}
-          {...shapeOv('x', 0.5, (f) => Math.round((f - 0.5) * bw))}
-        />
-        <NumberField
-          label="Offset Y"
-          value={offYPx}
-          onChange={(v) => patchSel({ y: 0.5 + v / bh })}
-          {...shapeOv('y', 0.5, (f) => Math.round((f - 0.5) * bh))}
-        />
+        <NumberField label="Offset X" value={offXPx} onChange={(v) => patchSel({ x: 0.5 + v / bw })} />
+        <NumberField label="Offset Y" value={offYPx} onChange={(v) => patchSel({ y: 0.5 + v / bh })} />
         <div style={actionRow}>
           {autoFit && !fitted ? (
             <button type="button" onClick={() => writeShapes(shapes.map((s, k) => (k === i ? autoFit : s)))} style={linkBtn}>

package/kits/physics-2d/castle.json

@@ -23,10 +23,35 @@
       "scenes/**",
       "blueprints/**",
       "behaviors/**"
-    ]
+    ],
+    "fileTypes": [
+      {
+        "ext": ".scene",
+        "label": "Scene",
+        "new": "New scene",
+        "icon": "globe",
+        "editor": "kit",
+        "data": true
+      },
+      {
+        "ext": ".pxart",
+        "label": "Pixel Art",
+        "new": "New drawing",
+        "icon": "layer-group",
+        "editor": "kit",
+        "data": true
+      },
+      {
+        "ext": ".jsx",
+        "label": "Behavior",
+        "new": "New behavior",
+        "icon": "code"
+      }
+    ],
+    "defaultPlayFile": "scenes/main.scene"
   },
   "deckId": "ckRZGFW4iPrx",
   "cardId": "_oBFbAW6DxsO",
   "title": "physics-2d",
-  "publishedVersion": "2026-07-28T19:19:14.734Z"
+  "publishedVersion": "2026-07-28T22:34:22.244Z"
 }

package/kits/physics-2d/engine/blueprint.js

@@ -300,6 +300,18 @@ function findBehavior(behaviors, name) {
   return behaviors.find((candidate) => candidate.behaviorName === name);
 }
 
+// Structural equality for plain JSON prop values (scalars, arrays, plain
+// objects) -- used to tell whether an instance override has become identical to
+// its blueprint baseline, so it can be dropped back to inheriting.
+function deepEqual(a, b) {
+  if (Object.is(a, b)) return true;
+  if (typeof a !== 'object' || typeof b !== 'object' || a === null || b === null) return false;
+  if (Array.isArray(a) !== Array.isArray(b)) return false;
+  const keys = Object.keys(a);
+  if (keys.length !== Object.keys(b).length) return false;
+  return keys.every((k) => deepEqual(a[k], b[k]));
+}
+
 // Apply an inspector-style partial patch (`{ propName: value, ... }`) to one
 // actor's component, IN PLACE. For a blueprint's own template actor (no
 // `blueprint` ref) this is a plain merge -- there's no baseline to diff
@@ -321,7 +333,10 @@ export function applyComponentPatch(files, behaviors, actor, behaviorName, nextP
   const overrides = { ...(actor.components[behaviorName] ?? {}) };
   for (const [prop, value] of Object.entries(nextProps)) {
     const baseline = prop in templateProps ? templateProps[prop] : defaultProps[prop];
-    if (isInheritedProp(Behavior, prop) && Object.is(value, baseline)) delete overrides[prop];
+    // Deep-equal, not Object.is: object/array props (e.g. Collider `shapes`,
+    // Joints `list`) reset to the blueprint value are a fresh reference with
+    // identical content, so a reference check would never drop the override.
+    if (isInheritedProp(Behavior, prop) && deepEqual(value, baseline)) delete overrides[prop];
     else overrides[prop] = value;
   }
   if (Object.keys(overrides).length === 0) delete actor.components[behaviorName];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "castle-web-cli",
-  "version": "0.4.101",
+  "version": "0.4.103",
   "type": "module",
   "bin": {
     "castle-web": "./dist/index.js"