glre 0.44.0 → 0.45.0

package/dist/react.d.ts

@@ -112,7 +112,7 @@ interface NodeContext {
         fragInputs: Map<string, string>;
         vertInputs: Map<string, string>;
         vertOutputs: Map<string, string>;
-        vertVaryings: Map<string, string>;
+        vertVaryings: Map<string, VaryingInfo>;
         computeInputs: Map<string, string>;
         dependencies: Map<string, Set<string>>;
         structStructFields: Map<string, StructFields>;
@@ -208,6 +208,10 @@ type Mat4 = XImpl<'mat4'>;
 type Texture$1 = XImpl<'texture'>;
 type Sampler2D = XImpl<'sampler2D'>;
 type StructBase = XImpl<'struct'>;
+interface VaryingInfo {
+    node: Y;
+    code?: string;
+}
 interface ConstantsToType {
     void: Void;
     bool: Bool;
@@ -244,6 +248,7 @@ type XImpl<T extends C> = _X<T> & {
 };
 type C = Constants;
 type X<T extends C = C> = T extends keyof ConstantsToType ? ConstantsToType[T] : _X<T>;
+type Y<T extends C = C> = number | number[] | string | boolean | undefined | HTMLElement | X<T>;
 type Methods = Functions | Operators | Conversions | Swizzles | '__nodeType' | 'type' | 'props' | 'isProxy' | 'assign' | 'toVar' | 'toString' | 'element' | 'select';
 interface _X<T extends C> {
     readonly __nodeType?: T;

package/dist/solid.d.ts

@@ -112,7 +112,7 @@ interface NodeContext {
         fragInputs: Map<string, string>;
         vertInputs: Map<string, string>;
         vertOutputs: Map<string, string>;
-        vertVaryings: Map<string, string>;
+        vertVaryings: Map<string, VaryingInfo>;
         computeInputs: Map<string, string>;
         dependencies: Map<string, Set<string>>;
         structStructFields: Map<string, StructFields>;
@@ -208,6 +208,10 @@ type Mat4 = XImpl<'mat4'>;
 type Texture$1 = XImpl<'texture'>;
 type Sampler2D = XImpl<'sampler2D'>;
 type StructBase = XImpl<'struct'>;
+interface VaryingInfo {
+    node: Y;
+    code?: string;
+}
 interface ConstantsToType {
     void: Void;
     bool: Bool;
@@ -244,6 +248,7 @@ type XImpl<T extends C> = _X<T> & {
 };
 type C = Constants;
 type X<T extends C = C> = T extends keyof ConstantsToType ? ConstantsToType[T] : _X<T>;
+type Y<T extends C = C> = number | number[] | string | boolean | undefined | HTMLElement | X<T>;
 type Methods = Functions | Operators | Conversions | Swizzles | '__nodeType' | 'type' | 'props' | 'isProxy' | 'assign' | 'toVar' | 'toString' | 'element' | 'select';
 interface _X<T extends C> {
     readonly __nodeType?: T;

package/package.json

@@ -1,6 +1,6 @@
 {
         "name": "glre",
-        "version": "0.44.0",
+        "version": "0.45.0",
         "author": "tseijp",
         "license": "MIT",
         "private": false,

package/src/node/build.ts

@@ -104,6 +104,7 @@ export const fragment = (x: X, c: NodeContext = {}) => {
 export const vertex = (x: X, c: NodeContext = {}) => {
         c.code?.headers?.clear()
         c.label = 'vert' // for varying inputs or outputs
+        if (c.code) for (const [id, { node }] of c.code.vertVaryings.entries()) c.code.vertVaryings.set(id, { node, code: code(node, c) }) // ① prebuild varying.code because the scope (e.g. output function definitions) is fixed to vertex.
         const [head, lines, ret] = build(x, c)
         const result = []
         if (c.isWebGL) {
@@ -114,7 +115,7 @@ export const vertex = (x: X, c: NodeContext = {}) => {
                 result.push('void main() {')
                 result.push(`  ${lines}`)
                 result.push(`  gl_Position = ${ret};`)
-                for (const [id, code] of c.code?.vertVaryings?.entries() || []) result.push(`  ${id} = ${code};`)
+                if (c.code) for (const [id, varying] of c.code.vertVaryings.entries()) result.push(`  ${id} = ${varying.code!};`) // ② varying.code is already prebuilt
         } else {
                 if (c.code?.vertInputs?.size) result.push(generateStruct('In', c.code.vertInputs))
                 if (c.code?.vertOutputs?.size) result.push(generateStruct('Out', c.code.vertOutputs))
@@ -124,7 +125,7 @@ export const vertex = (x: X, c: NodeContext = {}) => {
                 result.push('  var out: Out;')
                 result.push(`  ${lines}`)
                 result.push(`  out.position = ${ret};`)
-                for (const [id, code] of c.code?.vertVaryings?.entries() || []) result.push(`  out.${id} = ${code};`)
+                if (c.code) for (const [id, varying] of c.code.vertVaryings.entries()) result.push(`  out.${id} = ${varying.code!};`)
                 result.push('  return out;')
         }
         result.push('}')

package/src/node/types.ts

@@ -90,7 +90,7 @@ export interface NodeContext {
                 fragInputs: Map<string, string>
                 vertInputs: Map<string, string>
                 vertOutputs: Map<string, string>
-                vertVaryings: Map<string, string>
+                vertVaryings: Map<string, VaryingInfo>
                 computeInputs: Map<string, string>
                 dependencies: Map<string, Set<string>>
                 structStructFields: Map<string, StructFields>
@@ -202,6 +202,12 @@ export type Mat4 = XImpl<'mat4'>
 export type Texture = XImpl<'texture'>
 export type Sampler2D = XImpl<'sampler2D'>
 export type StructBase = XImpl<'struct'>
+
+export interface VaryingInfo {
+        node: Y
+        code?: string
+}
+
 export type Struct<T extends StructFields = any> = Omit<StructBase, keyof T> & {
         [K in keyof T]: T[K] extends X<infer U> ? X<U> : never
 } & {

package/src/node/utils/index.ts

@@ -1,23 +1,6 @@
 import { infer } from './infer'
-import {
-        parseArray,
-        parseAttribHead,
-        parseConstantHead,
-        parseDeclare,
-        parseDefine,
-        parseGather,
-        parseIf,
-        parseLoop,
-        parseScatter,
-        parseStorageHead,
-        parseStruct,
-        parseStructHead,
-        parseSwitch,
-        parseTexture,
-        parseUniformHead,
-        parseVaryingHead,
-} from './parse'
-import { getBluiltin, getConversions, getOperator, initNodeContext, isElement, isX, setupEvent } from './utils'
+import { parseArray, parseAttribHead, parseConstantHead, parseDeclare, parseDefine, parseGather, parseIf, parseLoop, parseScatter, parseStorageHead, parseStruct, parseStructHead, parseSwitch, parseTexture, parseUniformHead, parseVaryingHead } from './parse'
+import { getBluiltin, getConversions, getOperator, initNodeContext, isX, setupEvent } from './utils'
 import { is } from '../../utils/helpers'
 import { mod } from '..'
 import type { Constants as C, NodeContext, Y } from '../types'
@@ -58,10 +41,7 @@ export const code = <T extends C>(target: Y<T>, c?: NodeContext | null): string
                         ? parseScatter(c, storageNode, y) // indexNode is not using
                         : `${code(storageNode, c)}[${code(indexNode, c)}] = ${code(y, c)};`
         }
-        if (type === 'ternary')
-                return c.isWebGL
-                        ? `(${code(z, c)} ? ${code(x, c)} : ${code(y, c)})`
-                        : `select(${code(x, c)}, ${code(y, c)}, ${code(z, c)})`
+        if (type === 'ternary') return c.isWebGL ? `(${code(z, c)} ? ${code(x, c)} : ${code(y, c)})` : `select(${code(x, c)}, ${code(y, c)}, ${code(z, c)})`
         if (type === 'conversion') return `${getConversions(x, c)}(${parseArray(children.slice(1), c)})`
         if (type === 'operator') {
                 if (x === 'not' || x === 'bitNot') return `!${code(y, c)}`
@@ -110,7 +90,7 @@ export const code = <T extends C>(target: Y<T>, c?: NodeContext | null): string
                 const field = parseVaryingHead(c, id, infer(target, c))
                 c.code?.fragInputs.set(id, field)
                 c.code?.vertOutputs.set(id, field)
-                c.code?.vertVaryings.set(id, code(x, c))
+                c.code?.vertVaryings.set(id, { node: x })
                 return c.isWebGL ? `${id}` : `out.${id}`
         }
         if (type === 'builtin') {

package/src/node/utils/utils.ts

@@ -1,14 +1,6 @@
-import {
-        CONSTANTS,
-        CONVERSIONS,
-        FUNCTIONS,
-        OPERATOR_KEYS,
-        OPERATORS,
-        TYPE_MAPPING,
-        WGSL_TO_GLSL_BUILTIN,
-} from './const'
+import { CONSTANTS, CONVERSIONS, FUNCTIONS, OPERATOR_KEYS, OPERATORS, TYPE_MAPPING, WGSL_TO_GLSL_BUILTIN } from './const'
 import { is } from '../../utils/helpers'
-import type { Constants as C, Conversions, Functions, NodeContext, Operators, Swizzles, X, Y } from '../types'
+import type { Constants as C, Conversions, Functions, NodeContext, Operators, Swizzles, VaryingInfo, X, Y } from '../types'
 import { storageSize } from '../../utils/program'
 
 export const isSwizzle = (key: unknown): key is Swizzles => {