From 627a08e6ec8fb83f6bc73cf0d8dfb9fda7fa594e Mon Sep 17 00:00:00 2001 From: Yun Hsiao Wu Date: Tue, 3 Sep 2019 13:36:45 +0800 Subject: [PATCH] setProperty accept sprite frame now (#5318) --- cocos/core/assets/material.ts | 7 +++++-- cocos/core/gfx/index.ts | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cocos/core/assets/material.ts b/cocos/core/assets/material.ts index 9baa71c943..b1090c302c 100644 --- a/cocos/core/assets/material.ts +++ b/cocos/core/assets/material.ts @@ -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; diff --git a/cocos/core/gfx/index.ts b/cocos/core/gfx/index.ts index 84d43290e9..f10b0ed0b5 100644 --- a/cocos/core/gfx/index.ts +++ b/cocos/core/gfx/index.ts @@ -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;