@flighthq/application-gl 0.5.0-next.1944.cd6b6e7 → 0.5.1-next.597.ab004dd

package/README.md

@@ -13,5 +13,5 @@ Import the supported application-facing API from `@flighthq/application-gl`. The
 This package is part of the locked-version Flight SDK graph. Applications may instead install and import `@flighthq/sdk` when package-level tree shaking is sufficient.
 
 - [Flight project](https://github.com/flighthq/flight)
-- [Source for @flighthq/application-gl@0.5.0-next.1944.cd6b6e7](https://github.com/flighthq/flight/tree/cd6b6e71eb472b3a4249830a7743333f019fa7b7/packages/application-gl)
-- [License](https://github.com/flighthq/flight/blob/cd6b6e71eb472b3a4249830a7743333f019fa7b7/LICENSE.md)
+- [Source for @flighthq/application-gl@0.5.1-next.597.ab004dd](https://github.com/flighthq/flight/tree/ab004ddc85b350cbd99a944e1e8108a016ae8af0/packages/application-gl)
+- [License](https://github.com/flighthq/flight/blob/ab004ddc85b350cbd99a944e1e8108a016ae8af0/LICENSE.md)

package/dist/glApplicationRenderView.d.ts

@@ -1,4 +1,4 @@
 import type { ApplicationWindow, GlApplicationRenderView, GlApplicationRenderViewOptions } from '@flighthq/types/contract';
-export declare function createGlApplicationRenderView(window: ApplicationWindow, canvas: HTMLCanvasElement, options?: Readonly<GlApplicationRenderViewOptions>): GlApplicationRenderView;
+export declare function createGlApplicationRenderView(window: ApplicationWindow, canvas: HTMLCanvasElement, options: Readonly<GlApplicationRenderViewOptions>): GlApplicationRenderView;
 export declare function destroyGlApplicationRenderView(view: GlApplicationRenderView): void;
 //# sourceMappingURL=glApplicationRenderView.d.ts.map

package/dist/glApplicationRenderView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glApplicationRenderView.d.ts","sourceRoot":"","sources":["../src/glApplicationRenderView.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,8BAA8B,EAG/B,MAAM,0BAA0B,CAAC;AAMlC,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,iBAAiB,EACzB,OAAO,GAAE,QAAQ,CAAC,8BAA8B,CAAM,GACrD,uBAAuB,CAoBzB;AAID,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,uBAAuB,GAAG,IAAI,CAIlF"}
+{"version":3,"file":"glApplicationRenderView.d.ts","sourceRoot":"","sources":["../src/glApplicationRenderView.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,8BAA8B,EAG/B,MAAM,0BAA0B,CAAC;AAMlC,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,QAAQ,CAAC,8BAA8B,CAAC,GAChD,uBAAuB,CA6BzB;AAID,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,uBAAuB,GAAG,IAAI,CAIlF"}

package/dist/glApplicationRenderView.js

@@ -1,15 +1,17 @@
 import { createApplicationRenderView, detachApplicationRenderView } from '@flighthq/application/contract';
 import { createViewport } from '@flighthq/node/contract';
-import { createGlRenderState, createGlRenderTarget, destroyGlRenderState, destroyGlRenderTarget, invalidateGlRenderStateCache, resizeGlRenderTarget, } from '@flighthq/render-gl/contract';
+import { createGlContextFromCanvasElement, createGlContextState, createGlRenderState, createGlRenderTarget, destroyGlRenderState, destroyGlRenderTarget, invalidateGlRenderStateCache, resizeGlRenderTarget, } from '@flighthq/render-gl/contract';
 // Allocates the GL realization of an ApplicationRenderView. Creation does not attach the resize signal;
 // call attachApplicationRenderView explicitly when the window should drive subsequent synchronization.
 // The returned view owns the state and target allocated here; destroy it with
 // destroyGlApplicationRenderView.
-export function createGlApplicationRenderView(window, canvas, options = {}) {
+export function createGlApplicationRenderView(window, canvas, options) {
     const width = Math.max(0, Math.round(window.width * window.devicePixelRatio));
     const height = Math.max(0, Math.round(window.height * window.devicePixelRatio));
     synchronizeGlCanvasBackingStore(canvas, width, height);
-    const renderState = createGlRenderState(canvas, {
+    const context = createGlContextFromCanvasElement(canvas, options.context);
+    const contextState = createGlContextState(context);
+    const renderState = createGlRenderState(contextState, options.pipeline, {
         ...options.render,
         pixelRatio: window.devicePixelRatio,
     });
@@ -23,7 +25,7 @@ export function createGlApplicationRenderView(window, canvas, options = {}) {
         height,
         width,
     });
-    return createApplicationRenderView(window, renderState, renderTarget, viewport, resizeGlApplicationRenderView);
+    return createApplicationRenderView(window, renderState, renderTarget, viewport, (state, target, nextWidth, nextHeight) => resizeGlApplicationRenderView(canvas, state, target, nextWidth, nextHeight));
 }
 // Detaches window observation and deterministically frees the target and state owned by
 // createGlApplicationRenderView. The canvas and ApplicationWindow remain caller-owned.
@@ -32,8 +34,8 @@ export function destroyGlApplicationRenderView(view) {
     destroyGlRenderTarget(view.renderState, view.renderTarget);
     destroyGlRenderState(view.renderState);
 }
-function resizeGlApplicationRenderView(renderState, renderTarget, width, height) {
-    if (synchronizeGlCanvasBackingStore(renderState.canvas, width, height)) {
+function resizeGlApplicationRenderView(canvas, renderState, renderTarget, width, height) {
+    if (synchronizeGlCanvasBackingStore(canvas, width, height)) {
         invalidateGlRenderStateCache(renderState);
     }
     const storageWidth = Math.max(1, Math.ceil(width));

package/dist/glApplicationRenderView.js.map

@@ -1 +1 @@
-{"version":3,"file":"glApplicationRenderView.js","sourceRoot":"","sources":["../src/glApplicationRenderView.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"glApplicationRenderView.js","sourceRoot":"","sources":["../src/glApplicationRenderView.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/application-gl",
-  "version": "0.5.0-next.1944.cd6b6e7",
+  "version": "0.5.1-next.597.ab004dd",
   "author": "Joshua Granick and other contributors",
   "license": "MIT",
   "repository": {
@@ -38,10 +38,10 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/application": "0.5.0-next.1944.cd6b6e7",
-    "@flighthq/node": "0.5.0-next.1944.cd6b6e7",
-    "@flighthq/render-gl": "0.5.0-next.1944.cd6b6e7",
-    "@flighthq/types": "0.5.0-next.1944.cd6b6e7"
+    "@flighthq/application": "0.5.1-next.597.ab004dd",
+    "@flighthq/node": "0.5.1-next.597.ab004dd",
+    "@flighthq/render-gl": "0.5.1-next.597.ab004dd",
+    "@flighthq/types": "0.5.1-next.597.ab004dd"
   },
   "devDependencies": {
     "@flighthq/signals": "*",

package/src/glApplicationRenderView.test.ts

@@ -4,11 +4,13 @@ import {
   synchronizeApplicationRenderView,
 } from '@flighthq/application/contract';
 import { emitSignal } from '@flighthq/signals/contract';
-import type { GlRenderState, GlRenderTarget } from '@flighthq/types/contract';
+import type { GlPipeline, GlRenderState, GlRenderTarget } from '@flighthq/types/contract';
 
 import { createGlApplicationRenderView, destroyGlApplicationRenderView } from './glApplicationRenderView';
 
 const mocks = vi.hoisted(() => ({
+  createGlContextFromCanvasElement: vi.fn(),
+  createGlContextState: vi.fn(),
   createGlRenderState: vi.fn(),
   createGlRenderTarget: vi.fn(),
   createViewport: vi.fn(),
@@ -23,6 +25,8 @@ vi.mock('@flighthq/node/contract', () => ({
 }));
 
 vi.mock('@flighthq/render-gl/contract', () => ({
+  createGlContextFromCanvasElement: mocks.createGlContextFromCanvasElement,
+  createGlContextState: mocks.createGlContextState,
   createGlRenderState: mocks.createGlRenderState,
   createGlRenderTarget: mocks.createGlRenderTarget,
   destroyGlRenderState: mocks.destroyGlRenderState,
@@ -32,8 +36,11 @@ vi.mock('@flighthq/render-gl/contract', () => ({
 }));
 
 beforeEach(() => {
-  mocks.createGlRenderState.mockImplementation((canvas: HTMLCanvasElement, options: { pixelRatio: number }) => ({
-    canvas,
+  mocks.createGlContextFromCanvasElement.mockImplementation(() => ({ drawingBufferHeight: 0, drawingBufferWidth: 0 }));
+  mocks.createGlContextState.mockImplementation((gl) => ({ gl }));
+  mocks.createGlRenderState.mockImplementation((contextState, _pipeline, options: { pixelRatio: number }) => ({
+    contextState,
+    gl: contextState.gl,
     pixelRatio: options.pixelRatio,
     renderTransform2D: { a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0 },
   }));
@@ -52,6 +59,8 @@ beforeEach(() => {
   );
 });
 
+const pipeline = {} as GlPipeline;
+
 describe('createGlApplicationRenderView', () => {
   it('allocates and links the GL state, target, and device-pixel viewport', () => {
     const window = createApplicationWindow();
@@ -61,13 +70,22 @@ describe('createGlApplicationRenderView', () => {
     const canvas = document.createElement('canvas');
 
     const view = createGlApplicationRenderView(window, canvas, {
-      render: { antialias: false },
+      context: { antialias: false },
+      pipeline,
+      render: { roundPixels: true },
       target: { colorSpace: 'linear', depth: 'depth-stencil' },
     });
 
     expect(canvas.width).toBe(640);
     expect(canvas.height).toBe(360);
-    expect(mocks.createGlRenderState).toHaveBeenCalledWith(canvas, { antialias: false, pixelRatio: 2 });
+    expect(mocks.createGlContextFromCanvasElement).toHaveBeenCalledWith(canvas, { antialias: false });
+    expect(mocks.createGlContextState).toHaveBeenCalledWith(
+      mocks.createGlContextFromCanvasElement.mock.results[0].value,
+    );
+    expect(mocks.createGlRenderState).toHaveBeenCalledWith(mocks.createGlContextState.mock.results[0].value, pipeline, {
+      pixelRatio: 2,
+      roundPixels: true,
+    });
     expect(mocks.createGlRenderTarget).toHaveBeenCalledWith(view.renderState, {
       colorSpace: 'linear',
       depth: 'depth-stencil',
@@ -82,7 +100,7 @@ describe('createGlApplicationRenderView', () => {
     window.width = 20;
     window.height = 10;
     const canvas = document.createElement('canvas');
-    const view = createGlApplicationRenderView(window, canvas);
+    const view = createGlApplicationRenderView(window, canvas, { pipeline });
     mocks.invalidateGlRenderStateCache.mockClear();
     mocks.resizeGlRenderTarget.mockClear();
 
@@ -103,7 +121,7 @@ describe('destroyGlApplicationRenderView', () => {
     const window = createApplicationWindow();
     window.width = 20;
     window.height = 10;
-    const view = createGlApplicationRenderView(window, document.createElement('canvas'));
+    const view = createGlApplicationRenderView(window, document.createElement('canvas'), { pipeline });
     attachApplicationRenderView(view);
     mocks.resizeGlRenderTarget.mockClear();