upload property from asset

cocos/asset/assets/effect-asset.ts

@@ -34,6 +34,7 @@ import { Asset } from './asset';
 import { cclegacy, warnID } from '../../core';
 import { ProgramLibrary } from '../../rendering/custom/private';
 import { addEffectDefaultProperties, getCombinationDefines } from '../../render-scene/core/program-utils';
+import { MaterialPropertyFull } from './material';
 
 export declare namespace EffectAsset {
     export interface IPropertyInfo {
@@ -324,6 +325,9 @@ export class EffectAsset extends Asset {
     @editorOnly
     public hideInEditor = false;
 
+    @serializable
+    public props: Record<string, MaterialPropertyFull | MaterialPropertyFull[]>[] = [];
+
     /**
      * @en The loaded callback which should be invoked by the [[AssetManager]], will automatically register the effect.
      * @zh 通过 [[AssetManager]] 加载完成时的回调，将自动注册 effect 资源。

cocos/asset/assets/material.ts

@@ -250,7 +250,7 @@
      * @param passIdx @en The pass to apply to. Will apply to all passes if not specified. @zh 要重编的 pass 索引，如果没有指定，则重编所有 pass。
      */
     public recompileShaders (overrides: MacroRecord, passIdx?: number): void {
         console.warn(`Shaders in material asset '${this.name}' cannot be modified at runtime, please instantiate the material first.`);
     }
 
     /**
@@ -260,7 +260,7 @@
      * @param passIdx The pass to apply to. Will apply to all passes if not specified.
      */
     public overridePipelineStates (overrides: PassOverrides, passIdx?: number): void {
         console.warn(`Pipeline states in material asset '${this.name}' cannot be modified at runtime, please instantiate the material first.`);
     }
 
     /**
@@ -312,7 +312,7 @@
                 }
             }
         } else {
             if (passIdx >= this._passes.length) { console.warn(`illegal pass index: ${passIdx}.`); return; }
             const pass = this._passes[passIdx];
             if (this._uploadProperty(pass, name, val)) {
                 this._props[pass.propertyIndex][name] = val;
@@ -320,7 +320,7 @@
             }
         }
         if (!success) {
             console.warn(`illegal property name: ${name}.`);
         }
     }
 
@@ -348,7 +348,7 @@
                 if (name in props) { return props[name]; }
             }
         } else {
             if (passIdx >= this._passes.length) { console.warn(`illegal pass index: ${passIdx}.`); return null; }
             const props = this._props[this._passes[passIdx].propertyIndex];
             if (name in props) { return props[name]; }
         }
@@ -428,7 +428,7 @@
                 Object.assign(defines, passInfo.embeddedMacros);
             }
             if (passInfo.switch && !defines[passInfo.switch]) { continue; }
             const pass = new Pass(cclegacy.director.root);
             pass.initialize(passInfo);
             passes.push(pass);
         }
@@ -448,8 +448,9 @@
                 this._passes.forEach((pass, i): void => {
                     let props = this._props[i];
                     if (!props) { props = this._props[i] = {}; }
+                    Object.assign(props, this._effectAsset!.props[i]);
                     if (pass.propertyIndex !== undefined) {
-                        Object.assign(props, this._props[pass.propertyIndex]);
+                        Object.assign(props, this._props[pass.propertyIndex], this._effectAsset!.props[pass.propertyIndex]);
                     }
                     for (const p in props) {
                         this._uploadProperty(pass, p, props[p]);
@@ -469,7 +470,7 @@
         const handle = pass.getHandle(name);
         if (!handle) { return false; }
         const type = Pass.getTypeFromHandle(handle);
         if (type < Type.SAMPLER1D) {
             if (Array.isArray(val)) {
                 pass.setUniformArray(handle, val as MaterialProperty[]);
             } else if (val !== null) {

cocos/render-scene/core/pass.ts

@@ -434,6 +434,7 @@ export class Pass {
         const value = info && info.value;
         const texName = value ? `${value as string}${getStringFromType(type)}` : getDefaultFromType(type) as string;
         const textureBase = builtinResMgr.get<TextureBase>(texName);
+        if (!textureBase) return;
         const texture = textureBase && textureBase.getGFXTexture()!;
         const samplerInfo = info && info.samplerHash !== undefined
             ? Sampler.unpackFromHash(info.samplerHash) : textureBase && textureBase.getSamplerInfo();