Set antiAliasing.

Yuncong Zhang · Yuncong Zhang · commit c41c5defc25d · 2019-04-03T17:03:33.000+08:00
diff --git a/Editor/UIWidgetsPanelEditor.cs b/Editor/UIWidgetsPanelEditor.cs
@@ -9,7 +9,9 @@ public class UIWidgetsPanelEditor : RawImageEditor {
         public override void OnInspectorGUI() {
             base.OnInspectorGUI();
             var pixelRatioProperty = this.serializedObject.FindProperty("devicePixelRatioOverride");
+            var antiAliasingProperty = this.serializedObject.FindProperty("antiAliasingOverride");
             EditorGUILayout.PropertyField(pixelRatioProperty);
+            EditorGUILayout.PropertyField(antiAliasingProperty);
             this.serializedObject.ApplyModifiedProperties();
         }
     }
diff --git a/Runtime/editor/editor_window.cs b/Runtime/editor/editor_window.cs
@@ -87,6 +87,10 @@ public override GUIContent titleContent {
         protected override float queryDevicePixelRatio() {
             return EditorGUIUtility.pixelsPerPoint;
         }
+        
+        protected override int queryAntiAliasing() {
+            return 4;
+        }
 
         protected override Vector2 queryWindowSize() {
             return this.editorWindow.position.size;
@@ -158,6 +162,7 @@ protected virtual void updateSafeArea() {
 
         public void OnEnable() {
             this._devicePixelRatio = this.queryDevicePixelRatio();
+            this._antiAliasing = this.queryAntiAliasing();
             var size = this.queryWindowSize();
             this._lastWindowWidth = size.x;
             this._lastWindowHeight = size.y;
@@ -281,6 +286,7 @@ public virtual GUIContent titleContent {
         }
 
         protected abstract float queryDevicePixelRatio();
+        protected abstract int queryAntiAliasing();
         protected abstract Vector2 queryWindowSize();
 
         protected virtual Surface createSurface() {
diff --git a/Runtime/editor/surface.cs b/Runtime/editor/surface.cs
@@ -203,8 +203,8 @@ public GrSurface(Size size, float devicePixelRatio, MeshPool meshPool) {
                 autoGenerateMips = false,
             };
 
-            if (QualitySettings.antiAliasing != 0) {
-                desc.msaaSamples = QualitySettings.antiAliasing;
+            if (Window.instance.antiAliasing != 0) {
+                desc.msaaSamples = Window.instance.antiAliasing;
             }
 
             this._renderTexture = new RenderTexture(desc);
diff --git a/Runtime/engine/UIWidgetsPanel.cs b/Runtime/engine/UIWidgetsPanel.cs
@@ -66,6 +66,10 @@ public override GUIContent titleContent {
         protected override float queryDevicePixelRatio() {
             return this._uiWidgetsPanel.devicePixelRatio;
         }
+        
+        protected override int queryAntiAliasing() {
+            return this._uiWidgetsPanel.antiAliasing;
+        }
 
         protected override Vector2 queryWindowSize() {
             var rect = this._uiWidgetsPanel.rectTransform.rect;
@@ -101,6 +105,7 @@ public class UIWidgetsPanel : RawImage, IPointerDownHandler, IPointerUpHandler,
         static Event _repaintEvent;
 
         [SerializeField] protected float devicePixelRatioOverride;
+        [SerializeField] protected int antiAliasingOverride = 4;
         WindowAdapter _windowAdapter;
         Texture _texture;
         Vector2 _lastMouseMove;
@@ -151,6 +156,12 @@ public float devicePixelRatio {
                     : this._displayMetrics.devicePixelRatio;
             }
         }
+        
+        public int antiAliasing {
+            get {
+                return this.antiAliasingOverride >= 0 ? this.antiAliasingOverride : 4;
+            }
+        }
 
         protected override void OnDisable() {
             D.assert(this._windowAdapter != null);
diff --git a/Runtime/flow/raster_cache.cs b/Runtime/flow/raster_cache.cs
@@ -224,8 +224,8 @@ RasterCacheResult _rasterizePicture(Picture picture, Matrix3 transform, float de
                 autoGenerateMips = false,
             };
 
-            if (QualitySettings.antiAliasing != 0) {
-                desc.msaaSamples = QualitySettings.antiAliasing;
+            if (Window.instance.antiAliasing != 0) {
+                desc.msaaSamples = Window.instance.antiAliasing;
             }
 
             var renderTexture = new RenderTexture(desc);
diff --git a/Runtime/ui/painting/canvas_impl.cs b/Runtime/ui/painting/canvas_impl.cs
@@ -783,8 +783,8 @@ void _drawLayer(RenderLayer layer, CommandBuffer cmdBuf) {
                             autoGenerateMips = false,
                         };
                 
-                        if (QualitySettings.antiAliasing != 0) {
-                            desc.msaaSamples = QualitySettings.antiAliasing;
+                        if (Window.instance.antiAliasing != 0) {
+                            desc.msaaSamples = Window.instance.antiAliasing;
                         }
                 
                         cmdBuf.GetTemporaryRT(subLayer.rtID, desc, subLayer.filterMode);
diff --git a/Runtime/ui/window.cs b/Runtime/ui/window.cs
@@ -138,6 +138,12 @@ public float devicePixelRatio {
         }
 
         protected float _devicePixelRatio = 1.0f;
+        
+        public int antiAliasing {
+            get { return this._antiAliasing; }
+        }
+
+        protected int _antiAliasing = 4;
 
         public Size physicalSize {
             get { return this._physicalSize; }
diff --git a/Tests/Editor/CanvasAndLayers.cs b/Tests/Editor/CanvasAndLayers.cs
@@ -141,8 +141,8 @@ void createRenderTexture() {
                     autoGenerateMips = false,
                 };
 
-                if (QualitySettings.antiAliasing != 0) {
-                    desc.msaaSamples = QualitySettings.antiAliasing;
+                if (Window.instance.antiAliasing != 0) {
+                    desc.msaaSamples = Window.instance.antiAliasing;
                 }
 
                 this._renderTexture = RenderTexture.GetTemporary(desc);

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@ public class UIWidgetsPanelEditor : RawImageEditor {`
`9`	`9`	`public override void OnInspectorGUI() {`
`10`	`10`	`base.OnInspectorGUI();`
`11`	`11`	`var pixelRatioProperty = this.serializedObject.FindProperty("devicePixelRatioOverride");`
	`12`	`+ var antiAliasingProperty = this.serializedObject.FindProperty("antiAliasingOverride");`
`12`	`13`	`EditorGUILayout.PropertyField(pixelRatioProperty);`
	`14`	`+ EditorGUILayout.PropertyField(antiAliasingProperty);`
`13`	`15`	`this.serializedObject.ApplyModifiedProperties();`
`14`	`16`	`}`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,8 @@ public GrSurface(Size size, float devicePixelRatio, MeshPool meshPool) {`
`203`	`203`	`autoGenerateMips = false,`
`204`	`204`	`};`
`205`	`205`
`206`		`- if (QualitySettings.antiAliasing != 0) {`
`207`		`- desc.msaaSamples = QualitySettings.antiAliasing;`
	`206`	`+ if (Window.instance.antiAliasing != 0) {`
	`207`	`+ desc.msaaSamples = Window.instance.antiAliasing;`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`this._renderTexture = new RenderTexture(desc);`
Original file line number	Diff line number	Diff line change
`@@ -224,8 +224,8 @@ RasterCacheResult _rasterizePicture(Picture picture, Matrix3 transform, float de`
`224`	`224`	`autoGenerateMips = false,`
`225`	`225`	`};`
`226`	`226`
`227`		`- if (QualitySettings.antiAliasing != 0) {`
`228`		`- desc.msaaSamples = QualitySettings.antiAliasing;`
	`227`	`+ if (Window.instance.antiAliasing != 0) {`
	`228`	`+ desc.msaaSamples = Window.instance.antiAliasing;`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`var renderTexture = new RenderTexture(desc);`
Original file line number	Diff line number	Diff line change
`@@ -783,8 +783,8 @@ void _drawLayer(RenderLayer layer, CommandBuffer cmdBuf) {`
`783`	`783`	`autoGenerateMips = false,`
`784`	`784`	`};`
`785`	`785`
`786`		`- if (QualitySettings.antiAliasing != 0) {`
`787`		`- desc.msaaSamples = QualitySettings.antiAliasing;`
	`786`	`+ if (Window.instance.antiAliasing != 0) {`
	`787`	`+ desc.msaaSamples = Window.instance.antiAliasing;`
`788`	`788`	`}`
`789`	`789`
`790`	`790`	`cmdBuf.GetTemporaryRT(subLayer.rtID, desc, subLayer.filterMode);`
Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,8 @@ void createRenderTexture() {`
`141`	`141`	`autoGenerateMips = false,`
`142`	`142`	`};`
`143`	`143`
`144`		`- if (QualitySettings.antiAliasing != 0) {`
`145`		`- desc.msaaSamples = QualitySettings.antiAliasing;`
	`144`	`+ if (Window.instance.antiAliasing != 0) {`
	`145`	`+ desc.msaaSamples = Window.instance.antiAliasing;`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`this._renderTexture = RenderTexture.GetTemporary(desc);`