Add a Container tab and propagate template edits
The Container tab reuses SceneViewport against any object holder, so a container template is edited exactly like a scene. Right-click no longer changes the selection, which previously made nesting impossible: opening the menu on a container loaded it, and "Place in container" then targeted itself. Template edits (move, rename, override) now reach already-placed instances per slot, through a shared templateSync used by both the apply path and the plain object commands. Copies the user has touched keep their own value. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
rootandClaude Opus 5 committed
1 parent
6bedc948be
commit
9d93020bd8
35 files changed
+1452
-363
No files matched your search
@@ -1,16 +1,24 @@
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import { DeleteAssetCommand } from '../../src/core/commands/assetCommands';
|
||||
import { CommandError } from '../../src/core/commands/Command';
|
||||
import { CompoundCommand } from '../../src/core/commands/CompoundCommand';
|
||||
import { CreateContainerCommand } from '../../src/core/commands/containerCommands';
|
||||
import {
|
||||
MoveSceneObjectCommand,
|
||||
PlaceAssetCommand,
|
||||
RemoveSceneObjectCommand,
|
||||
RemoveSceneObjectsCommand,
|
||||
ClearOverrideCommand,
|
||||
RenameSceneObjectCommand,
|
||||
SetOverrideCommand,
|
||||
SetParentCommand,
|
||||
} from '../../src/core/commands/sceneObjectCommands';
|
||||
import { worldPositionOf } from '../../src/core/graph';
|
||||
import type { ContainerAsset } from '../../src/core/model/Asset';
|
||||
import { subtreeRoots, treeOrder } from '../../src/core/model/hierarchy';
|
||||
import { containerReaches } from '../../src/core/model/container';
|
||||
import { descendantsOf, subtreeRoots, treeOrder } from '../../src/core/model/hierarchy';
|
||||
import { findAsset, findScene } from '../../src/core/model/Project';
|
||||
import { createSceneObject } from '../../src/core/model/SceneObject';
|
||||
import { makeSpriteScene, place, roundTrip, startWorld } from '../helpers';
|
||||
|
||||
/** Three boxes: a at (100,100,z1), b at (10,0) and c at (0,5) parented under b (local (-10,5)). */
|
||||
@@ -23,6 +31,27 @@ function setup() {
|
||||
return { ...f, a, b, c };
|
||||
}
|
||||
|
||||
/** The container asset built from a and b (c comes along below b), plus lookups into its template. */
|
||||
function templateSetup() {
|
||||
const f = setup();
|
||||
const create = new CreateContainerCommand(f.sceneId, [f.a, f.b]);
|
||||
f.stack.execute(create);
|
||||
const asset = () => findAsset(f.project, create.assetId) as ContainerAsset;
|
||||
return { ...f, containerId: create.assetId, asset, templateIdOf: (id: string) => f.object(id).templateId };
|
||||
}
|
||||
|
||||
/** Three container assets holding one box each, none of them nested yet. */
|
||||
function makeContainers() {
|
||||
const f = makeSpriteScene();
|
||||
const build = () => {
|
||||
const command = new CreateContainerCommand(f.sceneId, [place(f, f.spriteId, { x: 0, y: 0 })]);
|
||||
f.stack.execute(command);
|
||||
return command.assetId;
|
||||
};
|
||||
const assetOf = (id: string) => findAsset(f.project, id) as ContainerAsset;
|
||||
return { ...f, outerId: build(), innerId: build(), deepId: build(), assetOf };
|
||||
}
|
||||
|
||||
describe('subtree roots', () => {
|
||||
it('drops ids that have a selected ancestor', () => {
|
||||
const { sceneOf, a, b, c } = setup();
|
||||
@@ -164,6 +193,218 @@ describe('placing a container', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('editing a container template', () => {
|
||||
it('moves, renames, overrides and removes template objects addressed by the container id', () => {
|
||||
const { stack, containerId, a, asset, object, templateIdOf } = templateSetup();
|
||||
const templateA = templateIdOf(a);
|
||||
const template = () => asset().objects.find((t) => t.id === templateA);
|
||||
|
||||
stack.execute(new MoveSceneObjectCommand(containerId, templateA, { x: 7, y: 8, z: 9 }));
|
||||
stack.execute(new RenameSceneObjectCommand(containerId, templateA, 'Hero'));
|
||||
stack.execute(new SetOverrideCommand(containerId, templateA, 'width', 55));
|
||||
expect(template()!.position).toEqual({ x: 7, y: 8, z: 9 });
|
||||
expect(template()!.name).toBe('Hero');
|
||||
expect(template()!.overrides.width).toBe(55);
|
||||
// a is a copy of that template and held its old values, so it follows all three.
|
||||
expect(object(a).position).toEqual({ x: 7, y: 8, z: 9 });
|
||||
expect(object(a).name).toBe('Hero');
|
||||
expect(object(a).overrides.width).toBe(55);
|
||||
|
||||
stack.execute(new RemoveSceneObjectCommand(containerId, templateA));
|
||||
expect(template()).toBeUndefined();
|
||||
expect(asset().objects).toHaveLength(2);
|
||||
|
||||
stack.undo();
|
||||
expect(template()!.overrides.width).toBe(55);
|
||||
stack.undo();
|
||||
expect(template()!.overrides.width).toBeUndefined();
|
||||
stack.undo();
|
||||
expect(template()!.name).toBe('');
|
||||
stack.undo();
|
||||
expect(template()!.position).toEqual({ x: 45, y: 50, z: 1 });
|
||||
});
|
||||
|
||||
it('restores the template order when a removal is undone', () => {
|
||||
const { stack, containerId, a, b, c, asset, templateIdOf } = templateSetup();
|
||||
const ids = [templateIdOf(a), templateIdOf(b), templateIdOf(c)];
|
||||
expect(asset().objects.map((t) => t.id)).toEqual(ids);
|
||||
|
||||
stack.execute(new RemoveSceneObjectsCommand(containerId, [ids[1]!]));
|
||||
expect(asset().objects.map((t) => t.id)).toEqual([ids[0]]);
|
||||
stack.undo();
|
||||
expect(asset().objects.map((t) => t.id)).toEqual(ids);
|
||||
expect(asset().objects[2]!.parentId).toBe(ids[1]);
|
||||
});
|
||||
|
||||
it('rejects an object id that belongs to the scene rather than to the template', () => {
|
||||
const { stack, containerId, a } = templateSetup();
|
||||
expect(() => stack.execute(new RenameSceneObjectCommand(containerId, a, 'Hero'))).toThrow(/not found/);
|
||||
});
|
||||
});
|
||||
|
||||
describe('a template edit reaching the placed copies', () => {
|
||||
/** The container placed a second time, with a lookup from a template object to that fresh copy. */
|
||||
function placedSetup() {
|
||||
const f = templateSetup();
|
||||
const before = new Set(f.sceneOf().objects.map((o) => o.id));
|
||||
place(f, f.containerId, { x: 1000, y: 0 });
|
||||
return {
|
||||
...f,
|
||||
copyOf: (id: string) =>
|
||||
f.sceneOf().objects.find((o) => !before.has(o.id) && o.templateId === f.templateIdOf(id))!,
|
||||
};
|
||||
}
|
||||
|
||||
it('carries an override to the copies that agreed and leaves a modified one alone', () => {
|
||||
const { stack, sceneId, containerId, a, object, templateIdOf, copyOf } = placedSetup();
|
||||
const modified = copyOf(a).id;
|
||||
stack.execute(new SetOverrideCommand(sceneId, modified, 'width', 12));
|
||||
stack.execute(new SetOverrideCommand(containerId, templateIdOf(a), 'width', 55));
|
||||
|
||||
expect(object(a).overrides.width).toBe(55);
|
||||
expect(object(modified).overrides.width).toBe(12);
|
||||
|
||||
stack.undo();
|
||||
expect(object(a).overrides.width).toBeUndefined();
|
||||
expect(object(modified).overrides.width).toBe(12);
|
||||
});
|
||||
|
||||
it('clears an override on the copies that shared it', () => {
|
||||
const { stack, containerId, a, object, templateIdOf } = placedSetup();
|
||||
const templateA = templateIdOf(a);
|
||||
stack.execute(new SetOverrideCommand(containerId, templateA, 'width', 55));
|
||||
expect(object(a).overrides.width).toBe(55);
|
||||
stack.execute(new ClearOverrideCommand(containerId, templateA, 'width'));
|
||||
expect(object(a).overrides.width).toBeUndefined();
|
||||
stack.undo();
|
||||
expect(object(a).overrides.width).toBe(55);
|
||||
});
|
||||
|
||||
it('follows per axis, so a copy dragged sideways keeps only its x', () => {
|
||||
const { stack, sceneId, containerId, a, object, templateIdOf, copyOf } = placedSetup();
|
||||
const moved = copyOf(a).id;
|
||||
stack.execute(new MoveSceneObjectCommand(sceneId, moved, { x: 999, y: 50, z: 1 }));
|
||||
stack.execute(new MoveSceneObjectCommand(containerId, templateIdOf(a), { x: 7, y: 8, z: 9 }));
|
||||
|
||||
expect(object(a).position).toEqual({ x: 7, y: 8, z: 9 });
|
||||
expect(object(moved).position).toEqual({ x: 999, y: 8, z: 9 });
|
||||
|
||||
stack.undo();
|
||||
expect(object(moved).position).toEqual({ x: 999, y: 50, z: 1 });
|
||||
});
|
||||
|
||||
it('does not leak an edit made in the scene to the other copies', () => {
|
||||
const { stack, sceneId, a, object, copyOf } = placedSetup();
|
||||
const copy = copyOf(a).id;
|
||||
stack.execute(new SetOverrideCommand(sceneId, copy, 'width', 12));
|
||||
stack.execute(new RenameSceneObjectCommand(sceneId, copy, 'Only me'));
|
||||
expect(object(a).overrides.width).toBeUndefined();
|
||||
expect(object(a).name).toBe('');
|
||||
});
|
||||
|
||||
it('reaches the content of a container nested in another one', () => {
|
||||
const f = makeContainers();
|
||||
const { stack, outerId, innerId, sceneOf, assetOf } = f;
|
||||
stack.execute(new PlaceAssetCommand(outerId, innerId, { x: 20, y: 0 }));
|
||||
const placed = place(f, outerId, { x: 500, y: 0 });
|
||||
const innerTemplate = assetOf(innerId).objects[0]!;
|
||||
const deepCopy = sceneOf().objects.find((o) => o.templateId === innerTemplate.id)!;
|
||||
|
||||
stack.execute(new RenameSceneObjectCommand(innerId, innerTemplate.id, 'Deep'));
|
||||
expect(deepCopy.name).toBe('Deep');
|
||||
expect(descendantsOf(sceneOf(), placed)).toHaveLength(3);
|
||||
|
||||
stack.undo();
|
||||
expect(deepCopy.name).toBe('');
|
||||
});
|
||||
});
|
||||
|
||||
describe('placing into a container template', () => {
|
||||
it('creates a single object, without expanding a placed container', () => {
|
||||
const { stack, outerId, innerId, assetOf } = makeContainers();
|
||||
const command = new PlaceAssetCommand(outerId, innerId, { x: 20, y: 0 });
|
||||
stack.execute(command);
|
||||
|
||||
const objects = assetOf(outerId).objects;
|
||||
expect(objects).toHaveLength(2);
|
||||
const placed = objects.find((o) => o.id === command.objectId)!;
|
||||
expect(placed.assetId).toBe(innerId);
|
||||
expect(placed.position).toEqual({ x: 20, y: 0, z: 0 });
|
||||
expect(objects.some((o) => o.parentId === command.objectId)).toBe(false);
|
||||
|
||||
stack.undo();
|
||||
expect(assetOf(outerId).objects).toHaveLength(1);
|
||||
});
|
||||
|
||||
it('expands the same container when it goes into a scene instead', () => {
|
||||
const f = makeContainers();
|
||||
const before = f.sceneOf().objects.length;
|
||||
const placed = place(f, f.innerId, { x: 20, y: 0 });
|
||||
expect(f.sceneOf().objects).toHaveLength(before + 2);
|
||||
expect(descendantsOf(f.sceneOf(), placed)).toHaveLength(1);
|
||||
});
|
||||
|
||||
it('expands the nested container once the outer one is placed into a scene', () => {
|
||||
const f = makeContainers();
|
||||
const { stack, outerId, innerId, spriteId, sceneOf, world } = f;
|
||||
const nest = new PlaceAssetCommand(outerId, innerId, { x: 20, y: 0 });
|
||||
stack.execute(nest);
|
||||
const placed = place(f, outerId, { x: 500, y: 0 });
|
||||
|
||||
const children = sceneOf().objects.filter((o) => o.parentId === placed);
|
||||
expect(children.map((o) => o.assetId).sort()).toEqual([innerId, spriteId].sort());
|
||||
const nested = children.find((o) => o.assetId === innerId)!;
|
||||
expect(nested.templateId).toBe(nest.objectId);
|
||||
expect(world(nested.id)).toEqual({ x: 520, y: 0, z: 0 });
|
||||
|
||||
const content = sceneOf().objects.filter((o) => o.parentId === nested.id);
|
||||
expect(content).toHaveLength(1);
|
||||
expect(content[0]!.assetId).toBe(spriteId);
|
||||
expect(world(content[0]!.id)).toEqual({ x: 520, y: 0, z: 0 });
|
||||
});
|
||||
|
||||
it('refuses a placement that would nest a container inside itself', () => {
|
||||
const { stack, outerId, innerId, deepId, assetOf } = makeContainers();
|
||||
expect(() => stack.execute(new PlaceAssetCommand(outerId, outerId, { x: 0, y: 0 }))).toThrow(
|
||||
/nests forever/,
|
||||
);
|
||||
expect(assetOf(outerId).objects).toHaveLength(1);
|
||||
|
||||
stack.execute(new PlaceAssetCommand(outerId, innerId, { x: 0, y: 0 }));
|
||||
expect(() => stack.execute(new PlaceAssetCommand(innerId, outerId, { x: 0, y: 0 }))).toThrow(
|
||||
CommandError,
|
||||
);
|
||||
|
||||
stack.execute(new PlaceAssetCommand(innerId, deepId, { x: 0, y: 0 }));
|
||||
expect(() => stack.execute(new PlaceAssetCommand(deepId, outerId, { x: 0, y: 0 }))).toThrow(CommandError);
|
||||
expect(assetOf(deepId).objects).toHaveLength(1);
|
||||
});
|
||||
});
|
||||
|
||||
describe('containerReaches', () => {
|
||||
it('sees the container itself and its content, transitively', () => {
|
||||
const { project, stack, outerId, innerId, deepId, spriteId, assetOf } = makeContainers();
|
||||
expect(containerReaches(project, assetOf(outerId), outerId)).toBe(true);
|
||||
expect(containerReaches(project, assetOf(outerId), innerId)).toBe(false);
|
||||
|
||||
stack.execute(new PlaceAssetCommand(outerId, innerId, { x: 0, y: 0 }));
|
||||
stack.execute(new PlaceAssetCommand(innerId, deepId, { x: 0, y: 0 }));
|
||||
expect(containerReaches(project, assetOf(outerId), innerId)).toBe(true);
|
||||
expect(containerReaches(project, assetOf(outerId), deepId)).toBe(true);
|
||||
expect(containerReaches(project, assetOf(deepId), outerId)).toBe(false);
|
||||
expect(containerReaches(project, assetOf(outerId), spriteId)).toBe(false);
|
||||
});
|
||||
|
||||
it('terminates on a cycle the commands would have refused to create', () => {
|
||||
const { project, stack, outerId, innerId, deepId, assetOf } = makeContainers();
|
||||
stack.execute(new PlaceAssetCommand(outerId, innerId, { x: 0, y: 0 }));
|
||||
assetOf(innerId).objects.push(createSceneObject('cycle', outerId, { x: 0, y: 0 }));
|
||||
|
||||
expect(containerReaches(project, assetOf(outerId), deepId)).toBe(false);
|
||||
expect(containerReaches(project, assetOf(innerId), outerId)).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe('multi-selection commands', () => {
|
||||
it('removes several subtrees as one step, covering nested ids', () => {
|
||||
const { stack, sceneId, a, b, c, sceneOf, object } = setup();
|
||||
|
||||
Reference in new issue
Block a user