fast shadow version 1.0

Author: zhuxingwei

Runtime/ui/geometry.cs

@@ -1089,6 +1089,21 @@ public float brRadiusY {
             get { return this.brRadius.y; }
         }
 
+        public bool isNaiveRRect {
+            get {
+                var radius = this.tlRadiusX;
+                return this.tlRadiusY == radius &&
+                       this.trRadiusX == radius &&
+                       this.trRadiusY == radius &&
+                       this.blRadiusX == radius &&
+                       this.blRadiusY == radius &&
+                       this.brRadiusX == radius &&
+                       this.brRadiusY == radius &&
+                       radius <= this.width / 2 &&
+                       radius <= this.height / 2;
+            }
+        }
+
         public static readonly RRect zero = new RRect(0, 0, 0, 0, (Radius) null);
 
         public RRect shift(Offset offset) {

Runtime/ui/painting/path.cs

@@ -28,6 +28,9 @@ public class Path {
         PathShapeHint _shapeHint = PathShapeHint.Other;
         public PathShapeHint shapeHint => this._shapeHint;
 
+        float _rCorner;
+        public float rCorner => this._rCorner;
+
         public uint pathKey {
             get {
                 return this._pathKey;
@@ -41,12 +44,15 @@ public Path(int capacity = 128) {
 
         public List<float> commands => this._commands;
 
-        void _updateRRectFlag(bool isRRect, PathShapeHint shapeHint = PathShapeHint.Other) {
+        void _updateRRectFlag(bool isRRect, PathShapeHint shapeHint = PathShapeHint.Other, float corner = 0) {
             if (this._commands.Count > 0 && !this._isRRect) {
                 return;
             }
             this._isRRect = isRRect && this._hasOnlyMoveTos();
-            this._shapeHint = shapeHint;
+            if (this._isRRect) {
+                this._shapeHint = shapeHint;
+                this._rCorner = corner;
+            }
         }
 
         bool _hasOnlyMoveTos() {
@@ -514,7 +520,7 @@ public void addRect(Rect rect) {
         }
 
         public void addRRect(RRect rrect) {
-            this._updateRRectFlag(true, PathShapeHint.RRect);
+            this._updateRRectFlag(rrect.isNaiveRRect, PathShapeHint.NaiveRRect, rrect.blRadiusX);
             float w = rrect.width;
             float h = rrect.height;
             float halfw = Mathf.Abs(w) * 0.5f;
@@ -550,7 +556,7 @@ public void addRRect(RRect rrect) {
         }
 
         public void addEllipse(float cx, float cy, float rx, float ry) {
-            this._updateRRectFlag(true, PathShapeHint.Oval);
+            this._updateRRectFlag(rx == ry, PathShapeHint.Circle, rx);
             this._appendMoveTo(cx - rx, cy);
             this._appendBezierTo(cx - rx, cy + ry * _KAPPA90,
                 cx - rx * _KAPPA90, cy + ry, cx, cy + ry);
@@ -564,13 +570,11 @@ public void addEllipse(float cx, float cy, float rx, float ry) {
         }
 
         public void addCircle(float cx, float cy, float r) {
-            this._updateRRectFlag(true, PathShapeHint.Oval);
             this.addEllipse(cx, cy, r, r);
         }
 
         public void addOval(Rect oval) {
             D.assert(oval != null);
-            this._updateRRectFlag(true, PathShapeHint.Oval);
             var center = oval.center;
             this.addEllipse(center.dx, center.dy, oval.width / 2, oval.height / 2);
         }
@@ -763,7 +767,7 @@ public void addPath(Path path, Offset offset) {
         public void addPath(Path path, Matrix3 transform = null) {
             D.assert(path != null);
 
-            this._updateRRectFlag(path.isRRect, path.shapeHint);
+            this._updateRRectFlag(path.isRRect, path.shapeHint, path.rCorner);
             var i = 0;
             while (i < path._commands.Count) {
                 var cmd = (PathCommand) path._commands[i];
@@ -1405,8 +1409,8 @@ void _chop(out _Conic c1, out _Conic c2) {
 
     public enum PathShapeHint {
         Rect,
-        Oval,
-        RRect,
+        Circle,
+        NaiveRRect,
         Other
     }
 

Runtime/ui/painting/shadow_utils.cs

@@ -222,8 +222,6 @@ static void drawShadowFull2(Canvas canvas, Path path, Vector3 zPlaneParams, Vect
             }
 
             //ambient light
-            _devSpacePath.resetAll();
-            _devSpacePath.addPath(path, viewMatrix);
             float devSpaceOutset = ambientBlurRadius(zPlaneParams.z);
             float oneOverA = ambientRecipAlpha(zPlaneParams.z);
             float blurRadius = 0.5f * devSpaceOutset * oneOverA;
@@ -232,18 +230,10 @@ static void drawShadowFull2(Canvas canvas, Path path, Vector3 zPlaneParams, Vect
             _shadowPaint.color = new Color(ambientColor.value);
             _shadowPaint.strokeWidth = strokeWidth;
             _shadowPaint.style = PaintingStyle.fill;
-            
-            canvas.save();
-            _shadowMatrix.reset();
-            canvas.setMatrix(_shadowMatrix);
-            float sigma = convertRadiusToSigma(blurRadius);
-            _shadowPaint.maskFilter = _devSpacePath.isRRect ? MaskFilter.fastShadow(sigma) : MaskFilter.blur(BlurStyle.normal, sigma);
-            //canvas.drawPath(_devSpacePath, _shadowPaint);
-            canvas.restore();
+            canvas.drawPath(path, _shadowPaint);
 
             //spot light
             float radius = 0.0f;
-
             if (!getSpotShadowTransform(devLightPos, lightRadius, viewMatrix, zPlaneParams, path.getBounds(),
                 _shadowMatrix, ref radius)) {
                 return;

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

@@ -504,8 +504,8 @@ public static PictureFlusher.CmdDraw maskFilter(PictureFlusher.RenderLayer layer
             );
         }
 
-        public static PictureFlusher.CmdDraw fastShadow(PictureFlusher.RenderLayer layer, uiMeshMesh mesh,
-            bool isRect, Vector4 bound, uiColor color) {
+        public static PictureFlusher.CmdDraw fastShadow(PictureFlusher.RenderLayer layer, uiMeshMesh mesh, float sigma,
+            bool isRect, bool isCircle, float corner, Vector4 bound, uiColor color) {
             Vector4 viewport = layer.viewport;
             var mat = _shadowBox;
             if (!isRect) {
@@ -515,11 +515,11 @@ public static PictureFlusher.CmdDraw fastShadow(PictureFlusher.RenderLayer layer
             //use props to set all the uniforms !!!!!
             var props = ObjectPool<MaterialPropertyBlockWrapper>.alloc();
             props.SetVector(_viewportId, viewport);
-            props.SetFloat(_shadowSigmaId, 3f);
+            props.SetFloat(_shadowSigmaId, sigma);
             props.SetVector(_shadowBoxId, bound);
             props.SetVector(_shadowColorId, _colorToVector4(color));
             if (!isRect) {
-                props.SetFloat(_shadowCornerId, 30f);
+                props.SetFloat(_shadowCornerId, corner);
             }
 
             return PictureFlusher.CmdDraw.create(

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

@@ -14,6 +14,7 @@ void _drawRRectShadow(uiPath path, uiPaint paint) {
 
             var layer = this._currentLayer;
             var state = layer.currentState;
+            float sigma = state.scale * paint.maskFilter.Value.sigma;
 
             var vertices = ObjectPool<uiList<Vector3>>.alloc();
             vertices.SetCapacity(4);
@@ -32,7 +33,7 @@ void _drawRRectShadow(uiPath path, uiPaint paint) {
             _triangles.Add(3);
 
             var mesh = uiMeshMesh.create(state.matrix, vertices, _triangles);
-            layer.draws.Add(CanvasShader.fastShadow(layer, mesh, path.isRect, new Vector4(bound.left, bound.top, bound.right, bound.bottom), paint.color));
+            layer.draws.Add(CanvasShader.fastShadow(layer, mesh, sigma, path.isRect, path.isCircle, path.rCorner, new Vector4(bound.left, bound.top, bound.right, bound.bottom), paint.color));
         }
 
     }

Runtime/ui/renderer/common/geometry/path/path.cs

@@ -22,13 +22,17 @@ public partial class uiPath : PoolObject {
         uiPathShapeHint _shapeHint = uiPathShapeHint.Other;
         public uiPathShapeHint shapeHint => this._shapeHint;
 
-        void _updateRRectFlag(bool isRRect, uiPathShapeHint shapeHint = uiPathShapeHint.Other) {
+        float _rCorner;
+        public float rCorner => this._rCorner;
+        
+        void _updateRRectFlag(bool isRRect, uiPathShapeHint shapeHint = uiPathShapeHint.Other, float corner = 0) {
             if (this._commands.Count > 0 && !this._isRRect) {
                 return;
             }
             this._isRRect = isRRect && this._hasOnlyMoveTos();
             if (this._isRRect) {
                 this._shapeHint = shapeHint;
+                this._rCorner = corner;
             }
         }
 
@@ -248,7 +252,7 @@ public void addRect(Rect rect) {
         }
 
         public void addRRect(RRect rrect) {
-            this._updateRRectFlag(true, uiPathShapeHint.RRect);
+            this._updateRRectFlag(rrect.isNaiveRRect, uiPathShapeHint.NaiveRRect, rrect.blRadiusX);
             float w = rrect.width;
             float h = rrect.height;
             float halfw = Mathf.Abs(w) * 0.5f;
@@ -297,7 +301,7 @@ public void winding(PathWinding dir) {
         }
 
         public void addEllipse(float cx, float cy, float rx, float ry) {
-            this._updateRRectFlag(true, uiPathShapeHint.Oval);
+            this._updateRRectFlag(rx == ry, uiPathShapeHint.Circle, rx);
             this._appendMoveTo(cx - rx, cy);
             this._appendBezierTo(cx - rx, cy + ry * _KAPPA90,
                 cx - rx * _KAPPA90, cy + ry, cx, cy + ry);
@@ -311,7 +315,6 @@ public void addEllipse(float cx, float cy, float rx, float ry) {
         }
 
         public void addCircle(float cx, float cy, float r) {
-            this._updateRRectFlag(true, uiPathShapeHint.Oval);
             this.addEllipse(cx, cy, r, r);
         }
 
@@ -429,7 +432,7 @@ public static uiPath fromPath(Path path) {
                 return uipath;
             }
 
-            uipath._updateRRectFlag(path.isRRect, (uiPathShapeHint)path.shapeHint);
+            uipath._updateRRectFlag(path.isRRect, (uiPathShapeHint)path.shapeHint, path.rCorner);
 
             var i = 0;
             var _commands = path.commands;

Runtime/ui/renderer/common/geometry/path/path_extension.cs

@@ -3,17 +3,17 @@ public partial class uiPath {
 
         public enum uiPathShapeHint {
             Rect,
-            Oval,
-            RRect,
+            Circle,
+            NaiveRRect,
             Other
         }
 
         public bool isRect {
             get { return this._shapeHint == uiPathShapeHint.Rect; }
         }
 
-        public bool isOval {
-            get { return this._shapeHint == uiPathShapeHint.Oval; }
+        public bool isCircle {
+            get { return this._shapeHint == uiPathShapeHint.Circle; }
         }
     }
 }