浏览代码

Merge remote-tracking branch 'upstream/master' into text_edit

/main
fzhangtj 6 年前
当前提交
8af7812a
共有 3 个文件被更改,包括 26 次插入8 次删除
  1. 12
      Runtime/ui/painting/canvas_impl.cs
  2. 11
      Runtime/service/raw_keyboard.cs.meta
  3. 11
      Runtime/ui/painting/shadow_utils.cs.meta

12
Runtime/ui/painting/canvas_impl.cs


void _drawLayer(RenderLayer layer, CommandBuffer cmdBuf) {
if (layer.rtID == 0) {
cmdBuf.SetRenderTarget(this._renderTexture,
RenderBufferLoadAction.DontCare, RenderBufferStoreAction.Store);
cmdBuf.SetRenderTarget(this._renderTexture);
cmdBuf.SetRenderTarget(layer.rtID,
RenderBufferLoadAction.DontCare, RenderBufferStoreAction.Store);
cmdBuf.SetRenderTarget(layer.rtID);
cmdBuf.ClearRenderTarget(true, true, UnityEngine.Color.clear);
}

this._drawLayer(subLayer, cmdBuf);
if (layer.rtID == 0) {
cmdBuf.SetRenderTarget(this._renderTexture,
RenderBufferLoadAction.DontCare, RenderBufferStoreAction.Store);
cmdBuf.SetRenderTarget(this._renderTexture);
cmdBuf.SetRenderTarget(layer.rtID,
RenderBufferLoadAction.DontCare, RenderBufferStoreAction.Store);
cmdBuf.SetRenderTarget(layer.rtID);
}
break;

11
Runtime/service/raw_keyboard.cs.meta


fileFormatVersion: 2
guid: fc9a7ef33f48340668115ce929a615fc
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

11
Runtime/ui/painting/shadow_utils.cs.meta


fileFormatVersion: 2
guid: 338c221d7146d4ac3b3a21c2f7474fee
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存