Free a redrawn picture only once no shader names it (#293)
Editing a vector drawing made Pixi warn "destroyed while still bound
to a shader", twice with every change, once it had begun. It began
where an object wears the drawing through a shader asset. Each
change draws the picture anew and destroyed the one before it, but
the mesh of that object keeps its picture bound until it syncs. The
issue also asks for the button "Add shape" to go: a shape without
points cannot be given any, the Pen draws a new one.
- GeneratedPictures takes two more callbacks. inUse says that a
picture cannot be freed yet, soon runs a retry once whoever asked
is done.
- A replaced picture that is still in use waits in a list of its
own. It is freed right after the redraw that asked, as a rule. On
a later ask where its wearer was not part of that redraw.
- TextureLibrary tells a bound picture by the listeners for change
on its source. Under WebGL the bind groups are the only ones that
listen there. The retry is a microtask.
- The rule is asked for every drawn picture alike, whoever wears it.
- The inspector of a drawing and of a shape has no "Add shape" any
more. "Delete shapes" for several selected shapes stays.
Decided here:
- Under the list of shapes a second note says "The Pen draws a new
shape." while only the asset is selected.
Found on the way:
- Reproduced on a throwaway copy of the project the report came
from: 6 warnings for 3 changes with the shader override on the
object, none without it. After the change none, and no replaced
picture is left waiting.
- The fixture project of the tests never showed the warning. No
object there wore a drawing through a shader.
Tests:
- Gate on melektaus-atx: 211 files, 3219 tests (3209 + 10), exit 0
- e2e 47,48 on melektaus-atx: 113 checks, all pass
- e2e 28,30,31,39,40,47,48: 350 checks, all pass, run before the
wording of the new note changed
- The first gate was red: an existing test read the wording of the
note that had changed. Only three test files had been run after
the change.
- No full run and no smokes. The sum of 1668 (1667 + 1) is reckoned,
1667 is what CI counted for ec2fd90.
- Ten unit tests, five of them against the real bind group of Pixi
in tests/viewport/bound-pictures.test.ts
- One e2e check in block 47b-ii of module 47: a drawing worn through
a shader, three changes, no warning. The check on "Add shape" now
reads that there is no such button.
- Nine unit counter-probes and two browser counter-probes all fail
their tests. Without the change the new check counts 6 warnings.
- Not checked: a tilemap or a particle emitter holding a picture
bound the same way. Nothing was looked at after the build, the
new note included.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
ec2fd9084f
commit
9e869df063
11 files changed
+364
-46
No files matched your search
@@ -130,6 +130,8 @@ export function renderHooks({ app, state, editor }: HookContext) {
|
||||
kept: texture !== null,
|
||||
};
|
||||
},
|
||||
/** Drawn pictures whose revision moved on while a shader still named them (#293); freed on a later ask. */
|
||||
picturesWaiting: () => textureLibrary.waitingPictures(),
|
||||
fps: () => editor.fps,
|
||||
/**
|
||||
* What the render loop did: frames actually drawn, and whether it is currently awake. The
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
import {
|
||||
AddVectorLayerCommand,
|
||||
AddVectorShapeCommand,
|
||||
CombineVectorShapesCommand,
|
||||
DuplicateVectorShapeCommand,
|
||||
MoveVectorLayerCommand,
|
||||
@@ -66,7 +65,7 @@ import { removeShapes } from '../actions';
|
||||
import { FramePreview } from '../framePreview';
|
||||
import { listFold } from '../sectionFolds';
|
||||
import { type EditorState, shapeSelection } from '../state';
|
||||
import { activeLayerOf, activeVectorLayer, pickVectorLayer } from '../vectorart/activeLayer';
|
||||
import { activeVectorLayer, pickVectorLayer } from '../vectorart/activeLayer';
|
||||
import { groupBlocker, groupShapes, groupsToDissolve, ungroupShapes } from '../vectorart/grouping';
|
||||
import { GradientBar } from '../vectorart/GradientBar';
|
||||
import { ShapeList } from '../vectorart/ShapeList';
|
||||
@@ -276,8 +275,8 @@ export function buildShapeListSection(host: InspectorHost, asset: VectorArtAsset
|
||||
addLayerList(host, asset, '');
|
||||
addShapeList(host, asset, '', []);
|
||||
addNote(host, 'The top row is drawn over the ones below it.', 'small');
|
||||
addGap(host);
|
||||
host.body.add(addShapeButton(host, asset.id));
|
||||
// No button adds a shape (#293): one without points could not be given any.
|
||||
addNote(host, 'The Pen draws a new shape.', 'small');
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -358,16 +357,17 @@ export function buildShapeSection(
|
||||
);
|
||||
} else addNote(host, 'Without an outline only the fill is drawn.', 'small');
|
||||
|
||||
addGap(host);
|
||||
// One shape goes by the cross on its row; several at once only from here.
|
||||
if (shapeIds.length > 1)
|
||||
// One shape goes by the cross on its row; several at once only from here. There is no button
|
||||
// that adds one (#293): a shape without points could not be given any, the Pen draws a new one.
|
||||
if (shapeIds.length > 1) {
|
||||
addGap(host);
|
||||
host.body.add(
|
||||
new Button('Delete shapes', {
|
||||
variant: 'danger',
|
||||
onClick: () => removeShapes(host.state, assetId, shapeIds),
|
||||
}),
|
||||
);
|
||||
host.body.add(addShapeButton(host, assetId));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -596,17 +596,6 @@ function removeShape(host: InspectorHost, assetId: string, itemId: string): void
|
||||
host.state.select(rest.length > 0 ? shapeSelection(assetId, rest) : { kind: 'asset', assetId });
|
||||
}
|
||||
|
||||
function addShapeButton(host: InspectorHost, assetId: string): Button {
|
||||
return new Button('Add shape', {
|
||||
onClick: () => {
|
||||
const asset = findAssetOf(host.state.project, assetId, 'vectorart');
|
||||
const layer = asset && activeLayerOf(host.state, asset);
|
||||
const command = new AddVectorShapeCommand(assetId, [], undefined, layer?.id);
|
||||
if (host.state.execute(command)) host.state.select(shapeSelection(assetId, [command.shapeId]));
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* The name row. Not `addNameField`: the shape's name also stands in the list right above it, and a
|
||||
* blank one is refused by the command, which cannot put the old text back into the field.
|
||||
|
||||
@@ -42,7 +42,7 @@ export class ShapeList extends SortableList {
|
||||
* the row pressed and whether it was pressed with Ctrl or Shift, which adds the shape to the
|
||||
* selection or takes it out (#187). `onDrop` is told where a dragged row landed. `onDuplicate` and
|
||||
* `onRemove` are the marks at the end of a row, `onRename` a name edited in its row. There is no
|
||||
* plus: a shape is drawn with the Pen, and "Add shape" stays below.
|
||||
* plus: a shape is drawn with the Pen.
|
||||
*/
|
||||
constructor(
|
||||
private readonly state: EditorState,
|
||||
|
||||
Reference in new issue
Block a user