Skip to content

Fix SDF text not moving with parent #127

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

Merged
frank-weindel merged 1 commit into from
Jan 22, 2024
Merged

Fix SDF text not moving with parent #127

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
6 changes: 3 additions & 3 deletions examples/tests/text-overflow-suffix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ export default async function test(settings: ExampleSettings) {
});

await paginateTestRows(pageContainer, [
...generateLineHeightTest(renderer, 'sdf'),
...generateLineHeightTest(renderer, 'canvas'),
...generateOverflowSuffixTest(renderer, 'sdf'),
...generateOverflowSuffixTest(renderer, 'canvas'),
]);

return pageContainer;
Expand All @@ -61,7 +61,7 @@ const NODE_PROPS = {
contain: 'width',
} satisfies Partial<ITextNodeWritableProps>;

function generateLineHeightTest(
function generateOverflowSuffixTest(
renderer: RendererMain,
textRenderer: 'canvas' | 'sdf',
): TestRow[] {
Expand Down
6 changes: 3 additions & 3 deletions examples/tests/text-vertical-align.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ export default async function test(settings: ExampleSettings) {
});

await paginateTestRows(pageContainer, [
...generateLineHeightTest(renderer, 'sdf'),
...generateLineHeightTest(renderer, 'canvas'),
...generateVerticalAlignTest(renderer, 'sdf'),
...generateVerticalAlignTest(renderer, 'canvas'),
]);

return pageContainer;
Expand All @@ -59,7 +59,7 @@ const NODE_PROPS = {
lineHeight: 70,
} satisfies Partial<ITextNodeWritableProps>;

function generateLineHeightTest(
function generateVerticalAlignTest(
renderer: RendererMain,
textRenderer: 'canvas' | 'sdf',
): TestRow[] {
Expand Down
9 changes: 7 additions & 2 deletions src/core/lib/WebGlContextWrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,11 @@ export type UniformMethodMap = {
};

/**
* Compare two arrays for equality.
*
* @remarks
* This function will not try to compare nested arrays or Float32Arrays and
* instead will always return false when they are encountered.
*
* @param a
* @param b
Expand All @@ -951,8 +955,9 @@ export function compareArrays<T>(a: T[], b: T[]): boolean {
return false;
}
return a.every((v, i) => {
if (Array.isArray(v)) {
return compareArrays(v, b[i] as any[]);
// Don't bother to compare nested arrays or Float32Arrays
if (Array.isArray(v) || v instanceof Float32Array) {
return false;
} else {
return v === b[i];
}
Expand Down