Skip to content

Remove the restriction that all texture layers in a paint must use the same texture mapping mode #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove the restriction that all texture layers in a paint must use the same texture mapping mode #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions ink/brush/brush_paint.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ absl::Status ValidateBrushPaintTopLevel(const BrushPaint& paint) {
int first_animation_columns = paint.texture_layers[0].animation_columns;
absl::Duration first_animation_duration =
paint.texture_layers[0].animation_duration;
BrushPaint::TextureMapping first_mapping = paint.texture_layers[0].mapping;
for (const BrushPaint::TextureLayer& layer : paint.texture_layers) {
if (layer.animation_frames != first_animation_frames) {
return absl::InvalidArgumentError(absl::StrCat(
Expand All @@ -223,14 +222,6 @@ absl::Status ValidateBrushPaintTopLevel(const BrushPaint& paint) {
first_animation_duration, "` and `", layer.animation_duration,
"`"));
}
// TODO: b/375203215 - Remove the below check once we are able to mix
// rendering different mapping modes in a single `BrushPaint`.
if (layer.mapping != first_mapping) {
return absl::InvalidArgumentError(
absl::StrCat("`BrushPaint::TextureLayer::mapping` must be the same "
"for all texture layers. Got `",
first_mapping, "` and `", layer.mapping, "`"));
}
}
}
if (!IsValidBrushPaintSelfOverlap(paint.self_overlap)) {
Expand Down
10 changes: 0 additions & 10 deletions ink/brush/brush_paint_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,16 +633,6 @@ TEST(BrushPaintTest, InvalidColorFunction) {
HasSubstr("OpacityMultiplier")));
}

TEST(BrushPaintTest, MismatchedTextureMappings) {
EXPECT_THAT(brush_internal::ValidateBrushPaint(BrushPaint{
{{.client_texture_id = std::string(kTestTextureId),
.mapping = BrushPaint::TextureMapping::kTiling},
{.client_texture_id = std::string(kTestTextureId),
.mapping = BrushPaint::TextureMapping::kStamping}}}),
StatusIs(absl::StatusCode::kInvalidArgument,
HasSubstr("TextureLayer::mapping` must be the same")));
}

TEST(BrushPaintTest, MismatchedAnimationFrames) {
EXPECT_THAT(
brush_internal::ValidateBrushPaint(
Expand Down
17 changes: 6 additions & 11 deletions ink/brush/fuzz_domains.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,9 +629,8 @@ Domain<BrushPaint::BlendMode> ArbitraryBrushPaintBlendMode() {
// LINT.ThenChange(brush_paint.h:blend_mode)

Domain<BrushPaint::TextureLayer>
ValidBrushPaintTextureLayerWithMappingAndAnimationFrames(
BrushPaint::TextureMapping mapping, int animation_frames,
int animation_rows, int animation_columns,
ValidBrushPaintTextureLayerWithAnimationParameters(
int animation_frames, int animation_rows, int animation_columns,
absl::Duration animation_duration, DomainVariant variant) {
auto texture_layer = [=](Vec size) {
auto animation_frames_domain = Just(animation_frames);
Expand All @@ -645,7 +644,7 @@ ValidBrushPaintTextureLayerWithMappingAndAnimationFrames(
animation_duration_domain = Just(absl::Seconds(1));
}
return StructOf<BrushPaint::TextureLayer>(
Arbitrary<std::string>(), Just(mapping),
Arbitrary<std::string>(), ArbitraryBrushPaintTextureMapping(),
ArbitraryBrushPaintTextureOrigin(),
ArbitraryBrushPaintTextureSizeUnit(), ArbitraryBrushPaintTextureWrap(),
ArbitraryBrushPaintTextureWrap(), Just(size),
Expand All @@ -670,22 +669,18 @@ Domain<BrushPaint::SelfOverlap> ArbitraryBrushPaintSelfOverlap() {

Domain<BrushPaint> ValidBrushPaint(DomainVariant variant) {
return FlatMap(
[=](BrushPaint::TextureMapping mapping,
std::tuple<int, int, int> animation_frames_rows_columns,
[=](std::tuple<int, int, int> animation_frames_rows_columns,
absl::Duration animation_duration) {
return std::apply(
[&](int frames, int rows, int columns) {
return fuzztest::StructOf<BrushPaint>(
VectorOf(
ValidBrushPaintTextureLayerWithMappingAndAnimationFrames(
mapping, frames, rows, columns, animation_duration,
variant)),
VectorOf(ValidBrushPaintTextureLayerWithAnimationParameters(
frames, rows, columns, animation_duration, variant)),
VectorOf(ValidColorFunction()),
ArbitraryBrushPaintSelfOverlap());
},
animation_frames_rows_columns);
},
ArbitraryBrushPaintTextureMapping(),
FlatMap(
[](int rows, int columns) {
return TupleOf(InRange<int>(1, rows * columns), Just(rows),
Expand Down
Loading