fix: Extract shader layout after modules have been resolved (#2344)

Author: ibgreen

modules/engine/src/model/model.ts

@@ -252,7 +252,6 @@ export class Model {
     // TODO - this is wrong, compile a single shader
     if (isWebGPU && this.props.source) {
       // WGSL
-      this.props.shaderLayout ||= getShaderLayoutFromWGSL(this.props.source);
       const {source, getUniforms} = this.props.shaderAssembler.assembleWGSLShader({
         platformInfo,
         ...this.props,
@@ -261,6 +260,8 @@ export class Model {
       this.source = source;
       // @ts-expect-error
       this._getModuleUniforms = getUniforms;
+      // Extract shader layout after modules have been added to WGSL source, to include any bindings added by modules
+      this.props.shaderLayout ||= getShaderLayoutFromWGSL(this.source);
     } else {
       // GLSL
       const {vs, fs, getUniforms} = this.props.shaderAssembler.assembleGLSLShaderPair({