Skip to content

Commit b811d8a

Browse files
committed
Move filter param
1 parent b76a34a commit b811d8a

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

src/Renderer.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -286,13 +286,11 @@ export default class Renderer {
286286
// Handles rendering of all layers (including stage, pen layer, sprites, and all clones) in proper order.
287287
private _renderLayers(
288288
layers?: Set<Sprite | Stage | PenSkin>,
289-
optionsIn: {
290-
filter?: (layer: Sprite | Stage | PenSkin) => boolean;
291-
} & Partial<RenderSpriteOptions> = {}
289+
optionsIn: Partial<RenderSpriteOptions> = {},
290+
filter?: (layer: Sprite | Stage | PenSkin) => boolean
292291
): void {
293292
const options = {
294293
drawMode: ShaderManager.DrawModes.DEFAULT,
295-
renderSpeechBubbles: true,
296294
...optionsIn,
297295
};
298296

@@ -303,7 +301,7 @@ export default class Renderer {
303301
const shouldIncludeLayer = (layer: Sprite | Stage | PenSkin): boolean =>
304302
!(
305303
(shouldRestrictLayers && !layers.has(layer)) ||
306-
(options.filter && !options.filter(layer))
304+
(filter && !filter(layer))
307305
);
308306

309307
// Stage
@@ -516,7 +514,7 @@ export default class Renderer {
516514

517515
if (
518516
options.renderSpeechBubbles &&
519-
'_speechBubble' in sprite &&
517+
"_speechBubble" in sprite &&
520518
sprite._speechBubble &&
521519
sprite._speechBubble.text !== "" &&
522520
sprite instanceof Sprite
@@ -703,9 +701,7 @@ export default class Renderer {
703701
this._stencilSprite(spr, sprColor);
704702

705703
// Render the sprites to check that we're touching, which will now be masked in to the area of the first sprite.
706-
this._renderLayers(undefined, {
707-
filter: (layer) => layer !== spr,
708-
});
704+
this._renderLayers(undefined, undefined, (layer) => layer !== spr);
709705

710706
// Make sure to disable the stencil test so as not to affect other rendering!
711707
gl.disable(gl.STENCIL_TEST);

0 commit comments

Comments
 (0)