@flighthq/render-gl 0.5.1-next.730.f29a5aa → 0.5.1-next.743.8d09db1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/glShader.d.ts +1 -1
- package/dist/glShader.d.ts.map +1 -1
- package/dist/glShader.js +5 -4
- package/dist/glShader.js.map +1 -1
- package/dist/glTestHelper.d.ts.map +1 -1
- package/dist/glTestHelper.js +2 -1
- package/dist/glTestHelper.js.map +1 -1
- package/package.json +11 -11
- package/src/glDraw.test.ts +7 -5
- package/src/glRenderState.test.ts +2 -2
- package/src/glShader.test.ts +10 -0
- package/src/glShaderBinding.test.ts +2 -1
- package/src/glShaderRegistry.test.ts +4 -2
package/README.md
CHANGED
|
@@ -13,5 +13,5 @@ Import the supported application-facing API from `@flighthq/render-gl`. The `@fl
|
|
|
13
13
|
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.
|
|
14
14
|
|
|
15
15
|
- [Flight project](https://github.com/flighthq/flight)
|
|
16
|
-
- [Source for @flighthq/render-gl@0.5.1-next.
|
|
17
|
-
- [License](https://github.com/flighthq/flight/blob/
|
|
16
|
+
- [Source for @flighthq/render-gl@0.5.1-next.743.8d09db1](https://github.com/flighthq/flight/tree/8d09db125a0afd3b73ca6e039a7dd25bcb9737d0/packages/render-gl)
|
|
17
|
+
- [License](https://github.com/flighthq/flight/blob/8d09db125a0afd3b73ca6e039a7dd25bcb9737d0/LICENSE.md)
|
package/dist/glShader.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { GlContext, GlRenderState, RenderProxy, RenderProxy2D } from '@flighthq/types/contract';
|
|
2
1
|
import type { GlBitmapShader, GlShaderLocations } from '@flighthq/types/contract';
|
|
2
|
+
import type { GlContext, GlRenderState, RenderProxy, RenderProxy2D } from '@flighthq/types/contract';
|
|
3
3
|
export declare function compileDefaultGlProgram(gl: GlContext): GlShaderLocations;
|
|
4
4
|
/**
|
|
5
5
|
* Compiles a bitmap program, reusing the standard quad vertex shader. Pass a
|
package/dist/glShader.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glShader.d.ts","sourceRoot":"","sources":["../src/glShader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"glShader.d.ts","sourceRoot":"","sources":["../src/glShader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClF,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AA4BrG,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,SAAS,GAAG,iBAAiB,CAExE;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,SAAS,EAAE,WAAW,GAAE,MAAqB,GAAG,iBAAiB,CAU3G;AAED,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,YAAY,GAAG,cAAc,CAkBnH;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,SAAS,EACb,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,aAAa,KAAK,IAAI,GACzF,cAAc,CAoBhB;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,aAAa,GAAG,cAAc,CAOhF;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAK3E;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAGvG;AAED,wBAAgB,wBAAwB,CACtC,EAAE,EAAE,SAAS,EACb,GAAG,EAAE,iBAAiB,EACtB,CAAC,EAAE,YAAY,EACf,CAAC,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,EACzE,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,GACrB,IAAI,CAaN;AAED,wBAAgB,qBAAqB,CACnC,EAAE,EAAE,SAAS,EACb,GAAG,EAAE,iBAAiB,EACtB,CAAC,EAAE,YAAY,EACf,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,GACrB,IAAI,CAaN"}
|
package/dist/glShader.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { createEntity } from '@flighthq/entity/contract';
|
|
1
2
|
import { createGlProgram } from './glProgram';
|
|
2
3
|
import { getGlRenderStateRuntime } from './glRenderState';
|
|
3
4
|
const VERTEX_SRC = `#version 300 es
|
|
@@ -43,7 +44,7 @@ export function compileGlBitmapProgram(gl, fragmentSrc = FRAGMENT_SRC) {
|
|
|
43
44
|
};
|
|
44
45
|
}
|
|
45
46
|
export function createDefaultGlBitmapShader(shaderLoc, matrixArray) {
|
|
46
|
-
return {
|
|
47
|
+
return createEntity({
|
|
47
48
|
locations: shaderLoc,
|
|
48
49
|
program: shaderLoc.program,
|
|
49
50
|
bind(gl, state, renderProxy) {
|
|
@@ -52,7 +53,7 @@ export function createDefaultGlBitmapShader(shaderLoc, matrixArray) {
|
|
|
52
53
|
setGlMatrixFromTransform(gl, shaderLoc, matrixArray, renderProxy.transform2D, runtime.renderTargetViewport?.width ?? gl.drawingBufferWidth, runtime.renderTargetViewport?.height ?? gl.drawingBufferHeight);
|
|
53
54
|
setGlBaseUniforms(gl, shaderLoc, renderProxy);
|
|
54
55
|
},
|
|
55
|
-
};
|
|
56
|
+
});
|
|
56
57
|
}
|
|
57
58
|
/**
|
|
58
59
|
* Builds a custom bitmap shader from a fragment shader source, ready to pass to
|
|
@@ -63,7 +64,7 @@ export function createDefaultGlBitmapShader(shaderLoc, matrixArray) {
|
|
|
63
64
|
*/
|
|
64
65
|
export function createGlBitmapShader(gl, fragmentSrc, onBind) {
|
|
65
66
|
const locations = compileGlBitmapProgram(gl, fragmentSrc);
|
|
66
|
-
return {
|
|
67
|
+
return createEntity({
|
|
67
68
|
locations,
|
|
68
69
|
program: locations.program,
|
|
69
70
|
bind(gl, state, renderProxy) {
|
|
@@ -73,7 +74,7 @@ export function createGlBitmapShader(gl, fragmentSrc, onBind) {
|
|
|
73
74
|
setGlBaseUniforms(gl, locations, renderProxy);
|
|
74
75
|
onBind?.(gl, locations, renderProxy);
|
|
75
76
|
},
|
|
76
|
-
};
|
|
77
|
+
});
|
|
77
78
|
}
|
|
78
79
|
export function ensureDefaultGlBitmapShader(state) {
|
|
79
80
|
const runtime = getGlRenderStateRuntime(state);
|
package/dist/glShader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glShader.js","sourceRoot":"","sources":["../src/glShader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"glShader.js","sourceRoot":"","sources":["../src/glShader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glTestHelper.d.ts","sourceRoot":"","sources":["../src/glTestHelper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"glTestHelper.d.ts","sourceRoot":"","sources":["../src/glTestHelper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAwB,MAAM,0BAA0B,CAAC;AAEpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAKlE,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG;IACrG,KAAK,EAAE,aAAa,CAAC;IACrB,EAAE,EAAE,sBAAsB,CAAC;IAC3B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,SAAS,EAAE,iBAAiB,CAAC;CAC9B,CAyDA;AAKD,wBAAgB,MAAM,CAAC,KAAK,SAAM,EAAE,MAAM,SAAM,GAAG,sBAAsB,CAQxE;AAED,wBAAgB,aAAa,IAAI,iBAAiB,CAYjD"}
|
package/dist/glTestHelper.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { createEntity } from '@flighthq/entity/contract';
|
|
1
2
|
import { createRenderState } from '@flighthq/render/contract';
|
|
2
3
|
import { EntityRuntimeKey } from '@flighthq/types/contract';
|
|
3
4
|
import { createEmptyGlRegistries, createGlPipeline } from './glPipeline';
|
|
@@ -40,7 +41,7 @@ export function createGlState(options) {
|
|
|
40
41
|
currentScissorRect: null,
|
|
41
42
|
flushPendingDraws: null,
|
|
42
43
|
renderTargetViewport: null,
|
|
43
|
-
defaultBitmapShader: { locations: shaderLoc, program: shaderLoc.program, bind: vi.fn() },
|
|
44
|
+
defaultBitmapShader: createEntity({ locations: shaderLoc, program: shaderLoc.program, bind: vi.fn() }),
|
|
44
45
|
quadVertexData: new Float32Array(16),
|
|
45
46
|
matrixArray: new Float32Array(9),
|
|
46
47
|
scissorStack: [],
|
package/dist/glTestHelper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glTestHelper.js","sourceRoot":"","sources":["../src/glTestHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAG5D,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAEnF,MAAM,UAAU,aAAa,CAAC,OAAsE;IAMlG,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,CAAC,KAAK,GAAG,GAAG,CAAC;IACnB,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC;IACpB,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;IACpB,MAAM,YAAY,GAAG,oBAAoB,CAAC,EAAE,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAC7D,MAAM,SAAS,GAAG,aAAa,EAAE,CAAC;IAClC,MAAM,KAAK,GAAG,iBAAiB,CAAC;QAC9B,cAAc,EAAE,OAAO,EAAE,cAAc,IAAI,IAAI;QAC/C,mBAAmB,EAAE,OAAO,EAAE,mBAAmB,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KAClE,CAAkB,CAAC;IAEpB,4CAA4C;IAC5C,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE;QACnB,cAAc,EAAE,IAAI;QACpB,YAAY;QACZ,EAAE;QACF,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,0BAA0B,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IACnE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE;QAC7B,qBAAqB,EAAE,IAAI;QAC3B,aAAa,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE;QACnE,yBAAyB,EAAE,IAAI;QAC/B,YAAY,EAAE,IAAI,OAAO,EAAmC;QAC5D,sCAAsC,EAAE,IAAI,OAAO,EAAE;QACrD,0CAA0C,EAAE,IAAI,OAAO,EAAE;QACzD,iCAAiC,EAAE,IAAI,OAAO,EAAE;QAChD,qCAAqC,EAAE,IAAI,OAAO,EAAE;QACpD,gBAAgB,EAAE,EAAiB;QACnC,eAAe,EAAE,EAAiB;KACnC,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;QACrB,kBAAkB,EAAE,IAAI;QACxB,gBAAgB,EAAE,CAAC;QACnB,kBAAkB,EAAE,IAAI;QACxB,iBAAiB,EAAE,IAAI;QACvB,oBAAoB,EAAE,IAAI;QAC1B,mBAAmB,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"glTestHelper.js","sourceRoot":"","sources":["../src/glTestHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flighthq/render-gl",
|
|
3
|
-
"version": "0.5.1-next.
|
|
3
|
+
"version": "0.5.1-next.743.8d09db1",
|
|
4
4
|
"author": "Joshua Granick and other contributors",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -38,16 +38,16 @@
|
|
|
38
38
|
"clean:dist": "tsx ../../scripts/clean-package-dist.ts"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@flighthq/color": "0.5.1-next.
|
|
42
|
-
"@flighthq/entity": "0.5.1-next.
|
|
43
|
-
"@flighthq/log": "0.5.1-next.
|
|
44
|
-
"@flighthq/scene2d": "0.5.1-next.
|
|
45
|
-
"@flighthq/geometry": "0.5.1-next.
|
|
46
|
-
"@flighthq/render": "0.5.1-next.
|
|
47
|
-
"@flighthq/registry": "0.5.1-next.
|
|
48
|
-
"@flighthq/signals": "0.5.1-next.
|
|
49
|
-
"@flighthq/texture": "0.5.1-next.
|
|
50
|
-
"@flighthq/types": "0.5.1-next.
|
|
41
|
+
"@flighthq/color": "0.5.1-next.743.8d09db1",
|
|
42
|
+
"@flighthq/entity": "0.5.1-next.743.8d09db1",
|
|
43
|
+
"@flighthq/log": "0.5.1-next.743.8d09db1",
|
|
44
|
+
"@flighthq/scene2d": "0.5.1-next.743.8d09db1",
|
|
45
|
+
"@flighthq/geometry": "0.5.1-next.743.8d09db1",
|
|
46
|
+
"@flighthq/render": "0.5.1-next.743.8d09db1",
|
|
47
|
+
"@flighthq/registry": "0.5.1-next.743.8d09db1",
|
|
48
|
+
"@flighthq/signals": "0.5.1-next.743.8d09db1",
|
|
49
|
+
"@flighthq/texture": "0.5.1-next.743.8d09db1",
|
|
50
|
+
"@flighthq/types": "0.5.1-next.743.8d09db1"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
53
|
"typescript": "^5.3.0"
|
package/src/glDraw.test.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { createEntity } from '@flighthq/entity/contract';
|
|
1
2
|
import { getRegistryTableEntry } from '@flighthq/registry/contract';
|
|
2
3
|
import { getTextureSource } from '@flighthq/texture/contract';
|
|
3
4
|
import type { Bitmap, CompressedImageResource, ImageResource, SamplerLike, Texture } from '@flighthq/types/contract';
|
|
@@ -1062,12 +1063,13 @@ describe('useGlProgram', () => {
|
|
|
1062
1063
|
it('uses the registered bitmap shader program and locations', () => {
|
|
1063
1064
|
const { state, gl } = createGlState();
|
|
1064
1065
|
const runtime = getGlRenderStateRuntime(state);
|
|
1065
|
-
const
|
|
1066
|
+
const program = {} as WebGLProgram;
|
|
1067
|
+
const locations = { ...runtime.defaultBitmapShader!.locations, program };
|
|
1068
|
+
const shader = createEntity({
|
|
1066
1069
|
bind: vi.fn(),
|
|
1067
|
-
locations
|
|
1068
|
-
program
|
|
1069
|
-
};
|
|
1070
|
-
shader.locations.program = shader.program;
|
|
1070
|
+
locations,
|
|
1071
|
+
program,
|
|
1072
|
+
});
|
|
1071
1073
|
|
|
1072
1074
|
registerGlBitmapShader(state, shader);
|
|
1073
1075
|
useGlProgram(state);
|
|
@@ -549,11 +549,11 @@ describe('destroyGlRenderState', () => {
|
|
|
549
549
|
const owner = createTestGlRenderState(gl);
|
|
550
550
|
const owned = ensureDefaultGlBitmapShader(owner);
|
|
551
551
|
const callerProgram = { callerOwned: true } as unknown as WebGLProgram;
|
|
552
|
-
const shader = {
|
|
552
|
+
const shader = createEntity({
|
|
553
553
|
bind: vi.fn(),
|
|
554
554
|
locations: { ...owned.locations, program: callerProgram },
|
|
555
555
|
program: callerProgram,
|
|
556
|
-
};
|
|
556
|
+
});
|
|
557
557
|
const deleteProgram = vi.spyOn(gl, 'deleteProgram');
|
|
558
558
|
useGlProgram(owner, shader);
|
|
559
559
|
|
package/src/glShader.test.ts
CHANGED
|
@@ -77,6 +77,11 @@ describe('compileGlBitmapProgram', () => {
|
|
|
77
77
|
});
|
|
78
78
|
|
|
79
79
|
describe('createDefaultGlBitmapShader', () => {
|
|
80
|
+
it('returns an Entity-backed shader', () => {
|
|
81
|
+
const shader = createDefaultGlBitmapShader(makeShaderLoc(), new Float32Array(9));
|
|
82
|
+
expect(EntityRuntimeKey in shader).toBe(true);
|
|
83
|
+
});
|
|
84
|
+
|
|
80
85
|
it('returns a shader with the provided program', () => {
|
|
81
86
|
const loc = makeShaderLoc();
|
|
82
87
|
const m = new Float32Array(9);
|
|
@@ -125,6 +130,11 @@ describe('createDefaultGlBitmapShader', () => {
|
|
|
125
130
|
});
|
|
126
131
|
|
|
127
132
|
describe('createGlBitmapShader', () => {
|
|
133
|
+
it('returns an Entity-backed shader', () => {
|
|
134
|
+
const shader = createGlBitmapShader(makeGL(), '#version 300 es\nvoid main() {}');
|
|
135
|
+
expect(EntityRuntimeKey in shader).toBe(true);
|
|
136
|
+
});
|
|
137
|
+
|
|
128
138
|
it('returns a shader compiled from the fragment source', () => {
|
|
129
139
|
const gl = makeGL();
|
|
130
140
|
const shader = createGlBitmapShader(gl, '#version 300 es\nvoid main() {}');
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { createEntity } from '@flighthq/entity/contract';
|
|
1
2
|
import { getOrCreateRenderProxy2D } from '@flighthq/render/contract';
|
|
2
3
|
import type { Node2D, Kind } from '@flighthq/types/contract';
|
|
3
4
|
|
|
@@ -12,7 +13,7 @@ import {
|
|
|
12
13
|
import { createGlState } from './glTestHelper';
|
|
13
14
|
|
|
14
15
|
function makeShader() {
|
|
15
|
-
return { locations: {} as never, program: {} as never, bind: vi.fn() };
|
|
16
|
+
return createEntity({ locations: {} as never, program: {} as never, bind: vi.fn() });
|
|
16
17
|
}
|
|
17
18
|
|
|
18
19
|
describe('getGlMaterialShader', () => {
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { createEntity } from '@flighthq/entity/contract';
|
|
2
|
+
|
|
1
3
|
import { getGlRenderStateRuntime } from './glRenderState';
|
|
2
4
|
import { registerGlBitmapShader } from './glShaderRegistry';
|
|
3
5
|
import { createGlState, makeShaderLoc } from './glTestHelper';
|
|
@@ -6,11 +8,11 @@ describe('registerGlBitmapShader', () => {
|
|
|
6
8
|
it('uses the provided shader as the state default shader', () => {
|
|
7
9
|
const { state } = createGlState();
|
|
8
10
|
const loc = makeShaderLoc();
|
|
9
|
-
const shader = {
|
|
11
|
+
const shader = createEntity({
|
|
10
12
|
bind: vi.fn(),
|
|
11
13
|
locations: loc,
|
|
12
14
|
program: loc.program,
|
|
13
|
-
};
|
|
15
|
+
});
|
|
14
16
|
|
|
15
17
|
registerGlBitmapShader(state, shader);
|
|
16
18
|
|