浏览代码

Merge branch 'master' of github.com:UnityTech/UIWidgets into allocator2 (CONT.)

# Conflicts:
#	Runtime/ui/painting/canvas_impl.cs
/main
xingwei.zhu 5 年前
当前提交
f65a9049
共有 3 个文件被更改,包括 6 次插入6 次删除
  1. 4
      Runtime/ui/renderer/allocator/uipath_cache_manager.cs
  2. 4
      Runtime/ui/renderer/cmdbufferCanvas/rendering/render_layer.cs
  3. 4
      Runtime/ui/renderer/common/paint.cs

4
Runtime/ui/renderer/allocator/uipath_cache_manager.cs


namespace Unity.UIWidgets.ui {
public static class uiPathCacheManager {
static Dictionary<uint, uiPath> cache = new Dictionary<uint, uiPath>(256);
static readonly Dictionary<uint, uiPath> cache = new Dictionary<uint, uiPath>(256);
static Dictionary<uint, bool> touched = new Dictionary<uint, bool>(256);
static readonly Dictionary<uint, bool> touched = new Dictionary<uint, bool>(256);
static float curFrame;

4
Runtime/ui/renderer/cmdbufferCanvas/rendering/render_layer.cs


public int rtID;
public int width;
public int height;
public FilterMode filterMode = FilterMode.Point;
public FilterMode filterMode = FilterMode.Bilinear;
public bool noMSAA = false;
public uiRect layerBounds;
public uiPaint? layerPaint;

}
public static RenderLayer create(int rtID = 0, int width = 0, int height = 0,
FilterMode filterMode = FilterMode.Point,
FilterMode filterMode = FilterMode.Bilinear,
bool noMSAA = false, uiRect? layerBounds = null, uiPaint? layerPaint = null, bool ignoreClip = true) {
D.assert(layerBounds != null);
var newLayer = ObjectPool<RenderLayer>.alloc();

4
Runtime/ui/renderer/common/paint.cs


return new _uiBlurImageFilter(sigmaX, sigmaY);
}
public static uiImageFilter matrix(uiMatrix3 transform, FilterMode filterMode = FilterMode.Point) {
public static uiImageFilter matrix(uiMatrix3 transform, FilterMode filterMode = FilterMode.Bilinear) {
return new _uiMatrixImageFilter(transform, filterMode);
}
}

StrokeCap strokeCap = StrokeCap.butt,
StrokeJoin strokeJoin = StrokeJoin.miter,
float strokeMiterLimit = 4.0f,
FilterMode filterMode = FilterMode.Point,
FilterMode filterMode = FilterMode.Bilinear,
uiColorFilter? colorFilter = null,
uiMaskFilter? maskFilter = null,
uiImageFilter backdrop = null,

正在加载...
取消
保存