Add default constructors for Color, Rect, Point, and Size. (#539)

Author: domchen

drawers/src/SimpleText.cpp

@@ -34,7 +34,7 @@ void SimpleText::onDraw(tgfx::Canvas* canvas, const drawers::AppHost* host) {
   auto bounds = textBlob->getBounds();
   auto textScale = screenWidth / bounds.width();
   tgfx::Point textStart = {(width - bounds.width()) / 2, height / 2 - bounds.bottom * 1.2f};
-  auto matrix = tgfx::Matrix::I();
+  tgfx::Matrix matrix = {};
   matrix.setScale(textScale, textScale, width / 2, height / 2);
   auto oldMatrix = canvas->getMatrix();
   canvas->concat(matrix);

include/tgfx/core/Color.h

@@ -29,26 +29,6 @@ namespace tgfx {
  * order.
  */
 struct Color {
-  /**
-   * Red component.
-   */
-  float red;
-
-  /**
-   * Green component.
-   */
-  float green;
-
-  /**
-   * Blue component.
-   */
-  float blue;
-
-  /**
-   * Alpha component.
-   */
-  float alpha;
-
   /**
    * Returns a fully transparent Color.
    */
@@ -84,6 +64,42 @@ struct Color {
    */
   static Color FromRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255);
 
+  /**
+   * Constructs an opaque white Color.
+   */
+  constexpr Color() : red(1.0f), green(1.0f), blue(1.0f), alpha(1.0f) {
+  }
+
+  /**
+   * Constructs a Color with the specified red, green, blue, and alpha values.
+   * @param r  red component
+   * @param g  green component
+   * @param b  blue component
+   * @param a  alpha component
+   */
+  constexpr Color(float r, float g, float b, float a = 1.0f) : red(r), green(g), blue(b), alpha(a) {
+  }
+
+  /**
+   * Red component.
+   */
+  float red;
+
+  /**
+   * Green component.
+   */
+  float green;
+
+  /**
+   * Blue component.
+   */
+  float blue;
+
+  /**
+   * Alpha component.
+   */
+  float alpha;
+
   /**
    * Compares Color with other, and returns true if all components are equal.
    */

include/tgfx/core/Fill.h

@@ -42,9 +42,10 @@ class Fill {
   }
 
   /**
-   * The input color, unpremultiplied, as four floating point values.
+   * The input color, unpremultiplied, as four floating point values. The default value is opaque
+   * white.
    */
-  Color color = Color::White();
+  Color color = {};
 
   /**
    * The blend mode used to combine the fill with the destination pixels.

include/tgfx/core/ImageReader.h

@@ -93,7 +93,7 @@ class ImageReader {
   uint64_t bufferVersion = 0;
   uint64_t textureVersion = 0;
   bool hasPendingChanges = true;
-  Rect dirtyBounds = Rect::MakeEmpty();
+  Rect dirtyBounds = {};
 
   static std::shared_ptr<ImageReader> MakeFrom(std::shared_ptr<ImageStream> imageStream);
 

include/tgfx/core/Mask.h

@@ -138,7 +138,7 @@ class Mask {
                           const Matrix& matrix, bool antiAlias);
 
  private:
-  Matrix matrix = Matrix::I();
+  Matrix matrix = {};
   bool antiAlias = true;
 
   bool fillText(const GlyphRunList* glyphRunList, const Stroke* stroke = nullptr);

include/tgfx/core/Point.h

@@ -28,15 +28,6 @@ namespace tgfx {
  * Point holds two 32-bit floating point coordinates.
  */
 struct Point {
-  /**
-   * x-axis value.
-   */
-  float x;
-  /**
-   * y-axis value.
-   */
-  float y;
-
   /**
    * Creates a Point set to (0, 0).
    */
@@ -59,6 +50,27 @@ struct Point {
     return {static_cast<float>(x), static_cast<float>(y)};
   }
 
+  /**
+   * Constructs a Point set to (0, 0).
+   */
+  constexpr Point() : x(0), y(0) {
+  }
+
+  /**
+   * Constructs a Point set to (x, y).
+   */
+  constexpr Point(float x, float y) : x(x), y(y) {
+  }
+
+  /**
+   * x-axis value.
+   */
+  float x;
+  /**
+   * y-axis value.
+   */
+  float y;
+
   /**
    * Returns true if x and y are both zero.
    */

include/tgfx/core/RRect.h

@@ -26,8 +26,8 @@ namespace tgfx {
  * Round Rect.
  */
 struct RRect {
-  Rect rect = Rect::MakeEmpty();
-  Point radii = Point::Zero();
+  Rect rect = {};
+  Point radii = {};
 
   /**
    * Returns true if the bounds are a simple rectangle.

include/tgfx/core/Rect.h

@@ -30,23 +30,6 @@ namespace tgfx {
  * considered empty.
  */
 struct Rect {
-  /**
-   * smaller x-axis bounds.
-   */
-  float left;
-  /**
-   * smaller y-axis bounds.
-   */
-  float top;
-  /**
-   * larger x-axis bounds.
-   */
-  float right;
-  /**
-   * larger y-axis bounds.
-   */
-  float bottom;
-
   /**
    * Returns constructed Rect set to (0, 0, 0, 0).
    */
@@ -111,6 +94,40 @@ struct Rect {
     return Rect{0, 0, size.width, size.height};
   }
 
+  /**
+   * Constructs an empty Rect.
+   */
+  constexpr Rect() : left(0), top(0), right(0), bottom(0) {
+  }
+
+  /**
+   * Constructs a Rect with the given left, top, right, and bottom values.
+   * @param left   left edge of the rectangle
+   * @param top    top edge of the rectangle
+   * @param right  right edge of the rectangle
+   * @param bottom bottom edge of the rectangle
+   */
+  constexpr Rect(float left, float top, float right, float bottom)
+      : left(left), top(top), right(right), bottom(bottom) {
+  }
+
+  /**
+   * smaller x-axis bounds.
+   */
+  float left;
+  /**
+   * smaller y-axis bounds.
+   */
+  float top;
+  /**
+   * larger x-axis bounds.
+   */
+  float right;
+  /**
+   * larger y-axis bounds.
+   */
+  float bottom;
+
   /**
    * Returns true if left is equal to or greater than right, or if top is equal to or greater
    * than bottom. Call sort() to reverse rectangles with negative width() or height().
@@ -209,7 +226,7 @@ struct Rect {
    * Sets Rect to (0, 0, 0, 0).
    */
   void setEmpty() {
-    *this = MakeEmpty();
+    left = top = right = bottom = 0;
   }
 
   /**

include/tgfx/core/Size.h

@@ -25,16 +25,6 @@ namespace tgfx {
  * ISize holds two 32-bit integer dimensions.
  */
 struct ISize {
-  /**
-   * Span on the x-axis.
-   */
-  int width;
-
-  /**
-   * Span on the y-axis.
-   */
-  int height;
-
   static ISize Make(int w, int h) {
     return {w, h};
   }
@@ -47,6 +37,28 @@ struct ISize {
     return {0, 0};
   }
 
+  /**
+   * Constructs an empty ISize.
+   */
+  constexpr ISize() : width(0), height(0) {
+  }
+
+  /**
+   * Constructs an ISize with the specified width and height.
+   */
+  constexpr ISize(int w, int h) : width(w), height(h) {
+  }
+
+  /**
+   * Span on the x-axis.
+   */
+  int width;
+
+  /**
+   * Span on the y-axis.
+   */
+  int height;
+
   void set(int w, int h) {
     *this = ISize{w, h};
   }
@@ -91,16 +103,6 @@ struct ISize {
  * Size holds two 32-bit floating dimensions.
  */
 struct Size {
-  /**
-   * Span on the x-axis.
-   */
-  float width;
-
-  /**
-   * Span on the y-axis.
-   */
-  float height;
-
   static Size Make(float w, float h) {
     return {w, h};
   }
@@ -117,6 +119,28 @@ struct Size {
     return {0, 0};
   }
 
+  /**
+   * Constructs an empty Size.
+   */
+  constexpr Size() : width(0), height(0) {
+  }
+
+  /**
+   * Constructs a Size with the specified width and height.
+   */
+  constexpr Size(float w, float h) : width(w), height(h) {
+  }
+
+  /**
+   * Span on the x-axis.
+   */
+  float width;
+
+  /**
+   * Span on the y-axis.
+   */
+  float height;
+
   void set(float w, float h) {
     *this = Size{w, h};
   }

include/tgfx/layers/Gradient.h

@@ -178,8 +178,8 @@ class LinearGradient : public Gradient {
   std::shared_ptr<Shader> onGetShader() const override;
 
  private:
-  Point _startPoint = Point::Zero();
-  Point _endPoint = Point::Zero();
+  Point _startPoint = {};
+  Point _endPoint = {};
 
   LinearGradient(const Point& startPoint, const Point& endPoint, const std::vector<Color>& colors,
                  const std::vector<float>& positions)
@@ -228,7 +228,7 @@ class RadialGradient : public Gradient {
   std::shared_ptr<Shader> onGetShader() const override;
 
  private:
-  Point _center = Point::Zero();
+  Point _center = {};
   float _radius = 0;
 
   RadialGradient(const Point& center, float radius, const std::vector<Color>& colors,
@@ -290,7 +290,7 @@ class ConicGradient : public Gradient {
   std::shared_ptr<Shader> onGetShader() const override;
 
  private:
-  Point _center = Point::Zero();
+  Point _center = {};
   float _startAngle = 0;
   float _endAngle = 0;
 
@@ -341,7 +341,7 @@ class DiamondGradient : public Gradient {
   std::shared_ptr<Shader> onGetShader() const override;
 
  private:
-  Point _center = Point::Zero();
+  Point _center = {};
   float _halfDiagonal = 0;
 
   DiamondGradient(const Point& center, float halfDiagonal, const std::vector<Color>& colors,

include/tgfx/layers/Layer.h

@@ -603,7 +603,7 @@ class Layer {
   } bitFields = {};
   std::string _name;
   float _alpha = 1.0f;
-  Matrix _matrix = Matrix::I();
+  Matrix _matrix = {};
   float _rasterizationScale = 1.0f;
   std::vector<std::shared_ptr<LayerFilter>> _filters = {};
   std::shared_ptr<Layer> _mask = nullptr;

include/tgfx/layers/ShapeStyle.h

@@ -78,7 +78,7 @@ class ShapeStyle : public LayerProperty {
  private:
   float _alpha = 1.0f;
   BlendMode _blendMode = BlendMode::SrcOver;
-  Matrix _matrix = Matrix::I();
+  Matrix _matrix = {};
 
   friend class ShapeLayer;
 };

include/tgfx/layers/SolidLayer.h

@@ -103,7 +103,7 @@ class SolidLayer : public Layer {
   std::unique_ptr<LayerContent> onUpdateContent() override;
 
  private:
-  Color _color = Color::White();
+  Color _color = {};
   float _width = 0;
   float _height = 0;
   float _radiusX = 0;