@volter/editor-game 0.5.66 → 0.5.67

package/src/host/authoring/pixi-authoring-adapter.ts

@@ -34,7 +34,7 @@ import {
   AuthoringAdapter2D,
   type CanvasIdentity,
   type Transform2DValue,
-} from '@volter/game-runtime/pixi/authoring';
+} from '../../runtime/pixi/authoring';
 import type {
   AssetDropContext,
   AssetDropProvider,
@@ -70,9 +70,9 @@ import type {
 import type { Container, Graphics, Matrix, PointData, Sprite, Text, Texture } from 'pixi.js';
 import * as shellPixi from 'pixi.js';
 import type { CanvasPixiNamespace } from '../canvas-entry-runtime';
-import { componentStatesProvider } from '@volter/editor-core/component-states-registry';
+import { componentStatesProvider } from '@volter/editor-sdk/kit/component-states-registry';
 import { editorConsole } from '@volter/editor-sdk/kit/editor-console';
-import type { EditorShellStore } from '@volter/editor-core/editor-shell-store';
+import type { EditorShellStore } from '@volter/editor-threejs/kit/editor-shell-store';
 import type { JournalSubject } from '../history/json-history-resource';
 import { PixiProjector } from '../projection/pixi';
 import { creationSiteRelated } from './creation-site-related';
@@ -347,7 +347,7 @@ const ORIGIN_UNWRITABLE_REASON =
  * from the one this prebuilt shell bundles — so a real `Sprite` from the world
  * fails `instanceof Sprite` here and every selected sprite would silently read
  * as a pivot node. The engine's own 2D authoring walk already refuses class
- * identity for the same reason (`@volter/game-runtime/pixi/authoring`'s `kindOf` keys on the
+ * identity for the same reason (`@volter/editor-game/runtime/pixi/authoring`'s `kindOf` keys on the
  * constructor NAME); asking for the two fields the anchor question is actually
  * about is the same move without depending on a name a minifier may mangle.
  *
@@ -670,6 +670,9 @@ export class PixiAuthoringAdapter implements AuthoringAdapter {
   private listeners = new Set<() => void>();
   private boxEditSessions = new Map<string, CanvasBoxEditSession>();
   private lockedIds = new Set<string>();
+  /** Godot's Group: a click on any node inside a grouped one selects the group. Session-local, as
+   *  the lock is. */
+  private groupedIds = new Set<string>();
 
   constructor(
     private readonly root: Container,
@@ -721,13 +724,16 @@ export class PixiAuthoringAdapter implements AuthoringAdapter {
     const surface = opts.surface;
     if (surface) {
       this.pickable = {
-        pick: (clientX, clientY) =>
-          this.projector.pick(clientX, clientY, (id) => this.isPickLocked(id)),
+        pick: (clientX, clientY) => {
+          const hit = this.projector.pick(clientX, clientY, (id) => this.isPickLocked(id));
+          return hit ? this.groupOf(hit) : hit;
+        },
         candidates: (clientX, clientY) =>
           this.projector.candidates(clientX, clientY, (id) => this.isPickLocked(id)),
       };
       this.rects = {
         rect: (id) => this.projector.rect(id),
+        frame: (id) => this.projector.frame(id),
         contextRects: (id) => this.projector.contextRects(id),
       };
     }
@@ -767,7 +773,7 @@ export class PixiAuthoringAdapter implements AuthoringAdapter {
     if (!opts.stories && this.target.componentIdentity) {
       this.stories = componentStatesProvider(
         'canvas',
-        store,
+        store.shell,
         (id) => this.target.componentIdentity?.(id) ?? null,
       );
     }
@@ -848,7 +854,7 @@ export class PixiAuthoringAdapter implements AuthoringAdapter {
       this.watchStructure(this.root);
       this.target.onReindex();
       this.notify();
-      this.store.notifyIngestEdit();
+      this.store.shell.notifyIngestEdit();
     });
   };
 
@@ -914,9 +920,9 @@ export class PixiAuthoringAdapter implements AuthoringAdapter {
   }
 
   readonly selection: SelectionProvider = {
-    get: () => [...this.store.selectedEntityIds],
+    get: () => [...this.store.shell.selectedEntityIds],
     set: (ids) => {
-      this.store.selectMultiple(ids);
+      this.store.shell.selectMultiple(ids);
       this.notify();
     },
   };
@@ -1012,7 +1018,7 @@ export class PixiAuthoringAdapter implements AuthoringAdapter {
     this.watchStructure(this.root);
     this.target.onReindex();
     this.notify();
-    this.store.notifyIngestEdit();
+    this.store.shell.notifyIngestEdit();
   }
 
   private idOf(object: Container): string {
@@ -1504,12 +1510,19 @@ export class PixiAuthoringAdapter implements AuthoringAdapter {
     properties: (id) => [
       ...this.target.properties(id),
       { path: 'locked', label: 'Locked', type: 'boolean', group: 'Visibility' },
+      { path: 'grouped', label: 'Grouped', type: 'boolean', group: 'Visibility' },
     ],
-    get: (id, path) => (path === 'locked' ? this.lockedIds.has(id) : this.target.get(id, path)),
+    get: (id, path) =>
+      path === 'locked'
+        ? this.lockedIds.has(id)
+        : path === 'grouped'
+          ? this.groupedIds.has(id)
+          : this.target.get(id, path),
     set: (id, path, value) => {
-      if (path === 'locked') {
-        if (value === true) this.lockedIds.add(id);
-        else this.lockedIds.delete(id);
+      if (path === 'locked' || path === 'grouped') {
+        const set = path === 'locked' ? this.lockedIds : this.groupedIds;
+        if (value === true) set.add(id);
+        else set.delete(id);
         this.notify();
         return;
       }
@@ -1519,6 +1532,17 @@ export class PixiAuthoringAdapter implements AuthoringAdapter {
     remove: (id, path) => this.target.remove?.(id, path),
   };
 
+  /** The outermost grouped node that contains `id`, or `id` itself when none does. */
+  private groupOf(id: string): string {
+    let group = id;
+    let current: string | null = id;
+    while (current) {
+      if (this.groupedIds.has(current)) group = current;
+      current = this.projector.node(current)?.parentId ?? null;
+    }
+    return group;
+  }
+
   private isPickLocked(id: string): boolean {
     let current: string | null = id;
     while (current) {
@@ -1542,6 +1566,7 @@ export class PixiAuthoringAdapter implements AuthoringAdapter {
   dispose(): void {
     this.boxEditSessions.clear();
     this.lockedIds.clear();
+    this.groupedIds.clear();
     for (const object of this.watchedForStructure) {
       object.off('childAdded', this.onStructureChanged);
       object.off('childRemoved', this.onStructureChanged);

package/src/host/authoring/pixi-creation-site-write-target.ts

@@ -27,8 +27,8 @@
  * place a fallback could quietly pretend to persist.
  */
 
-import type { PhysicsAdapter2D } from '@volter/game-runtime/pixi/system-adapters';
-import type { HistoryService } from '@volter/editor-core/history/history-service';
+import type { PhysicsAdapter2D } from '../../runtime/pixi/system-adapters';
+import type { HistoryService } from '@volter/editor-sdk/kit/history/history-service';
 import type { IngestSourcePersistence } from './ingest-source-persistence';
 import type { CanvasWriteTarget } from './pixi-authoring-adapter';
 import { createLiveCanvasWriteTarget } from './pixi-live-write-target';

package/src/host/authoring/pixi-live-write-target.ts

@@ -34,8 +34,8 @@ import type {
   AuthoringAdapter2D,
   Overlay2D,
   Transform2DValue,
-} from '@volter/game-runtime/pixi/authoring';
-import type { PhysicsAdapter2D } from '@volter/game-runtime/pixi/system-adapters';
+} from '../../runtime/pixi/authoring';
+import type { PhysicsAdapter2D } from '../../runtime/pixi/system-adapters';
 import type {
   ComponentInstanceApplyResult,
   ComponentInstanceDescription,
@@ -48,7 +48,7 @@ import type {
   TransformEditability,
 } from '@volter/editor-project/adapter';
 import type { Container } from 'pixi.js';
-import type { ChannelValue, CreationSiteLiteralReport } from '@volter/editor-core/creation-site-edit';
+import type { ChannelValue, CreationSiteLiteralReport } from '@volter/editor-sdk/kit/creation-site-edit';
 import { creationSiteAnchor, instancesAtSite } from '@volter/editor-sdk/kit/creation-site-registry';
 import { editorConsole } from '@volter/editor-sdk/kit/editor-console';
 import { JsonHistoryResource } from '../history/json-history-resource';
@@ -750,7 +750,7 @@ export function createLiveCanvasWriteTarget(
     bind(context: CanvasWriteContext): void {
       a2d = context.a2d;
       notify = context.notify;
-      const history = context.store.projectHistory;
+      const history = context.store.shell.projectHistory;
       historyResource = history
         ? new JsonHistoryResource({
             history,

package/src/host/authoring/pixi-source-identity.ts

@@ -1,6 +1,6 @@
 /**
  * The OID half of the canvas authoring surface's IDENTITY axis
- * (`@volter/game-runtime/pixi/authoring`'s {@link CanvasIdentity}) — what a row is called
+ * (`@volter/editor-game/runtime/pixi/authoring`'s {@link CanvasIdentity}) — what a row is called
  * when the display tree was authored as first-party `@pixi/react` TSX, and the
  * resolution from such an id back to the source tag it addresses.
  *
@@ -34,9 +34,9 @@
  * selection survives one.
  */
 
-import type { CanvasIdentity } from '@volter/game-runtime/pixi/authoring';
+import type { CanvasIdentity } from '../../runtime/pixi/authoring';
 import type { Container } from 'pixi.js';
-import { occurrenceId } from '@volter/editor-core/authoring/component-instance-root';
+import { occurrenceId } from '@volter/editor-threejs/kit/authoring/component-instance-root';
 
 const PREFIX = 'pixi';