An animated or set Z of -1 on a weapon put it behind everything on Z 0, not just behind the player holding it. A child can now opt in to being drawn at its parent's place, so its own Z only orders it against the parent and its siblings. - New property "Sort with parent" on sprites, texts and particle emitters, shown in the inspector right under Z. It is a normal property, set on the asset and overridable per object. - With it on, the rest of the scene sees only the parent's Z and, where the layer sorts by Y, the parent's feet. Below 0 the child is drawn behind the parent, from 0 on in front. - It works across levels: a grandchild with the switch hangs on the top object of the chain. - It has no effect under a parent that is not drawn itself (container, behavior, camera, collider) or under a tilemap. - New assets start with it on, saved ones read as off, so old projects draw unchanged. For that a schema row now has "initial" next to "default". The gold "changed" mark and reset follow "initial", so a fresh sprite is not marked as changed. No load migration is needed. - parentGroups() in drawOrder.ts gives a slot only to the top of a chain and inserts the children there. Editor, play mode and picking all use it, so they agree. Tests: - 10 new unit tests in tests/viewport/sort-with-parent.test.ts. - 8 existing tests list the sprite rows or defaults and got the row. - New e2e check 5b-ii clicks the switch and checks order and undo. - Counter-checks, all originals restored by cmp: switch ignored fails 7, children not sorted by Z fails 6, no chain fails 1, "initial" ignored fails 9, row missing in the inspector fails e2e 5. - ./check.sh: 166 files, 2426 tests, CHECK EXIT 0. - e2e 5: ALL PASSED, 13 checks. Check total 1398, computed only. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
156 lines
5.6 KiB
TypeScript
156 lines
5.6 KiB
TypeScript
import { describe, expect, it } from 'vitest';
|
|
import {
|
|
CreateAssetCommand,
|
|
DeleteAssetCommand,
|
|
RenameAssetCommand,
|
|
ResetAssetPropertyCommand,
|
|
SetActiveSceneCommand,
|
|
SetAssetPropertyCommand,
|
|
} from '../../src/core/commands/assetCommands';
|
|
import {
|
|
ClearOverrideCommand,
|
|
MoveSceneObjectCommand,
|
|
PlaceAssetCommand,
|
|
RemoveSceneObjectsCommand,
|
|
SetOverrideCommand,
|
|
} from '../../src/core/commands/sceneObjectCommands';
|
|
import { findAsset } from '../../src/core/model/Project';
|
|
import { makeSpriteScene, place } from '../helpers';
|
|
|
|
describe('asset commands', () => {
|
|
it('creates assets with defaults and activates the first scene', () => {
|
|
const { project, sceneId, spriteId } = makeSpriteScene();
|
|
expect(project.assets).toHaveLength(2);
|
|
expect(project.activeSceneId).toBe(sceneId);
|
|
expect(findAsset(project, spriteId)?.props).toEqual({
|
|
enabled: true,
|
|
scale: 1,
|
|
rotation: 0,
|
|
mirrorX: false,
|
|
mirrorY: false,
|
|
sortWithParent: true,
|
|
width: 100,
|
|
height: 100,
|
|
color: 0xffffff,
|
|
texture: '',
|
|
shader: '',
|
|
});
|
|
});
|
|
|
|
it('renames and sets properties with undo/redo', () => {
|
|
const { project, stack, spriteId } = makeSpriteScene();
|
|
const sprite = () => findAsset(project, spriteId)!;
|
|
stack.execute(new RenameAssetCommand(spriteId, 'Crate'));
|
|
stack.execute(new SetAssetPropertyCommand(spriteId, 'width', 250));
|
|
expect(sprite().name).toBe('Crate');
|
|
expect(sprite().props.width).toBe(250);
|
|
stack.undo();
|
|
expect(sprite().props.width).toBe(100);
|
|
stack.undo();
|
|
expect(sprite().name).toBe('Box');
|
|
stack.redo();
|
|
stack.redo();
|
|
expect(sprite().name).toBe('Crate');
|
|
expect(sprite().props.width).toBe(250);
|
|
});
|
|
|
|
it('rejects unknown properties', () => {
|
|
const { stack, spriteId } = makeSpriteScene();
|
|
expect(() => stack.execute(new SetAssetPropertyCommand(spriteId, 'x', 5))).toThrow(/not defined/);
|
|
expect(() => stack.execute(new ResetAssetPropertyCommand(spriteId, 'x'))).toThrow(/not defined/);
|
|
});
|
|
|
|
it('resets a property to its schema default with undo', () => {
|
|
const { project, stack, spriteId } = makeSpriteScene();
|
|
const sprite = () => findAsset(project, spriteId)!;
|
|
stack.execute(new SetAssetPropertyCommand(spriteId, 'height', 60));
|
|
stack.execute(new ResetAssetPropertyCommand(spriteId, 'height'));
|
|
expect(sprite().props.height).toBe(100);
|
|
stack.undo();
|
|
expect(sprite().props.height).toBe(60);
|
|
stack.redo();
|
|
expect(sprite().props.height).toBe(100);
|
|
});
|
|
|
|
it('deletes an asset together with its scene objects and restores both on undo', () => {
|
|
const f = makeSpriteScene();
|
|
const { project, stack, spriteId, sceneOf } = f;
|
|
place(f, spriteId, { x: 1, y: 2 });
|
|
place(f, spriteId, { x: 3, y: 4 });
|
|
expect(sceneOf().objects).toHaveLength(2);
|
|
stack.execute(new DeleteAssetCommand(spriteId));
|
|
expect(project.assets).toHaveLength(1);
|
|
expect(sceneOf().objects).toHaveLength(0);
|
|
stack.undo();
|
|
expect(project.assets).toHaveLength(2);
|
|
expect(sceneOf().objects.map((o) => o.position)).toEqual([
|
|
{ x: 1, y: 2, z: 0 },
|
|
{ x: 3, y: 4, z: 0 },
|
|
]);
|
|
});
|
|
|
|
it('switches the active scene when the active one is deleted', () => {
|
|
const { project, stack, sceneId } = makeSpriteScene();
|
|
const second = new CreateAssetCommand('scene', 'Level 2');
|
|
stack.execute(second);
|
|
stack.execute(new SetActiveSceneCommand(second.asset.id));
|
|
stack.execute(new DeleteAssetCommand(second.asset.id));
|
|
expect(project.activeSceneId).toBe(sceneId);
|
|
stack.undo();
|
|
expect(project.activeSceneId).toBe(second.asset.id);
|
|
});
|
|
});
|
|
|
|
describe('scene object commands', () => {
|
|
it('places assets and refuses scenes', () => {
|
|
const f = makeSpriteScene();
|
|
const { stack, sceneId, spriteId, sceneOf } = f;
|
|
const box = place(f, spriteId, { x: 5, y: 6 });
|
|
const object = sceneOf().objects[0]!;
|
|
expect(object.id).toBe(box);
|
|
expect(object.assetId).toBe(spriteId);
|
|
expect(object.position).toEqual({ x: 5, y: 6, z: 0 });
|
|
expect(object.overrides).toEqual({});
|
|
|
|
expect(() => stack.execute(new PlaceAssetCommand(sceneId, sceneId, { x: 0, y: 0 }))).toThrow(
|
|
/cannot be placed/,
|
|
);
|
|
expect(sceneOf().objects).toHaveLength(1);
|
|
});
|
|
|
|
it('moves, overrides, clears and removes with undo', () => {
|
|
const f = makeSpriteScene();
|
|
const { stack, sceneId, spriteId, sceneOf, object } = f;
|
|
const box = place(f, spriteId, { x: 0, y: 0 });
|
|
|
|
stack.execute(new MoveSceneObjectCommand(sceneId, box, { x: 40, y: 50, z: 3 }));
|
|
expect(object(box).position).toEqual({ x: 40, y: 50, z: 3 });
|
|
stack.undo();
|
|
expect(object(box).position).toEqual({ x: 0, y: 0, z: 0 });
|
|
stack.redo();
|
|
|
|
stack.execute(new SetOverrideCommand(sceneId, box, 'color', 0x123456));
|
|
expect(object(box).overrides).toEqual({ color: 0x123456 });
|
|
expect(() => stack.execute(new SetOverrideCommand(sceneId, box, 'nope', 1))).toThrow();
|
|
|
|
stack.execute(new ClearOverrideCommand(sceneId, box, 'color'));
|
|
expect(object(box).overrides).toEqual({});
|
|
stack.undo();
|
|
expect(object(box).overrides).toEqual({ color: 0x123456 });
|
|
|
|
stack.execute(new RemoveSceneObjectsCommand(sceneId, [box]));
|
|
expect(sceneOf().objects).toHaveLength(0);
|
|
stack.undo();
|
|
expect(object(box).position).toEqual({ x: 40, y: 50, z: 3 });
|
|
});
|
|
|
|
it('clears the redo stack on a new command', () => {
|
|
const f = makeSpriteScene();
|
|
place(f, f.spriteId, { x: 0, y: 0 });
|
|
f.stack.undo();
|
|
expect(f.stack.canRedo).toBe(true);
|
|
place(f, f.spriteId, { x: 1, y: 1 });
|
|
expect(f.stack.canRedo).toBe(false);
|
|
});
|
|
});
|