setProperty accept sprite frame now (#5318)

This commit is contained in:
Yun Hsiao Wu
2019-09-03 13:36:45 +08:00
committed by Weiliang Wang
parent fcd7855a53
commit 627a08e6ec
2 changed files with 6 additions and 3 deletions
+5 -2
View File
@@ -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;
+1 -1
View File
@@ -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;