castle-web-cli 0.4.85 → 0.4.87

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Panel } from '../../engine/ui';
 import { AutoFields } from '../../engine/autoInspector';
-import { inActorWorldSpace, slingLaunch, slingPull } from '../controls';
+import { inActorWorldSpace, pressOnDraggable, slingLaunch, slingPull } from '../controls';
 
 // Slingshot: pull back and release to fling the actor the opposite way
 // (angry-birds style) -- the physics feel of castle-client's Sling. While
@@ -31,8 +31,14 @@ export class Slingshot {
     const pressed = p.down && !rt._slingWasDown;
     rt._slingWasDown = p.down;
 
+    // A press on a draggable is consumed by the drag; otherwise the sling grabs
+    // (anywhere, or on its own actor when grabAnywhere is off).
     const grabAnywhere = this.props.grabAnywhere ?? true;
-    if (pressed && (grabAnywhere || scene.actorAt(p.x, p.y)?.id === actor.id)) {
+    if (
+      pressed &&
+      !pressOnDraggable(scene) &&
+      (grabAnywhere || scene.actorAt(p.x, p.y)?.id === actor.id)
+    ) {
       rt._slinging = true;
       // Anchor at the press point (like castle-client): the aim/launch depends
       // on the drag gesture, not where the press landed relative to the actor.

package/kits/physics-2d/physics/controls.js

@@ -29,6 +29,20 @@ export function chaseVelocity(target, layout, props = {}) {
   return { x: (target.x - c.x) * stiffness, y: (target.y - c.y) * stiffness };
 }
 
+// --- Touch ownership -------------------------------------------------------
+// Hierarchy: a press that lands ON a Draggable object is CONSUMED by that drag,
+// so Slingshot/AnalogStick ignore it. A press anywhere else is shared -- both
+// Slingshot and AnalogStick act (no fair way to rank them). So the only gate the
+// non-drag controls need is this: did the current press land on a draggable?
+// Stateless -- a pure per-press query (the controls only ask on their press
+// edge), so there's no owner to latch and nothing to reset.
+export function pressOnDraggable(scene) {
+  const p = scene.pointer;
+  if (!p.down) return false;
+  const hit = scene.actorAt(p.x, p.y);
+  return !!hit && !!hit.components.Draggable;
+}
+
 // Run `draw(ctx)` in world space, undoing the actor's Layout rotation that the
 // runtime applies about the actor's center. Overlay controls (Slingshot,
 // AnalogStick) use this so their on-screen UI stays anchored where the user

package/kits/physics-2d/physics/extensions/collider.js

@@ -0,0 +1,15 @@
+// Physics contributes material fields to the shared Collider behavior WITHOUT
+// editing behaviors/Collider.jsx -- that file stays identical to basic-2d's, so
+// the drift check treats it as a converged shared file. These fields are read
+// by the physics simulation (see physics/matterBridge.js); a kit without the
+// physics module never registers them, so its Collider has no material fields.
+// See engine/behaviorExtensions.js for how this is discovered.
+export const behaviorExtension = {
+  behaviorName: 'Collider',
+  defaultProps: {
+    // `bounciness` = restitution: 0 (dead) to ~1 (very bouncy); can exceed 1.
+    bounciness: 0,
+    // `friction` = surface friction.
+    friction: 0.1,
+  },
+};

package/kits/physics-2d/systems/physics.js

@@ -0,0 +1,8 @@
+// Registers the physics simulation as a runtime system. Auto-discovered by
+// engine/systemRegistry.js (`systems/*.js`) and invoked by makeScene, so the
+// physics module plugs in without the shared engine ever referencing it.
+import { installPhysics } from '../physics';
+
+export function installSystem(runtime) {
+  installPhysics(runtime);
+}

package/package.json

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