Remove unused jitter fields from BrushPaint::TextureLayer

PiperOrigin-RevId: 871445920

Author: Ink Open Source

ink/brush/brush_family.h

@@ -118,10 +118,6 @@ class BrushFamily {
   //    - size components must be finite and greater than 0.
   //    - offset components must be in interval [0, 1].
   //    - rotation component must be finite.
-  //    - size_jitter components must be smaller than or equal to their size
-  //      counterparts.
-  //    - offset_jitter must be in interval [0, 1].
-  //    - rotation_jitter must be finite.
   //    - opacity must be in interval [0, 1].
   //    - animation_frames must be greater than 0.
   //    - For each TextureKeyframe the following must hold:

ink/brush/brush_family_test.cc

@@ -97,7 +97,6 @@ BrushPaint CreateTestPaint() {
                .mapping = BrushPaint::TextureMapping::kStamping,
                .size_unit = BrushPaint::TextureSizeUnit::kBrushSize,
                .size = {3, 5},
-               .size_jitter = {0.1, 2},
                .keyframes = {{.progress = 0.1, .rotation = kFullTurn / 8}},
                .blend_mode = BrushPaint::BlendMode::kDstIn}}};
 }
@@ -138,7 +137,6 @@ TEST(BrushFamilyTest, StringifyWithNoId) {
             "client_texture_id=test-paint, mapping=kStamping, "
             "origin=kStrokeSpaceOrigin, size_unit=kBrushSize, wrap_x=kRepeat, "
             "wrap_y=kRepeat, size=<3, 5>, offset=<0, 0>, rotation=0π, "
-            "size_jitter=<0.1, 2>, offset_jitter=<0, 0>, rotation_jitter=0π, "
             "opacity=1, animation_frames=1, animation_rows=1, "
             "animation_columns=1, animation_duration=1s, "
             "keyframes={TextureKeyframe{progress=0.1, "
@@ -159,7 +157,6 @@ TEST(BrushFamilyTest, StringifyWithId) {
             "texture_id=test-paint, mapping=kStamping, "
             "origin=kStrokeSpaceOrigin, size_unit=kBrushSize, wrap_x=kRepeat, "
             "wrap_y=kRepeat, size=<3, 5>, offset=<0, 0>, rotation=0π, "
-            "size_jitter=<0.1, 2>, offset_jitter=<0, 0>, rotation_jitter=0π, "
             "opacity=1, animation_frames=1, animation_rows=1, "
             "animation_columns=1, animation_duration=1s, "
             "keyframes={TextureKeyframe{progress=0.1, "
@@ -1063,78 +1060,6 @@ TEST(BrushFamilyTest, CreateWithInvalidBrushPaint) {
     EXPECT_THAT(status.message(),
                 HasSubstr("BrushPaint::TextureLayer::offset"));
   }
-  // `TextureLayer::size_jitter` has negative component.
-  {
-    absl::Status status =
-        BrushFamily::Create(
-            BrushTip{.scale = {3, 3}, .corner_rounding = 0},
-            {.texture_layers = {{.client_texture_id =
-                                     std::string(kTestTextureId),
-                                 .size = {1, 3},
-                                 .size_jitter = {-0.1, 0.4}}}})
-            .status();
-    EXPECT_EQ(status.code(), kInvalidArgument);
-    EXPECT_THAT(status.message(),
-                HasSubstr("BrushPaint::TextureLayer::size_jitter"));
-  }
-  // `TextureLayer::size_jitter` is greater than size component.
-  {
-    absl::Status status =
-        BrushFamily::Create(
-            BrushTip{.scale = {3, 3}, .corner_rounding = 0},
-            {.texture_layers = {{.client_texture_id =
-                                     std::string(kTestTextureId),
-                                 .size = {1, 3},
-                                 .size_jitter = {0.1, 4}}}})
-            .status();
-    EXPECT_EQ(status.code(), kInvalidArgument);
-    EXPECT_THAT(status.message(),
-                HasSubstr("BrushPaint::TextureLayer::size_jitter"));
-  }
-  // `TextureLayer::offset_jitter` has negative component.
-  {
-    absl::Status status =
-        BrushFamily::Create(
-            BrushTip{.scale = {3, 3}, .corner_rounding = 0},
-            {.texture_layers = {{.client_texture_id =
-                                     std::string(kTestTextureId),
-                                 .size = {1, 3},
-                                 .offset = {0.8, 0.7},
-                                 .offset_jitter = {-0.1, 0.4}}}})
-            .status();
-    EXPECT_EQ(status.code(), kInvalidArgument);
-    EXPECT_THAT(status.message(),
-                HasSubstr("BrushPaint::TextureLayer::offset_jitter"));
-  }
-  // `TextureLayer::offset_jitter` is greater than 1.
-  {
-    absl::Status status =
-        BrushFamily::Create(
-            BrushTip{.scale = {3, 3}, .corner_rounding = 0},
-            {.texture_layers = {{.client_texture_id =
-                                     std::string(kTestTextureId),
-                                 .size = {1, 3},
-                                 .offset = {0.8, 0.7},
-                                 .offset_jitter = {0.1, 4}}}})
-            .status();
-    EXPECT_EQ(status.code(), kInvalidArgument);
-    EXPECT_THAT(status.message(),
-                HasSubstr("BrushPaint::TextureLayer::offset_jitter"));
-  }
-  // `TextureLayer::size_jitter` has negative component.
-  {
-    absl::Status status =
-        BrushFamily::Create(
-            BrushTip{.scale = {3, 3}, .corner_rounding = 0},
-            {.texture_layers = {{.client_texture_id =
-                                     std::string(kTestTextureId),
-                                 .size = {1, 3},
-                                 .size_jitter = {-0.1, 0.4}}}})
-            .status();
-    EXPECT_EQ(status.code(), kInvalidArgument);
-    EXPECT_THAT(status.message(),
-                HasSubstr("BrushPaint::TextureLayer::size_jitter"));
-  }
   // `TextureLayer::opacity` is negative.
   {
     absl::Status status =

ink/brush/brush_paint.cc

@@ -191,26 +191,6 @@ absl::Status ValidateBrushPaintTextureLayer(
                         "Got %v",
                         layer.rotation));
   }
-  if (!(layer.size_jitter.x >= 0.0f && layer.size_jitter.x <= layer.size.x &&
-        layer.size_jitter.y >= 0.0f && layer.size_jitter.y <= layer.size.y)) {
-    return absl::InvalidArgumentError(absl::StrFormat(
-        "`BrushPaint::TextureLayer::size_jitter` must be "
-        "smaller or equal to `BrushPaint::TextureLayer::size`. Got %v",
-        layer.size_jitter));
-  }
-  if (!(layer.offset_jitter.x >= 0.0f && layer.offset_jitter.x <= 1.0f &&
-        layer.offset_jitter.y >= 0.0f && layer.offset_jitter.y <= 1.0f)) {
-    return absl::InvalidArgumentError(absl::StrFormat(
-        "`BrushPaint::TextureLayer::offset_jitter` must be in the "
-        "interval [0, 1]. Got %v",
-        layer.offset_jitter));
-  }
-  if (!std::isfinite(layer.rotation_jitter.ValueInRadians())) {
-    return absl::InvalidArgumentError(absl::StrFormat(
-        "`BrushPaint::TextureLayer::rotation_jitter` must be finite. "
-        "Got %v",
-        layer.rotation_jitter));
-  }
   if (!(layer.opacity >= 0.0f && layer.opacity <= 1.0f)) {
     return absl::InvalidArgumentError(absl::StrFormat(
         "`BrushPaint::TextureLayer::opacity` must be in the interval [0, 1]. "
@@ -466,9 +446,6 @@ std::string ToFormattedString(const BrushPaint::TextureLayer& texture_layer) {
       ", wrap_y=", ToFormattedString(texture_layer.wrap_y),
       ", size=", texture_layer.size, ", offset=", texture_layer.offset,
       ", rotation=", texture_layer.rotation,
-      ", size_jitter=", texture_layer.size_jitter,
-      ", offset_jitter=", texture_layer.offset_jitter,
-      ", rotation_jitter=", texture_layer.rotation_jitter,
       ", opacity=", texture_layer.opacity,
       ", animation_frames=", texture_layer.animation_frames,
       ", animation_rows=", texture_layer.animation_rows,

ink/brush/brush_paint.h

@@ -254,14 +254,6 @@ struct BrushPaint {
     // axes.
     Angle rotation = Angle();
 
-    // Transform "jitter" properties below specify the magnitude of random
-    // offset that is applied to `size`, `offset`, and `rotation` on a
-    // per-stroke basis. Each component of `size_jitter` must be less than or
-    // equal to that of `size`.
-    Vec size_jitter = {0, 0};
-    Vec offset_jitter = {0, 0};
-    Angle rotation_jitter = Angle();
-
     // Overall layer opacity.
     float opacity = 1;
 
@@ -443,8 +435,7 @@ template <typename H>
 H AbslHashValue(H h, const BrushPaint::TextureLayer& layer) {
   return H::combine(std::move(h), layer.client_texture_id, layer.mapping,
                     layer.origin, layer.size_unit, layer.wrap_x, layer.wrap_y,
-                    layer.size, layer.offset, layer.rotation, layer.size_jitter,
-                    layer.offset_jitter, layer.rotation_jitter, layer.opacity,
+                    layer.size, layer.offset, layer.rotation, layer.opacity,
                     layer.keyframes, layer.blend_mode);
 }