@forgeax/engine-pack 0.1.33 → 0.1.35

package/src/evidence/material-cook.ts

@@ -4,6 +4,7 @@ import type {
   MaterialPass,
   MaterialProgramAbi,
   MaterialProgramAddress,
+  MaterialSurfaceDeclaration,
   MaterialTextureReference,
   MaterialTextureValue,
   MaterialValue,
@@ -13,6 +14,7 @@ import {
   deriveStandardLayerPlan,
   err,
   isMaterialProgramAbi,
+  isMaterialSurfaceDeclaration,
   MATERIAL_TEXTURE_SLOTS,
   ok,
 } from '@forgeax/engine-types';
@@ -120,6 +122,7 @@ export interface CookedMaterialRecord {
     readonly passes: readonly MaterialPass[];
     readonly parameters: readonly MaterialParameter[];
     readonly values: Readonly<Record<string, MaterialValue | null>>;
+    readonly surface?: MaterialSurfaceDeclaration;
   };
   readonly refs: MaterialCookRefs;
   readonly receipt: MaterialCookReceipt;
@@ -231,7 +234,10 @@ export function collectMaterialCookRefs(material: Partial<MaterialAsset>): Mater
         return guid === undefined ? [] : [guid];
       }),
     ),
-    modules: unique((material.passes ?? []).map((pass) => pass.program.module)),
+    modules: unique([
+      ...(material.passes ?? []).map((pass) => pass.program.module),
+      ...(material.surface === undefined ? [] : [material.surface.module]),
+    ]),
   };
 }
 
@@ -476,6 +482,8 @@ export function validateCookedMaterialRecord(
     Array.isArray(resolved.values)
   )
     return invalid('resolved.values', resolved.values);
+  if (resolved.surface !== undefined && !isMaterialSurfaceDeclaration(resolved.surface))
+    return invalid('resolved.surface', resolved.surface);
   const passes = resolved.passes as MaterialPass[];
   const passNames = new Set<string>();
   for (const [index, pass] of passes.entries()) {

package/src/pack-authoring.ts

@@ -256,8 +256,10 @@ function parameterValueError(
   propertyPath: string,
 ): PackAuthoringError | undefined {
   const { type } = parameter;
-  if (type === 'bool' && typeof value !== 'boolean') {
-    return parameterFailure(propertyPath, 'a boolean', value, 'bool value has the wrong type');
+  if (type === 'bool') {
+    return typeof value === 'boolean'
+      ? undefined
+      : parameterFailure(propertyPath, 'a boolean', value, 'bool value has the wrong type');
   }
   if (numericType(type)) {
     if (typeof value !== 'number' || !Number.isFinite(value)) {
@@ -318,8 +320,10 @@ function parameterValueError(
     }
     return undefined;
   }
-  if (type === 'string' && typeof value !== 'string') {
-    return parameterFailure(propertyPath, 'a string', value, 'string parameter has the wrong type');
+  if (type === 'string') {
+    return typeof value === 'string'
+      ? undefined
+      : parameterFailure(propertyPath, 'a string', value, 'string parameter has the wrong type');
   }
   if (type === 'enum') {
     if (typeof value !== 'string') {

package/src/schema/material-cook.schema.json

@@ -52,7 +52,80 @@
     },
     "resolved": {
       "type": "object",
-      "required": ["passes", "parameters", "values"]
+      "required": ["passes", "parameters", "values"],
+      "properties": {
+        "surface": {
+          "type": "object",
+          "required": ["model", "module"],
+          "properties": {
+            "model": {
+              "enum": ["standard", "single-layer-medium"]
+            },
+            "module": {
+              "type": "string",
+              "minLength": 1
+            },
+            "dynamicInput": {
+              "type": "object",
+              "required": [
+                "name",
+                "fields",
+                "maxRecords",
+                "maxDomains",
+                "maxPageBytes",
+                "maxBindings",
+                "maxEventsPerSample"
+              ],
+              "properties": {
+                "name": {
+                  "type": "string",
+                  "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+                },
+                "fields": {
+                  "type": "array",
+                  "minItems": 1,
+                  "items": {
+                    "type": "object",
+                    "required": ["name", "type"],
+                    "properties": {
+                      "name": {
+                        "type": "string",
+                        "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+                      },
+                      "type": {
+                        "enum": ["f32", "u32", "vec2<f32>", "vec3<f32>", "vec4<f32>"]
+                      }
+                    },
+                    "additionalProperties": false
+                  }
+                },
+                "maxRecords": {
+                  "type": "integer",
+                  "minimum": 1
+                },
+                "maxDomains": {
+                  "type": "integer",
+                  "minimum": 1
+                },
+                "maxPageBytes": {
+                  "type": "integer",
+                  "minimum": 1
+                },
+                "maxBindings": {
+                  "type": "integer",
+                  "minimum": 1
+                },
+                "maxEventsPerSample": {
+                  "type": "integer",
+                  "minimum": 1
+                }
+              },
+              "additionalProperties": false
+            }
+          },
+          "additionalProperties": false
+        }
+      }
     },
     "refs": {
       "type": "object",