Merge pull request #381 from UnityTech/fix_aa_shapehintbug

Yuncong Zhang · web-flow · commit f72c10fc0f84 · 2019-11-20T10:55:32.000+08:00
Fix aa shapehintbug
diff --git a/Runtime/ui/renderer/common/geometry/path/path.cs b/Runtime/ui/renderer/common/geometry/path/path.cs
@@ -30,10 +30,8 @@ void _updateRRectFlag(bool isNaiveRRect, uiPathShapeHint shapeHint = uiPathShape
                 return;
             }
             this._isNaiveRRect = isNaiveRRect && this._hasOnlyMoveTos();
-            if (this._isNaiveRRect) {
-                this._shapeHint = shapeHint;
-                this._rRectCorner = corner;
-            }
+            this._shapeHint = shapeHint;
+            this._rRectCorner = corner;
         }
         
         bool _hasOnlyMoveTos() {
@@ -80,6 +78,8 @@ public override void clear() {
             this.needCache = false;
             this.pathKey = 0;
             this._isNaiveRRect = false;
+            this._shapeHint = uiPathShapeHint.Other;
+            this._rRectCorner = 0;
         }
 
         void _reset() {

Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,8 @@ void _updateRRectFlag(bool isNaiveRRect, uiPathShapeHint shapeHint = uiPathShape`
`30`	`30`	`return;`
`31`	`31`	`}`
`32`	`32`	`this._isNaiveRRect = isNaiveRRect && this._hasOnlyMoveTos();`
`33`		`- if (this._isNaiveRRect) {`
`34`		`- this._shapeHint = shapeHint;`
`35`		`- this._rRectCorner = corner;`
`36`		`- }`
	`33`	`+ this._shapeHint = shapeHint;`
	`34`	`+ this._rRectCorner = corner;`
`37`	`35`	`}`
`38`	`36`
`39`	`37`	`bool _hasOnlyMoveTos() {`
`@@ -80,6 +78,8 @@ public override void clear() {`
`80`	`78`	`this.needCache = false;`
`81`	`79`	`this.pathKey = 0;`
`82`	`80`	`this._isNaiveRRect = false;`
	`81`	`+ this._shapeHint = uiPathShapeHint.Other;`
	`82`	`+ this._rRectCorner = 0;`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`void _reset() {`