@forgeax/engine-shader 0.1.25 → 0.1.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgeax/engine-shader",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "private": false,
   "type": "module",
   "license": "Apache-2.0",
@@ -22,12 +22,12 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@forgeax/engine-rhi": "0.1.25",
-    "@forgeax/engine-types": "0.1.25",
+    "@forgeax/engine-rhi": "0.1.26",
+    "@forgeax/engine-types": "0.1.26",
     "@webgpu/types": "^0.1.71"
   },
   "devDependencies": {
-    "@forgeax/engine-vite-plugin-shader": "0.1.25"
+    "@forgeax/engine-vite-plugin-shader": "0.1.26"
   },
   "forgeax": {
     "metrics": {

package/src/__tests__/material-builtins.unit.test.ts

@@ -77,15 +77,15 @@ describe('built-in MaterialAsset sources', () => {
   ] as const)('keeps the Standard user-region ABI before Skylight in %s', (file) => {
     const text = source(file);
     const bindings = [
-      'baseColorSampler',
+      'baseColorTexture_sampler',
       'baseColorTexture',
-      'metallicRoughnessSampler',
+      'metallicRoughnessTexture_sampler',
       'metallicRoughnessTexture',
-      'normalSampler',
+      'normalTexture_sampler',
       'normalTexture',
-      'emissiveSampler',
+      'emissiveTexture_sampler',
       'emissiveTexture',
-      'occlusionSampler',
+      'occlusionTexture_sampler',
       'occlusionTexture',
       'transmissionSampler',
       'transmissionTexture',
@@ -95,7 +95,7 @@ describe('built-in MaterialAsset sources', () => {
     ];
     let previous = -1;
     for (const name of bindings) {
-      const index = text.indexOf(`var ${name}`);
+      const index = new RegExp(`\\bvar\\s+${name}\\s*:`).exec(text)?.index ?? -1;
       expect(index, `${file} must declare ${name}`).toBeGreaterThan(previous);
       previous = index;
     }

package/src/default-standard-pbr-skin.wgsl

@@ -67,11 +67,11 @@ fn composeProbeDiffuse(
 //
 //   @group(0) @binding(0) view                       uniform   (see common.wgsl)
 //   @group(1) @binding(0) material                   uniform
-//   @group(1) @binding(1) baseColorSampler           sampler
+//   @group(1) @binding(1) baseColorTexture_sampler           sampler
 //   @group(1) @binding(2) baseColorTexture           texture_2d<f32>
-//   @group(1) @binding(3) metallicRoughnessSampler   sampler
+//   @group(1) @binding(3) metallicRoughnessTexture_sampler   sampler
 //   @group(1) @binding(4) metallicRoughnessTexture   texture_2d<f32>
-//   @group(1) @binding(5) normalSampler              sampler
+//   @group(1) @binding(5) normalTexture_sampler              sampler
 //   @group(1) @binding(6) normalTexture              texture_2d<f32>
 //   @group(1) @binding(9..15) Skylight (irradiance / prefilter / brdfLut +
 //                              samplers) + skylight uniform (intensity)
@@ -106,15 +106,15 @@ fn composeProbeDiffuse(
 // from the root ParamSchema during material composition. Keeping the ABI out
 // of this template prevents a second handwritten interface from drifting from
 // the runtime UBO writer.
-@group(1) @binding(1) var baseColorSampler : sampler;
+@group(1) @binding(1) var baseColorTexture_sampler : sampler;
 @group(1) @binding(2) var baseColorTexture : texture_2d<f32>;
-@group(1) @binding(3) var metallicRoughnessSampler : sampler;
+@group(1) @binding(3) var metallicRoughnessTexture_sampler : sampler;
 @group(1) @binding(4) var metallicRoughnessTexture : texture_2d<f32>;
-@group(1) @binding(5) var normalSampler : sampler;
+@group(1) @binding(5) var normalTexture_sampler : sampler;
 @group(1) @binding(6) var normalTexture : texture_2d<f32>;
-@group(1) @binding(9) var emissiveSampler : sampler;
+@group(1) @binding(9) var emissiveTexture_sampler : sampler;
 @group(1) @binding(10) var emissiveTexture : texture_2d<f32>;
-@group(1) @binding(11) var occlusionSampler : sampler;
+@group(1) @binding(11) var occlusionTexture_sampler : sampler;
 @group(1) @binding(12) var occlusionTexture : texture_2d<f32>;
 #ifdef TRANSMISSION_AVAILABLE
 @group(1) @binding(13) var transmissionSampler : sampler;
@@ -185,11 +185,11 @@ fn materialTextureFilteringWitness() {
   let transmission = transmissionTexture;
   let thickness = thicknessTexture;
 #endif
-  let baseWitness = textureSample(base, baseColorSampler, vec2<f32>(0.0));
-  let metallicRoughnessWitness = textureSample(metallicRoughness, metallicRoughnessSampler, vec2<f32>(0.0));
-  let normalWitness = textureSample(normal, normalSampler, vec2<f32>(0.0));
-  let emissiveWitness = textureSample(emissive, emissiveSampler, vec2<f32>(0.0));
-  let occlusionWitness = textureSample(occlusion, occlusionSampler, vec2<f32>(0.0));
+  let baseWitness = textureSample(base, baseColorTexture_sampler, vec2<f32>(0.0));
+  let metallicRoughnessWitness = textureSample(metallicRoughness, metallicRoughnessTexture_sampler, vec2<f32>(0.0));
+  let normalWitness = textureSample(normal, normalTexture_sampler, vec2<f32>(0.0));
+  let emissiveWitness = textureSample(emissive, emissiveTexture_sampler, vec2<f32>(0.0));
+  let occlusionWitness = textureSample(occlusion, occlusionTexture_sampler, vec2<f32>(0.0));
 #ifdef CLEARCOAT_TEXTURE_AVAILABLE
   let clearcoatWitness = textureSample(clearcoat, clearcoatSampler, vec2<f32>(0.0));
 #endif
@@ -1054,7 +1054,7 @@ fn fs_temporal(in : TemporalVsOut) -> @location(0) vec4<f32> {
     material.baseColor.a * temporalVertexAlpha(in),
     material.alphaCutoff,
     baseColorTexture,
-    baseColorSampler,
+    baseColorTexture_sampler,
     material.baseColorTextureCoordinatesTransform,
     material.baseColorTextureCoordinatesMetadata,
     in.currentClip,

package/src/default-standard-pbr.wgsl

@@ -83,11 +83,11 @@ fn reflection_probe_sampling_contract(
 //                                                               + 4 channel selectors f32
 //                                                               + emissive vec3 + emissiveIntensity
 //                                                               + uv/alpha/specularColor = 104 B)
-//   @group(1) @binding(1) baseColorSampler           sampler
+//   @group(1) @binding(1) baseColorTexture_sampler           sampler
 //   @group(1) @binding(2) baseColorTexture           texture_2d<f32>
-//   @group(1) @binding(3) metallicRoughnessSampler   sampler
+//   @group(1) @binding(3) metallicRoughnessTexture_sampler   sampler
 //   @group(1) @binding(4) metallicRoughnessTexture   texture_2d<f32>
-//   @group(1) @binding(5) normalSampler              sampler
+//   @group(1) @binding(5) normalTexture_sampler              sampler
 //   @group(1) @binding(6) normalTexture              texture_2d<f32>
 //   @group(1) @binding(9..15) Skylight (irradiance / prefilter / brdfLut +
 //                              samplers) + skylight uniform (intensity)
@@ -132,15 +132,15 @@ fn reflection_probe_sampling_contract(
 // from the root ParamSchema during composition. Keeping the ABI out of this
 // template prevents a second handwritten interface from drifting from the
 // runtime UBO writer.
-@group(1) @binding(1) var baseColorSampler : sampler;
+@group(1) @binding(1) var baseColorTexture_sampler : sampler;
 @group(1) @binding(2) var baseColorTexture : texture_2d<f32>;
-@group(1) @binding(3) var metallicRoughnessSampler : sampler;
+@group(1) @binding(3) var metallicRoughnessTexture_sampler : sampler;
 @group(1) @binding(4) var metallicRoughnessTexture : texture_2d<f32>;
-@group(1) @binding(5) var normalSampler : sampler;
+@group(1) @binding(5) var normalTexture_sampler : sampler;
 @group(1) @binding(6) var normalTexture : texture_2d<f32>;
-@group(1) @binding(9) var emissiveSampler : sampler;
+@group(1) @binding(9) var emissiveTexture_sampler : sampler;
 @group(1) @binding(10) var emissiveTexture : texture_2d<f32>;
-@group(1) @binding(11) var occlusionSampler : sampler;
+@group(1) @binding(11) var occlusionTexture_sampler : sampler;
 @group(1) @binding(12) var occlusionTexture : texture_2d<f32>;
 #ifdef TRANSMISSION_AVAILABLE
 @group(1) @binding(13) var transmissionSampler : sampler;
@@ -209,11 +209,11 @@ fn materialTextureFilteringWitness() {
 #ifdef CLEARCOAT_NORMAL_TEXTURE_AVAILABLE
   let clearcoatNormal = clearcoatNormalTexture;
 #endif
-  let baseWitness = textureSample(base, baseColorSampler, vec2<f32>(0.0));
-  let metallicRoughnessWitness = textureSample(metallicRoughness, metallicRoughnessSampler, vec2<f32>(0.0));
-  let normalWitness = textureSample(normal, normalSampler, vec2<f32>(0.0));
-  let emissiveWitness = textureSample(emissive, emissiveSampler, vec2<f32>(0.0));
-  let occlusionWitness = textureSample(occlusion, occlusionSampler, vec2<f32>(0.0));
+  let baseWitness = textureSample(base, baseColorTexture_sampler, vec2<f32>(0.0));
+  let metallicRoughnessWitness = textureSample(metallicRoughness, metallicRoughnessTexture_sampler, vec2<f32>(0.0));
+  let normalWitness = textureSample(normal, normalTexture_sampler, vec2<f32>(0.0));
+  let emissiveWitness = textureSample(emissive, emissiveTexture_sampler, vec2<f32>(0.0));
+  let occlusionWitness = textureSample(occlusion, occlusionTexture_sampler, vec2<f32>(0.0));
 #ifdef CLEARCOAT_TEXTURE_AVAILABLE
   let clearcoatWitness = textureSample(clearcoat, clearcoatSampler, vec2<f32>(0.0));
 #endif
@@ -1263,7 +1263,7 @@ fn fs_temporal(in : TemporalVsOut) -> @location(0) vec4<f32> {
     material.baseColor.a * temporalVertexAlpha(in),
     material.alphaCutoff,
     baseColorTexture,
-    baseColorSampler,
+    baseColorTexture_sampler,
     material.baseColorTextureCoordinatesTransform,
     material.baseColorTextureCoordinatesMetadata,
     in.currentClip,

package/src/default_standard_surface.wgsl

@@ -34,27 +34,27 @@ fn surfaceNormal(input : SurfaceInput, encoded : vec4<f32>, normalScale : f32) -
 fn evaluate_surface(input : SurfaceInput) -> SurfaceData {
   let baseSample = textureSample(
     baseColorTexture,
-    baseColorSampler,
+    baseColorTexture_sampler,
     surfaceUv(input, material.baseColorTextureCoordinatesTransform, material.baseColorTextureCoordinatesMetadata) * material.baseColorTextureCoordinatesMetadata.zw,
   );
   let metallicRoughnessSample = textureSample(
     metallicRoughnessTexture,
-    metallicRoughnessSampler,
+    metallicRoughnessTexture_sampler,
     surfaceUv(input, material.metallicRoughnessTextureCoordinatesTransform, material.metallicRoughnessTextureCoordinatesMetadata) * material.metallicRoughnessTextureCoordinatesMetadata.zw,
   );
   let normalSample = textureSample(
     normalTexture,
-    normalSampler,
+    normalTexture_sampler,
     surfaceUv(input, material.normalTextureCoordinatesTransform, material.normalTextureCoordinatesMetadata) * material.normalTextureCoordinatesMetadata.zw,
   );
   let emissiveSample = textureSample(
     emissiveTexture,
-    emissiveSampler,
+    emissiveTexture_sampler,
     surfaceUv(input, material.emissiveTextureCoordinatesTransform, material.emissiveTextureCoordinatesMetadata) * material.emissiveTextureCoordinatesMetadata.zw,
   );
   let occlusionSample = textureSample(
     occlusionTexture,
-    occlusionSampler,
+    occlusionTexture_sampler,
     surfaceUv(input, material.occlusionTextureCoordinatesTransform, material.occlusionTextureCoordinatesMetadata) * material.occlusionTextureCoordinatesMetadata.zw,
   );
   let vertexColor = input.vertexColor;

package/src/index.ts

@@ -23,6 +23,7 @@
 export type { ManifestEntry, ParamSchemaEntry } from '@forgeax/engine-types';
 
 import type { MaterialAsset, MaterialParameter, MaterialValue } from '@forgeax/engine-types';
+import { standardSurfaceParameters } from '@forgeax/engine-types';
 import { STANDARD_PBR_ALPHA_CUTOFF_DEFAULT } from './material-schemas.js';
 
 export { MATERIAL_PARAM_TYPES } from '@forgeax/engine-types';
@@ -204,7 +205,10 @@ export function createBuiltinMaterialAsset(kind: BuiltinMaterialKind): MaterialA
         },
       },
     ],
-    parameters: BUILTIN_PARAMETERS[kind],
+    parameters:
+      kind === 'standard'
+        ? standardSurfaceParameters(BUILTIN_PARAMETERS[kind])
+        : BUILTIN_PARAMETERS[kind],
     values: BUILTIN_VALUES[kind],
   };
 }

package/src/opaque_surface.wgsl

@@ -0,0 +1,9 @@
+#define_import_path forgeax_material::opaque_surface
+#import forgeax_material::surface_v1::{SurfaceInput, SurfaceData}
+
+// The default depth coverage requires no material values or lighting model.
+// Cutout materials select their shared Surface explicitly on every Pass.
+fn evaluate_surface(input: SurfaceInput) -> SurfaceData {
+  return SurfaceData(vec3<f32>(1.0), input.geometricNormalWS, 0.0, 1.0,
+    vec3<f32>(0.0), 1.0, 1.0, 0.0);
+}