mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
setProperty accept sprite frame now (#5318)
This commit is contained in:
committed by
Weiliang Wang
parent
fcd7855a53
commit
627a08e6ec
@@ -38,6 +38,7 @@ import { IDefineMap, Pass, PassOverrides } from '../renderer/core/pass';
|
||||
import { samplerLib } from '../renderer/core/sampler-lib';
|
||||
import { Asset } from './asset';
|
||||
import { EffectAsset } from './effect-asset';
|
||||
import { SpriteFrame } from './sprite-frame';
|
||||
import { TextureBase } from './texture-base';
|
||||
|
||||
/**
|
||||
@@ -404,14 +405,16 @@ export class Material extends Asset {
|
||||
const binding = Pass.getBindingFromHandle(handle);
|
||||
if (val instanceof GFXTextureView) {
|
||||
pass.bindTextureView(binding, val);
|
||||
} else if (val instanceof TextureBase) {
|
||||
} else if (val instanceof TextureBase || val instanceof SpriteFrame) {
|
||||
const textureView: GFXTextureView | null = val.getGFXTextureView();
|
||||
if (!textureView || !textureView.texture.width || !textureView.texture.height) {
|
||||
// console.warn(`material '${this._uuid}' received incomplete texture asset '${val._uuid}'`);
|
||||
return false;
|
||||
}
|
||||
pass.bindTextureView(binding, textureView);
|
||||
pass.bindSampler(binding, samplerLib.getSampler(cc.game._gfxDevice, val.getSamplerHash()));
|
||||
if (val instanceof TextureBase) {
|
||||
pass.bindSampler(binding, samplerLib.getSampler(cc.game._gfxDevice, val.getSamplerHash()));
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -17,7 +17,7 @@ import { GFXShader } from './shader';
|
||||
import { GFXTexture } from './texture';
|
||||
import { GFXTextureView } from './texture-view';
|
||||
|
||||
export { GFXAttributeName, GFXFormat, GFXPrimitiveMode } from './define';
|
||||
export * from './define';
|
||||
|
||||
cc.GFXDevice = GFXDevice;
|
||||
cc.GFXBuffer = GFXBuffer;
|
||||
|
||||
Reference in New Issue
Block a user