@luma.gl/shadertools 9.3.0-alpha.8 → 9.3.0-alpha.9
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/dist/dist.dev.js +2 -3
- package/dist/dist.min.js +35 -35
- package/dist/index.cjs +2 -1
- package/dist/index.cjs.map +2 -2
- package/dist/lib/shader-module/shader-module-uniform-layout.d.ts.map +1 -1
- package/dist/lib/shader-module/shader-module-uniform-layout.js +2 -1
- package/dist/lib/shader-module/shader-module-uniform-layout.js.map +1 -1
- package/package.json +2 -2
- package/src/lib/shader-module/shader-module-uniform-layout.ts +4 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shader-module-uniform-layout.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module-uniform-layout.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAGlD,MAAM,MAAM,8BAA8B,GAAG,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAC;AAE5E,MAAM,MAAM,yCAAyC,GAAG;IACtD,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,8BAA8B,CAAC;IACtC,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,KAAK,MAAM,GAAG;IACZ,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,MAAM,OAAO,CAAC;CAC/C,CAAC;
|
|
1
|
+
{"version":3,"file":"shader-module-uniform-layout.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module-uniform-layout.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAGlD,MAAM,MAAM,8BAA8B,GAAG,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAC;AAE5E,MAAM,MAAM,yCAAyC,GAAG;IACtD,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,8BAA8B,CAAC;IACtC,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,KAAK,MAAM,GAAG;IACZ,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,MAAM,OAAO,CAAC;CAC/C,CAAC;AAKF,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAE5E;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,8BAA8B,GACpC,MAAM,EAAE,GAAG,IAAI,CAcjB;AAED,wBAAgB,4CAA4C,CAC1D,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,8BAA8B,GACpC,yCAAyC,GAAG,IAAI,CAmBlD;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,8BAA8B,EACrC,OAAO,GAAE;IACP,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,OAAO,CAAC;CACnB,GACL,yCAAyC,GAAG,IAAI,CAclD"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import { assert } from "../utils/assert.js";
|
|
5
|
+
const GLSL_UNIFORM_BLOCK_FIELD_REGEXP = /^(?:uniform\s+)?(?:(?:lowp|mediump|highp)\s+)?[A-Za-z0-9_]+(?:<[^>]+>)?\s+([A-Za-z0-9_]+)(?:\s*\[[^\]]+\])?\s*;/;
|
|
5
6
|
export function getShaderModuleUniformBlockName(module) {
|
|
6
7
|
return `${module.name}Uniforms`;
|
|
7
8
|
}
|
|
@@ -58,7 +59,7 @@ function extractShaderUniformBlockFieldNames(shaderSource, language, uniformBloc
|
|
|
58
59
|
}
|
|
59
60
|
const fieldMatch = language === 'wgsl'
|
|
60
61
|
? line.match(/^([A-Za-z0-9_]+)\s*:/)
|
|
61
|
-
: line.match(
|
|
62
|
+
: line.match(GLSL_UNIFORM_BLOCK_FIELD_REGEXP);
|
|
62
63
|
if (fieldMatch) {
|
|
63
64
|
fieldNames.push(fieldMatch[1]);
|
|
64
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shader-module-uniform-layout.js","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module-uniform-layout.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,MAAM,EAAC,2BAAwB;AAiBvC,MAAM,UAAU,+BAA+B,CAAC,MAAoB;IAClE,OAAO,GAAG,MAAM,CAAC,IAAI,UAAU,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC/C,MAAoB,EACpB,KAAqC;IAErC,MAAM,YAAY,GAChB,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;IAEhF,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,gBAAgB,GAAG,+BAA+B,CAAC,MAAM,CAAC,CAAC;IACjE,OAAO,mCAAmC,CACxC,YAAY,EACZ,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAClC,gBAAgB,CACjB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,4CAA4C,CAC1D,MAAoB,EACpB,KAAqC;IAErC,MAAM,oBAAoB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IACpE,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,kBAAkB,GAAG,iCAAiC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC5E,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,UAAU,EAAE,MAAM,CAAC,IAAI;QACvB,gBAAgB,EAAE,+BAA+B,CAAC,MAAM,CAAC;QACzD,KAAK;QACL,oBAAoB;QACpB,kBAAkB;QAClB,OAAO,EAAE,oBAAoB,CAAC,oBAAoB,EAAE,kBAAkB,CAAC;KACxE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC/C,MAAoB,EACpB,KAAqC,EACrC,UAGI,EAAE;IAEN,MAAM,gBAAgB,GAAG,4CAA4C,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACrF,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAClD,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,MAAM,OAAO,GAAG,oCAAoC,CAAC,gBAAgB,CAAC,CAAC;IACvE,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAAE,CAAC;IAElD,IAAI,OAAO,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC;QACnC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAS,mCAAmC,CAC1C,YAAoB,EACpB,QAAyB,EACzB,gBAAwB;IAExB,MAAM,UAAU,GACd,QAAQ,KAAK,MAAM;QACjB,CAAC,CAAC,qBAAqB,CAAC,YAAY,EAAE,gBAAgB,CAAC;QACvD,CAAC,CAAC,2BAA2B,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;IAElE,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,KAAK,MAAM,UAAU,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACtD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAClC,SAAS;QACX,CAAC;QAED,MAAM,UAAU,GACd,QAAQ,KAAK,MAAM;YACjB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC;YACpC,CAAC,CAAC,IAAI,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"shader-module-uniform-layout.js","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module-uniform-layout.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@luma.gl/shadertools",
|
|
3
|
-
"version": "9.3.0-alpha.
|
|
3
|
+
"version": "9.3.0-alpha.9",
|
|
4
4
|
"description": "Shader module system for luma.gl",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"@math.gl/core": "^4.1.0",
|
|
53
53
|
"@math.gl/types": "^4.1.0"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "737b0f752b3f8a6ae920b394d5ca028427275b37"
|
|
56
56
|
}
|
|
@@ -20,6 +20,9 @@ type Logger = {
|
|
|
20
20
|
error?: (...args: unknown[]) => () => unknown;
|
|
21
21
|
};
|
|
22
22
|
|
|
23
|
+
const GLSL_UNIFORM_BLOCK_FIELD_REGEXP =
|
|
24
|
+
/^(?:uniform\s+)?(?:(?:lowp|mediump|highp)\s+)?[A-Za-z0-9_]+(?:<[^>]+>)?\s+([A-Za-z0-9_]+)(?:\s*\[[^\]]+\])?\s*;/;
|
|
25
|
+
|
|
23
26
|
export function getShaderModuleUniformBlockName(module: ShaderModule): string {
|
|
24
27
|
return `${module.name}Uniforms`;
|
|
25
28
|
}
|
|
@@ -115,9 +118,7 @@ function extractShaderUniformBlockFieldNames(
|
|
|
115
118
|
const fieldMatch =
|
|
116
119
|
language === 'wgsl'
|
|
117
120
|
? line.match(/^([A-Za-z0-9_]+)\s*:/)
|
|
118
|
-
: line.match(
|
|
119
|
-
/^(?:uniform\s+)?[A-Za-z0-9_]+(?:<[^>]+>)?\s+([A-Za-z0-9_]+)(?:\s*\[[^\]]+\])?\s*;/
|
|
120
|
-
);
|
|
121
|
+
: line.match(GLSL_UNIFORM_BLOCK_FIELD_REGEXP);
|
|
121
122
|
|
|
122
123
|
if (fieldMatch) {
|
|
123
124
|
fieldNames.push(fieldMatch[1]);
|