@@ -60,8 +60,9 @@ TEST(BrushPaintTest, TextureLayerSupportsAbslHash) {
60
60
EXPECT_TRUE (absl::VerifyTypeImplementsAbslHashCorrectly ({
61
61
BrushPaint::TextureLayer{.client_texture_id = id1},
62
62
BrushPaint::TextureLayer{.client_texture_id = id2},
63
- BrushPaint::TextureLayer{.client_texture_id = id1,
64
- .mapping = BrushPaint::TextureMapping::kWinding },
63
+ BrushPaint::TextureLayer{
64
+ .client_texture_id = id1,
65
+ .mapping = BrushPaint::TextureMapping::kStamping },
65
66
BrushPaint::TextureLayer{
66
67
.client_texture_id = id1,
67
68
.origin = BrushPaint::TextureOrigin::kFirstStrokeInput },
@@ -160,7 +161,7 @@ TEST(BrushPaintTest, TextureLayerEqualAndNotEqual) {
160
161
EXPECT_NE (layer, other);
161
162
162
163
other = layer;
163
- other.mapping = BrushPaint::TextureMapping::kWinding ;
164
+ other.mapping = BrushPaint::TextureMapping::kStamping ;
164
165
EXPECT_NE (layer, other);
165
166
166
167
other = layer;
@@ -238,7 +239,7 @@ TEST(BrushPaintTest, BrushPaintEqualAndNotEqual) {
238
239
}
239
240
240
241
TEST (BrushPaintTest, StringifyTextureMapping) {
241
- EXPECT_EQ (absl::StrCat (BrushPaint::TextureMapping::kWinding ), " kWinding " );
242
+ EXPECT_EQ (absl::StrCat (BrushPaint::TextureMapping::kStamping ), " kStamping " );
242
243
EXPECT_EQ (absl::StrCat (BrushPaint::TextureMapping::kTiling ), " kTiling" );
243
244
EXPECT_EQ (absl::StrCat (static_cast <BrushPaint::TextureMapping>(99 )),
244
245
" TextureMapping(99)" );
@@ -348,7 +349,7 @@ TEST(BrushPaintTest, StringifyTextureLayer) {
348
349
EXPECT_EQ (
349
350
absl::StrCat (BrushPaint::TextureLayer{
350
351
.client_texture_id = std::string (kTestTextureId ),
351
- .mapping = BrushPaint::TextureMapping::kWinding ,
352
+ .mapping = BrushPaint::TextureMapping::kStamping ,
352
353
.origin = BrushPaint::TextureOrigin::kFirstStrokeInput ,
353
354
.size_unit = BrushPaint::TextureSizeUnit::kBrushSize ,
354
355
.wrap_x = BrushPaint::TextureWrap::kMirror ,
@@ -369,7 +370,7 @@ TEST(BrushPaintTest, StringifyTextureLayer) {
369
370
.rotation = kFullTurn / 16 }},
370
371
.blend_mode = BrushPaint::BlendMode::kDstIn }),
371
372
" TextureLayer{client_texture_id=test-texture, "
372
- " mapping=kWinding , origin=kFirstStrokeInput, size_unit=kBrushSize, "
373
+ " mapping=kStamping , origin=kFirstStrokeInput, size_unit=kBrushSize, "
373
374
" wrap_x=kMirror, wrap_y=kClamp, "
374
375
" size=<3, 5>, offset=<2, 0.2>, rotation=0.5π, size_jitter=<0.1, 0.2>, "
375
376
" offset_jitter=<0.7, 0.3>, rotation_jitter=0.125π, opacity=0.6, "
@@ -380,7 +381,7 @@ TEST(BrushPaintTest, StringifyTextureLayer) {
380
381
EXPECT_EQ (
381
382
absl::StrCat (BrushPaint::TextureLayer{
382
383
.client_texture_id = std::string (kTestTextureId ),
383
- .mapping = BrushPaint::TextureMapping::kWinding ,
384
+ .mapping = BrushPaint::TextureMapping::kStamping ,
384
385
.origin = BrushPaint::TextureOrigin::kLastStrokeInput ,
385
386
.size_unit = BrushPaint::TextureSizeUnit::kBrushSize ,
386
387
.wrap_x = BrushPaint::TextureWrap::kClamp ,
@@ -404,7 +405,7 @@ TEST(BrushPaintTest, StringifyTextureLayer) {
404
405
.opacity = 0.4 }},
405
406
.blend_mode = BrushPaint::BlendMode::kSrcAtop }),
406
407
" TextureLayer{client_texture_id=test-texture, "
407
- " mapping=kWinding , origin=kLastStrokeInput, size_unit=kBrushSize, "
408
+ " mapping=kStamping , origin=kLastStrokeInput, size_unit=kBrushSize, "
408
409
" wrap_x=kClamp, wrap_y=kMirror, "
409
410
" size=<3, 5>, offset=<2, 0.2>, rotation=0.5π, size_jitter=<0.1, 0.2>, "
410
411
" offset_jitter=<0.7, 0.3>, rotation_jitter=0.125π, opacity=0.6, "
@@ -442,11 +443,11 @@ TEST(BrushPaintTest, StringifyBrushPaint) {
442
443
EXPECT_EQ (
443
444
absl::StrCat (BrushPaint{
444
445
.texture_layers = {{.client_texture_id = std::string (kTestTextureId ),
445
- .mapping = BrushPaint::TextureMapping::kWinding ,
446
+ .mapping = BrushPaint::TextureMapping::kStamping ,
446
447
.size_unit =
447
448
BrushPaint::TextureSizeUnit::kBrushSize }}}),
448
449
" BrushPaint{texture_layers={TextureLayer{client_texture_id=test-texture, "
449
- " mapping=kWinding , origin=kStrokeSpaceOrigin, "
450
+ " mapping=kStamping , origin=kStrokeSpaceOrigin, "
450
451
" size_unit=kBrushSize, wrap_x=kRepeat, wrap_y=kRepeat, "
451
452
" size=<1, 1>, offset=<0, 0>, rotation=0π, "
452
453
" size_jitter=<0, 0>, offset_jitter=<0, 0>, rotation_jitter=0π, "
@@ -455,12 +456,12 @@ TEST(BrushPaintTest, StringifyBrushPaint) {
455
456
EXPECT_EQ (
456
457
absl::StrCat (BrushPaint{
457
458
.texture_layers = {{.client_texture_id = std::string (kTestTextureId ),
458
- .mapping = BrushPaint::TextureMapping::kWinding ,
459
+ .mapping = BrushPaint::TextureMapping::kStamping ,
459
460
.size_unit =
460
461
BrushPaint::TextureSizeUnit::kBrushSize ,
461
462
.size = {3 , 5 }}}}),
462
463
" BrushPaint{texture_layers={TextureLayer{client_texture_id=test-texture, "
463
- " mapping=kWinding , origin=kStrokeSpaceOrigin, size_unit=kBrushSize, "
464
+ " mapping=kStamping , origin=kStrokeSpaceOrigin, size_unit=kBrushSize, "
464
465
" wrap_x=kRepeat, wrap_y=kRepeat, size=<3, 5>, offset=<0, 0>, "
465
466
" rotation=0π, size_jitter=<0, 0>, offset_jitter=<0, 0>, "
466
467
" rotation_jitter=0π, opacity=1, animation_frames=1, animation_rows=1, "
@@ -507,14 +508,14 @@ TEST(BrushPaintTest, StringifyBrushPaint) {
507
508
EXPECT_EQ (
508
509
absl::StrCat (BrushPaint{
509
510
.texture_layers = {{.client_texture_id = std::string (kTestTextureId ),
510
- .mapping = BrushPaint::TextureMapping::kWinding ,
511
+ .mapping = BrushPaint::TextureMapping::kStamping ,
511
512
.size_unit =
512
513
BrushPaint::TextureSizeUnit::kBrushSize ,
513
514
.size = {3 , 5 },
514
515
.offset = {2 , 0.2 },
515
516
.blend_mode = BrushPaint::BlendMode::kSrcIn }}}),
516
517
" BrushPaint{texture_layers={TextureLayer{client_texture_id=test-texture, "
517
- " mapping=kWinding , origin=kStrokeSpaceOrigin, size_unit=kBrushSize, "
518
+ " mapping=kStamping , origin=kStrokeSpaceOrigin, size_unit=kBrushSize, "
518
519
" wrap_x=kRepeat, wrap_y=kRepeat, size=<3, 5>, offset=<2, 0.2>, "
519
520
" rotation=0π, size_jitter=<0, 0>, offset_jitter=<0, 0>, "
520
521
" rotation_jitter=0π, opacity=1, animation_frames=1, animation_rows=1, "
@@ -523,15 +524,15 @@ TEST(BrushPaintTest, StringifyBrushPaint) {
523
524
EXPECT_EQ (
524
525
absl::StrCat (BrushPaint{
525
526
.texture_layers = {{.client_texture_id = std::string (kTestTextureId ),
526
- .mapping = BrushPaint::TextureMapping::kWinding ,
527
+ .mapping = BrushPaint::TextureMapping::kStamping ,
527
528
.size_unit =
528
529
BrushPaint::TextureSizeUnit::kBrushSize ,
529
530
.size = {3 , 5 },
530
531
.offset = {2 , 0.2 },
531
532
.rotation = kQuarterTurn ,
532
533
.opacity = 0.6 }}}),
533
534
" BrushPaint{texture_layers={TextureLayer{client_texture_id=test-texture, "
534
- " mapping=kWinding , origin=kStrokeSpaceOrigin, size_unit=kBrushSize, "
535
+ " mapping=kStamping , origin=kStrokeSpaceOrigin, size_unit=kBrushSize, "
535
536
" wrap_x=kRepeat, wrap_y=kRepeat, size=<3, 5>, offset=<2, 0.2>, "
536
537
" rotation=0.5π, size_jitter=<0, 0>, offset_jitter=<0, 0>, "
537
538
" rotation_jitter=0π, opacity=0.6, animation_frames=1, animation_rows=1, "
@@ -540,7 +541,7 @@ TEST(BrushPaintTest, StringifyBrushPaint) {
540
541
EXPECT_EQ (
541
542
absl::StrCat (BrushPaint{
542
543
.texture_layers = {{.client_texture_id = std::string (kTestTextureId ),
543
- .mapping = BrushPaint::TextureMapping::kWinding ,
544
+ .mapping = BrushPaint::TextureMapping::kStamping ,
544
545
.size_unit =
545
546
BrushPaint::TextureSizeUnit::kBrushSize ,
546
547
.size = {3 , 5 },
@@ -552,7 +553,7 @@ TEST(BrushPaintTest, StringifyBrushPaint) {
552
553
.opacity = 0.6 ,
553
554
.blend_mode = BrushPaint::BlendMode::kSrcIn }}}),
554
555
" BrushPaint{texture_layers={TextureLayer{client_texture_id=test-texture, "
555
- " mapping=kWinding , origin=kStrokeSpaceOrigin, size_unit=kBrushSize, "
556
+ " mapping=kStamping , origin=kStrokeSpaceOrigin, size_unit=kBrushSize, "
556
557
" wrap_x=kRepeat, wrap_y=kRepeat, size=<3, 5>, offset=<2, 0.2>, "
557
558
" rotation=0.5π, size_jitter=<0.1, 0.2>, offset_jitter=<0.7, 0.3>, "
558
559
" rotation_jitter=0.125π, opacity=0.6, animation_frames=1, "
@@ -562,7 +563,7 @@ TEST(BrushPaintTest, StringifyBrushPaint) {
562
563
absl::StrCat (BrushPaint{
563
564
.texture_layers =
564
565
{{.client_texture_id = std::string (kTestTextureId ),
565
- .mapping = BrushPaint::TextureMapping::kWinding ,
566
+ .mapping = BrushPaint::TextureMapping::kStamping ,
566
567
.size_unit = BrushPaint::TextureSizeUnit::kBrushSize ,
567
568
.size = {3 , 5 },
568
569
.offset = {2 , 0.2 },
@@ -577,7 +578,7 @@ TEST(BrushPaintTest, StringifyBrushPaint) {
577
578
.rotation = kQuarterTurn ,
578
579
.opacity = 0.6 }}}}}),
579
580
" BrushPaint{texture_layers={TextureLayer{client_texture_id=test-texture, "
580
- " mapping=kWinding , origin=kStrokeSpaceOrigin, size_unit=kBrushSize, "
581
+ " mapping=kStamping , origin=kStrokeSpaceOrigin, size_unit=kBrushSize, "
581
582
" wrap_x=kRepeat, wrap_y=kRepeat, size=<3, 5>, offset=<2, 0.2>, "
582
583
" rotation=0.5π, size_jitter=<0.1, 0.2>, offset_jitter=<0.7, 0.3>, "
583
584
" rotation_jitter=0.125π, opacity=0.6, animation_frames=1, "
@@ -588,7 +589,7 @@ TEST(BrushPaintTest, StringifyBrushPaint) {
588
589
absl::StrCat (BrushPaint{
589
590
.texture_layers =
590
591
{{.client_texture_id = std::string (kTestTextureId ),
591
- .mapping = BrushPaint::TextureMapping::kWinding ,
592
+ .mapping = BrushPaint::TextureMapping::kStamping ,
592
593
.size_unit = BrushPaint::TextureSizeUnit::kBrushSize ,
593
594
.size = {3 , 5 },
594
595
.offset = {2 , 0.2 },
@@ -611,7 +612,7 @@ TEST(BrushPaintTest, StringifyBrushPaint) {
611
612
.opacity = 0.4 }},
612
613
.blend_mode = BrushPaint::BlendMode::kDstIn }}}),
613
614
" BrushPaint{texture_layers={TextureLayer{client_texture_id=test-texture, "
614
- " mapping=kWinding , origin=kStrokeSpaceOrigin, size_unit=kBrushSize, "
615
+ " mapping=kStamping , origin=kStrokeSpaceOrigin, size_unit=kBrushSize, "
615
616
" wrap_x=kRepeat, wrap_y=kRepeat, size=<3, 5>, offset=<2, 0.2>, "
616
617
" rotation=0.5π, size_jitter=<0.1, 0.2>, offset_jitter=<0.7, 0.3>, "
617
618
" rotation_jitter=0.125π, opacity=0.6, animation_frames=1, "
@@ -788,7 +789,7 @@ TEST(BrushPaintTest, MismatchedTextureMappings) {
788
789
{{.client_texture_id = std::string (kTestTextureId ),
789
790
.mapping = BrushPaint::TextureMapping::kTiling },
790
791
{.client_texture_id = std::string (kTestTextureId ),
791
- .mapping = BrushPaint::TextureMapping::kWinding }}}),
792
+ .mapping = BrushPaint::TextureMapping::kStamping }}}),
792
793
StatusIs (absl::StatusCode::kInvalidArgument ,
793
794
HasSubstr (" TextureLayer::mapping` must be the same" )));
794
795
}
0 commit comments