Skip to content

Fix polygon stroke vertex deduplication #7362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ICOM725 wants to merge 1 commit into
base: master
Choose a base branch
from
+81 −1
Open

Fix polygon stroke vertex deduplication #7362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gameobjects/shape/StrokePathWebGL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var StrokePathWebGL = function (drawingContext, submitter, matrix, src, alpha, d
var y = path[i + 1] - dy;
if (i > 0)
{
if (x === path[i - 2] && y === path[i - 1])
if (path[i] === path[i - 2] && path[i + 1] === path[i - 1])
{
// Duplicate point, skip it
continue;
Expand Down
80 changes: 80 additions & 0 deletions tests/gameobjects/shape/StrokePathWebGL.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
var StrokePathWebGL = require('../../../src/gameobjects/shape/StrokePathWebGL');

describe('StrokePathWebGL', function ()
{
var src;
var strokePath;

beforeEach(function ()
{
strokePath = { run: vi.fn() };

src = {
pathData: [ 3, 0, 6, 3, 3, 6, 0, 3, 3, 0 ],
closePath: true,
lineWidth: 2,
strokeColor: 0x000000,
strokeAlpha: 1,
customRenderNodes: {},
defaultRenderNodes: { StrokePath: strokePath }
};
});

it('preserves every corner and the closing point of a centered diamond', function ()
{
StrokePathWebGL({}, {}, {}, src, 1, 3, 3);

expect(strokePath.run.mock.calls[0][2]).toEqual([
{ x: 0, y: -3, width: 2 },
{ x: 3, y: 0, width: 2 },
{ x: 0, y: 3, width: 2 },
{ x: -3, y: 0, width: 2 },
{ x: 0, y: -3, width: 2 }
]);
});

it('removes consecutive duplicate vertices with a non-zero display origin', function ()
{
src.pathData = [ 3, 0, 3, 0, 3, 0, 6, 3, 3, 6, 0, 3, 3, 0 ];

StrokePathWebGL({}, {}, {}, src, 1, 3, 3);

expect(strokePath.run.mock.calls[0][2]).toEqual([
{ x: 0, y: -3, width: 2 },
{ x: 3, y: 0, width: 2 },
{ x: 0, y: 3, width: 2 },
{ x: -3, y: 0, width: 2 },
{ x: 0, y: -3, width: 2 }
]);
});

it('still removes consecutive duplicate vertices with a zero display origin', function ()
{
src.pathData = [ 3, 0, 3, 0, 3, 0, 6, 3, 3, 6, 0, 3, 3, 0 ];

StrokePathWebGL({}, {}, {}, src, 1, 0, 0);

expect(strokePath.run.mock.calls[0][2]).toEqual([
{ x: 3, y: 0, width: 2 },
{ x: 6, y: 3, width: 2 },
{ x: 3, y: 6, width: 2 },
{ x: 0, y: 3, width: 2 },
{ x: 3, y: 0, width: 2 }
]);
});

it('preserves distinct vertices while omitting the closing point of an open path', function ()
{
src.closePath = false;

StrokePathWebGL({}, {}, {}, src, 1, 3, 3);

expect(strokePath.run.mock.calls[0][2]).toEqual([
{ x: 0, y: -3, width: 2 },
{ x: 3, y: 0, width: 2 },
{ x: 0, y: 3, width: 2 },
{ x: -3, y: 0, width: 2 }
]);
expect(strokePath.run.mock.calls[0][4]).toBe(true);
});
});