Skip to content
This repository was archived by the owner on Apr 29, 2021. It is now read-only.

Commit e0994be

Browse files
committed
Merge branch 'master' of github.com:UnityTech/UIWidgets into allocator2 (CONT.)
# Conflicts: # Runtime/ui/painting/canvas_impl.cs
1 parent c18e943 commit e0994be

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Runtime/ui/renderer/allocator/uipath_cache_manager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace Unity.UIWidgets.ui {
44
public static class uiPathCacheManager {
5-
static Dictionary<uint, uiPath> cache = new Dictionary<uint, uiPath>(256);
5+
static readonly Dictionary<uint, uiPath> cache = new Dictionary<uint, uiPath>(256);
66

77
//remove unused cache items every 1 frame
8-
static Dictionary<uint, bool> touched = new Dictionary<uint, bool>(256);
8+
static readonly Dictionary<uint, bool> touched = new Dictionary<uint, bool>(256);
99

1010
static float curFrame;
1111

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ internal class RenderLayer : PoolObject {
88
public int rtID;
99
public int width;
1010
public int height;
11-
public FilterMode filterMode = FilterMode.Point;
11+
public FilterMode filterMode = FilterMode.Bilinear;
1212
public bool noMSAA = false;
1313
public uiRect layerBounds;
1414
public uiPaint? layerPaint;
@@ -38,7 +38,7 @@ public Vector4 viewport {
3838
}
3939

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

Runtime/ui/renderer/common/paint.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static uiImageFilter blur(float sigmaX = 0.0f, float sigmaY = 0.0f) {
3737
return new _uiBlurImageFilter(sigmaX, sigmaY);
3838
}
3939

40-
public static uiImageFilter matrix(uiMatrix3 transform, FilterMode filterMode = FilterMode.Point) {
40+
public static uiImageFilter matrix(uiMatrix3 transform, FilterMode filterMode = FilterMode.Bilinear) {
4141
return new _uiMatrixImageFilter(transform, filterMode);
4242
}
4343
}
@@ -87,7 +87,7 @@ public uiPaint(
8787
StrokeCap strokeCap = StrokeCap.butt,
8888
StrokeJoin strokeJoin = StrokeJoin.miter,
8989
float strokeMiterLimit = 4.0f,
90-
FilterMode filterMode = FilterMode.Point,
90+
FilterMode filterMode = FilterMode.Bilinear,
9191
uiColorFilter? colorFilter = null,
9292
uiMaskFilter? maskFilter = null,
9393
uiImageFilter backdrop = null,

0 commit comments

Comments
 (0)