feat: add rect and polygon

feat: add rect and polygon

Author: drawcall

lib/src/core/data.dart

@@ -0,0 +1,25 @@
+class Data {
+  String? mark;
+  double x = 0;
+  double y = 0;
+  double speed = 0;
+  double alpha = 1;
+  double radius = 0;
+  double angle = 0;
+  double value = 0;
+
+  reset() {
+    mark = null;
+    angle = 0;
+    x = 0;
+    y = 0;
+    speed = 0;
+    alpha = 1;
+    radius = 0;
+    value = 0;
+  }
+
+  destroy() {
+    reset();
+  }
+}

lib/src/extras/circle.dart

@@ -46,4 +46,10 @@ class ZKCircle extends ZKNode {
   void draw(Canvas canvas, [Size? size]) {
     canvas.drawCircle(_offset, radius, this.paint);
   }
+
+  @override
+  void reset() {
+    super.reset();
+    //radius = 10;
+  }
 }

lib/src/extras/flower.dart

@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+import 'package:zerker/zerker.dart';
+import '../math/mathutil.dart';
+import 'dart:math';
+
+class ZKFlower extends ZKNode {
+  @override
+  String type = "ZKFlower";
+  double radius = 10;
+  Offset? _offset;
+
+  ////////////////////////////////////////////////////////////
+  ///
+  /// ZKFlower constructor
+  ///
+  ////////////////////////////////////////////////////////////
+  ZKFlower(double radius, [Color? color]) : super() {
+    this.oriWidth = radius;
+    this.oriHeight = radius;
+    this._offset = Offset(0, 0);
+    if (color != null) this.color = color;
+  }
+
+  @override
+  void draw(Canvas canvas, [Size? size]) {
+    double count = 5;
+    double unit = MathUtil.PIx2 / count;
+    double tha0 = rotation * MathUtil.PI_180;
+
+    for (int i = 0; i < count; i++) {
+      double tha = tha0 + unit * i;
+      double x = radius * cos(tha);
+      double y = radius * sin(tha);
+      canvas.drawCircle(Offset(x, y), radius, this.paint);
+    }
+
+    canvas.drawCircle(_offset!, radius, this.paint);
+  }
+}

lib/src/extras/polygon.dart

@@ -0,0 +1,50 @@
+import 'dart:ui';
+import 'dart:math';
+import 'package:flutter/material.dart';
+import '../node/node.dart';
+import '../core/constant.dart';
+
+class ZKPolygon extends ZKNode {
+  @override
+  String type = "ZKPolygon";
+  Path? _path;
+  int _count = 5;
+
+  ////////////////////////////////////////////////////////////
+  ///
+  /// ZKPolygon constructor
+  ///
+  ////////////////////////////////////////////////////////////
+  ZKPolygon(int count, double radius, [Color? color]) : super() {
+    if (color != null) this.color = color;
+
+    _path = Path();
+    _count = count;
+    _fillPath(count, radius);
+  }
+
+  void _fillPath(int count, double radius) {
+    _path!.reset();
+
+    double unit = (Constant.PI * 2) / count;
+    for (int i = 0; i < count; i++) {
+      double x = radius * cos(unit * i);
+      double y = radius * sin(unit * i);
+
+      if (i == 0)
+        _path!.moveTo(x, y);
+      else
+        _path!.lineTo(x, y);
+    }
+    _path!.close();
+  }
+
+  set radius(double radius) {
+    _fillPath(_count, radius);
+  }
+
+  @override
+  void draw(Canvas canvas, [Size? size]) {
+    canvas.drawPath(_path!, this.paint);
+  }
+}

lib/src/extras/rect.dart

@@ -5,6 +5,7 @@ import '../node/node.dart';
 class ZKRect extends ZKNode {
   @override
   String type = "ZKRect";
+  bool _center = false;
 
   ////////////////////////////////////////////////////////////
   ///
@@ -17,8 +18,26 @@ class ZKRect extends ZKNode {
     if (color != null) this.color = color;
   }
 
+  void setCenter([bool center = true]) {
+    _center = center;
+  }
+
+  void setScaleY(double scale) {
+    setHeight(scale * oriHeight);
+  }
+
+  void setHeight(double height) {
+    this.oriHeight = height;
+  }
+
   @override
   void draw(Canvas canvas, [Size? size]) {
-    canvas.drawRect(Rect.fromLTRB(0, 0, oriWidth, oriHeight), this.paint);
+    if (_center) {
+      canvas.drawRect(
+          Rect.fromLTWH(-oriWidth / 2, -oriHeight / 2, oriWidth, oriHeight),
+          this.paint);
+    } else {
+      canvas.drawRect(Rect.fromLTRB(0, 0, oriWidth, oriHeight), this.paint);
+    }
   }
 }

