-
Notifications
You must be signed in to change notification settings - Fork 0
Add production FlatPolygon browser smoke coverage #92
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,77 @@ | ||
| import { describe, expect, it, vi } from 'vitest'; | ||
| import { beforeEach, describe, expect, it, vi } from 'vitest'; | ||
|
|
||
| const modelOptions = vi.hoisted((): Array<{ shaderAssembler?: unknown }> => []); | ||
| const modelInstances = vi.hoisted((): Array<{ destroy: ReturnType<typeof vi.fn> }> => []); | ||
|
|
||
| vi.mock('@luma.gl/engine', () => ({ | ||
| Model: class { | ||
| destroy = vi.fn(); | ||
|
|
||
| constructor(_device: unknown, options: { shaderAssembler?: unknown }) { | ||
| modelOptions.push(options); | ||
| modelInstances.push(this); | ||
| } | ||
| }, | ||
| })); | ||
|
|
||
| import { FlatPolygonLayer } from '../src/FlatPolygonLayer'; | ||
|
|
||
| function makeProps() { | ||
| return { | ||
| id: 'flat-polygon-shader-modules', | ||
| ringPositions: new Float32Array([0, 0, 1, 0, 0, 1]), | ||
| ringVertexCount: 3, | ||
| triangleData: new Uint32Array([0, 1, 2, 7]), | ||
| triangleCount: 1, | ||
| featureColors: new Uint8Array([0, 0, 0, 255]), | ||
| featureCount: 1, | ||
| featureScale: new Float32Array([1]), | ||
| }; | ||
| } | ||
|
|
||
| describe('FlatPolygonLayer shaders', () => { | ||
| it('uses Deck’s shader assembler when creating its hand-rolled Model', () => { | ||
| const layer = new FlatPolygonLayer({ | ||
| id: 'flat-polygon-shader-modules', | ||
| ringPositions: new Float32Array([0, 0, 1, 0, 0, 1]), | ||
| ringVertexCount: 3, | ||
| triangleData: new Uint32Array([0, 1, 2, 7]), | ||
| triangleCount: 1, | ||
| featureColors: new Uint8Array([0, 0, 0, 255]), | ||
| featureCount: 1, | ||
| featureScale: new Float32Array([1]), | ||
| }); | ||
| beforeEach(() => { | ||
| modelOptions.length = 0; | ||
| modelInstances.length = 0; | ||
| }); | ||
|
|
||
| it("uses Deck's shader assembler when creating its hand-rolled Model", () => { | ||
| const layer = new FlatPolygonLayer(makeProps()); | ||
| const shaderAssembler = {}; | ||
| layer.context = { defaultShaderModules: [], shaderAssembler }; | ||
|
|
||
| layer._getModel(); | ||
|
|
||
| expect(modelOptions.at(-1)).toMatchObject({ shaderAssembler }); | ||
| }); | ||
|
|
||
| it("does not recreate the model for Deck's first forced extensionsChanged update", () => { | ||
| const props = makeProps(); | ||
| const layer = new FlatPolygonLayer(props); | ||
| const initialModel = { destroy: vi.fn() }; | ||
| layer.state = { model: initialModel }; | ||
| layer.context = { defaultShaderModules: [], shaderAssembler: {}, device: {} }; | ||
|
|
||
| layer.updateState({ props, oldProps: { ...props }, changeFlags: { extensionsChanged: true } }); | ||
|
|
||
| expect(initialModel.destroy).not.toHaveBeenCalled(); | ||
| expect(modelOptions).toHaveLength(0); | ||
| }); | ||
|
|
||
| it('recreates the model for later extension changes', () => { | ||
| const props = makeProps(); | ||
| const layer = new FlatPolygonLayer(props); | ||
| const initialModel = { destroy: vi.fn() }; | ||
| layer.state = { model: initialModel }; | ||
| layer.context = { defaultShaderModules: [], shaderAssembler: {}, device: {} }; | ||
|
|
||
| layer.updateState({ | ||
| props, | ||
| oldProps: { ...props, extensions: [] }, | ||
| changeFlags: { extensionsChanged: true }, | ||
| }); | ||
|
|
||
| expect(initialModel.destroy).toHaveBeenCalledOnce(); | ||
| expect(modelInstances).toHaveLength(1); | ||
| }); | ||
| }); |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <!doctype html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <title>Production layer browser smoke test</title> | ||
| </head> | ||
| <body> | ||
| <div id="root"></div> | ||
| <script type="module" src="/src.tsx"></script> | ||
| </body> | ||
| </html> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import { defineConfig } from '@playwright/test'; | ||
|
|
||
| export default defineConfig({ | ||
| testDir: '.', | ||
| testMatch: '*.spec.ts', | ||
| fullyParallel: false, | ||
| workers: 1, | ||
| use: { | ||
| baseURL: 'http://127.0.0.1:4173', | ||
| browserName: 'chromium', | ||
| headless: true, | ||
| // CI has no hardware GPU. Chromium's SwiftShader ANGLE path still exposes | ||
| // WebGL2, which the polygon-shapes scenario probes before compiling the | ||
| // FlatPolygonLayer shader. | ||
| launchOptions: { args: ['--use-gl=angle', '--use-angle=swiftshader'] }, | ||
| }, | ||
| webServer: [ | ||
| { | ||
| command: 'pnpm test:server', | ||
| port: 38473, | ||
| reuseExistingServer: !process.env.CI, | ||
| timeout: 30_000, | ||
| }, | ||
| { | ||
| command: 'pnpm exec vite preview --config vite.config.ts', | ||
| port: 4173, | ||
| reuseExistingServer: !process.env.CI, | ||
| timeout: 30_000, | ||
| }, | ||
| ], | ||
| }); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.