lib/src/extras/star.dart

@@ -0,0 +1,60 @@
+import 'dart:ui';
+import 'dart:math';
+import 'package:flutter/material.dart';
+import '../node/node.dart';
+import '../core/constant.dart';
+
+class ZKStar extends ZKNode {
+  @override
+  String type = "ZKStar";
+  Path? _path;
+  int _count = 5;
+
+  ////////////////////////////////////////////////////////////
+  ///
+  /// ZKStar constructor
+  ///
+  ////////////////////////////////////////////////////////////
+  ZKStar(int count, double radius, [Color? color]) : super() {
+    if (color != null) this.color = color;
+    _count = count;
+    _path = Path();
+    _fillPath(count, radius);
+  }
+
+  void _fillPath(int count, double radius) {
+    _path!.reset();
+    double n = count * 2;
+    double r1 = radius;
+    double r2 = count == 3 ? r1 * 0.35 : r1 * 0.5;
+    double unit = (Constant.PI * 2) / n;
+    double angle = 0;
+
+    for (int i = 0; i < count; i++) {
+      int a = 2 * i;
+      int b = 2 * i + 1;
+      // first point
+      double x1 = r1 * cos(angle + a * unit);
+      double y1 = r1 * sin(angle + a * unit);
+      if (i == 0)
+        _path!.moveTo(x1, y1);
+      else
+        _path!.lineTo(x1, y1);
+
+      // second point
+      double x2 = r2 * cos(angle + b * unit);
+      double y2 = r2 * sin(angle + b * unit);
+      _path!.lineTo(x2, y2);
+    }
+    _path!.close();
+  }
+
+  set radius(double radius) {
+    _fillPath(_count, radius);
+  }
+
+  @override
+  void draw(Canvas canvas, [Size? size]) {
+    canvas.drawPath(_path!, this.paint);
+  }
+}

lib/src/math/mathutil.dart

@@ -2,6 +2,12 @@ import "dart:math";
 import 'package:flutter/widgets.dart';
 
 class MathUtil {
+  static const double PI = 3.14159267;
+  static const double PI_2 = PI / 2;
+  static const double PIx2 = PI * 2;
+  static const double PI_180 = PI / 180;
+  static const double N180_PI = 180 / PI;
+
   static double round(double n, [int size = 4]) {
     num k = pow(10, size);
     return (n * k).round() / k;

lib/src/node/node.dart

@@ -2,6 +2,7 @@ import "dart:math";
 import 'package:flutter/material.dart';
 
 import "../core/context.dart";
+import "../core/data.dart";
 import "../utils/util.dart";
 import '../event/event.dart';
 import '../math/point.dart';
@@ -26,6 +27,7 @@ class ZKNode {
 
   ZKNode? parent;
   Canvas? canvas;
+  Data data = Data();
   Paint paint = new Paint();
 
   ZKContext? context;
@@ -84,6 +86,7 @@ class ZKNode {
   }
 
   set colorFilter(ColorFilter filter) {
+    paint.colorFilter = null;
     this.paint.colorFilter = filter;
   }
 
@@ -204,6 +207,21 @@ class ZKNode {
     this.paint.color = this.paint.color.withOpacity(a);
   }
 
+  void reset() {
+    this.position.reset();
+    this.anchor.reset();
+    this.scale.reset();
+    this.skew.reset();
+    this.rotation = 0;
+    this.alpha = 1;
+    this.worldAlpha = 1;
+
+    this.parent = null;
+    this.onTapDown = null;
+    this.onTapUp = null;
+    this.onTouchMove = null;
+  }
+
   void dispose() {
     this.position.reset();
     this.anchor.reset();

lib/zerker.dart

@@ -16,6 +16,9 @@ export 'src/extras/rect.dart';
 export 'src/extras/button.dart';
 export 'src/extras/circle.dart';
 export 'src/extras/scrollbg.dart';
+export 'src/extras/polygon.dart';
+export 'src/extras/star.dart';
+export 'src/extras/flower.dart';
 
 export 'src/event/bus.dart';
 export 'src/event/event.dart';

pubspec.yaml

@@ -11,7 +11,7 @@ description: Zerker is a flexible and lightweight flutter canvas graphic animati
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.1.1
+version: 2.2.1
 homepage: https://github.com/flutterkit/zerker
 
 environment: