Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 16fa52d

Browse files
flarflar
committed
style feedback from review
1 parent aeef542 commit 16fa52d

File tree

4 files changed

+63
-56
lines changed

4 files changed

+63
-56
lines changed

‎impeller/entity/geometry/ellipse_geometry.cc

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,22 @@ GeometryResult EllipseGeometry::GetPositionBuffer(
2222

2323
Scalar radius = radius_;
2424
const Point& center = center_;
25-
std::shared_ptr<Tessellator> t = renderer.GetTessellator();
26-
CircleTessellator tessellator(t, entity.GetTransform(), radius_);
27-
size_t count = tessellator.GetCircleVertexCount();
28-
auto vertex_buffer =
29-
host_buffer.Emplace(count * sizeof(VT), alignof(VT),
30-
[&tessellator, &center, radius](uint8_t* buffer) {
31-
auto vertices = reinterpret_cast<VT*>(buffer);
32-
tessellator.GenerateCircleTriangleStrip(
33-
[&vertices](const Point& p) { //
34-
*vertices++ = {
35-
.position = p,
36-
};
37-
},
38-
center, radius);
39-
});
25+
std::shared_ptr<Tessellator> tessellator = renderer.GetTessellator();
26+
CircleTessellator circle_tessellator(tessellator, entity.GetTransform(),
27+
radius_);
28+
size_t count = circle_tessellator.GetCircleVertexCount();
29+
auto vertex_buffer = host_buffer.Emplace(
30+
count * sizeof(VT), alignof(VT),
31+
[&circle_tessellator, &center, radius](uint8_t* buffer) {
32+
auto vertices = reinterpret_cast<VT*>(buffer);
33+
circle_tessellator.GenerateCircleTriangleStrip(
34+
[&vertices](const Point& p) { //
35+
*vertices++ = {
36+
.position = p,
37+
};
38+
},
39+
center, radius);
40+
});
4041

4142
return GeometryResult{
4243
.type = PrimitiveType::kTriangleStrip,
@@ -66,14 +67,15 @@ GeometryResult EllipseGeometry::GetPositionUVBuffer(
6667

6768
Scalar radius = radius_;
6869
const Point& center = center_;
69-
std::shared_ptr<Tessellator> t = renderer.GetTessellator();
70-
CircleTessellator tessellator(t, entity.GetTransform(), radius_);
71-
size_t count = tessellator.GetCircleVertexCount();
70+
std::shared_ptr<Tessellator> tessellator = renderer.GetTessellator();
71+
CircleTessellator circle_tessellator(tessellator, entity.GetTransform(),
72+
radius_);
73+
size_t count = circle_tessellator.GetCircleVertexCount();
7274
auto vertex_buffer = host_buffer.Emplace(
7375
count * sizeof(VT), alignof(VT),
74-
[&tessellator, &uv_transform, &center, radius](uint8_t* buffer) {
76+
[&circle_tessellator, &uv_transform, &center, radius](uint8_t* buffer) {
7577
auto vertices = reinterpret_cast<VT*>(buffer);
76-
tessellator.GenerateCircleTriangleStrip(
78+
circle_tessellator.GenerateCircleTriangleStrip(
7779
[&vertices, &uv_transform](const Point& p) { //
7880
*vertices++ = {
7981
.position = p,
@@ -91,7 +93,6 @@ GeometryResult EllipseGeometry::GetPositionUVBuffer(
9193
.vertex_count = count,
9294
.index_type = IndexType::kNone,
9395
},
94-
// .vertex_buffer = vtx_builder.CreateVertexBuffer(host_buffer),
9596
.transform = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
9697
entity.GetTransform(),
9798
.prevent_overdraw = false,

‎impeller/entity/geometry/line_geometry.cc

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,22 @@ GeometryResult LineGeometry::GetPositionBuffer(const ContentContext& renderer,
8080
const Point& p0 = p0_;
8181
const Point& p1 = p1_;
8282

83-
std::shared_ptr<Tessellator> t = renderer.GetTessellator();
84-
CircleTessellator tessellator(t, entity.GetTransform(), radius);
85-
count = tessellator.GetCircleVertexCount();
86-
vertex_buffer =
87-
host_buffer.Emplace(count * sizeof(VT), alignof(VT),
88-
[&tessellator, &p0, &p1, radius](uint8_t* buffer) {
89-
auto vertices = reinterpret_cast<VT*>(buffer);
90-
tessellator.GenerateRoundCapLineTriangleStrip(
91-
[&vertices](const Point& p) { //
92-
*vertices++ = {
93-
.position = p,
94-
};
95-
},
96-
p0, p1, radius);
97-
});
83+
std::shared_ptr<Tessellator> tessellator = renderer.GetTessellator();
84+
CircleTessellator circle_tessellator(tessellator, entity.GetTransform(),
85+
radius);
86+
count = circle_tessellator.GetCircleVertexCount();
87+
vertex_buffer = host_buffer.Emplace(
88+
count * sizeof(VT), alignof(VT),
89+
[&circle_tessellator, &p0, &p1, radius](uint8_t* buffer) {
90+
auto vertices = reinterpret_cast<VT*>(buffer);
91+
circle_tessellator.GenerateRoundCapLineTriangleStrip(
92+
[&vertices](const Point& p) { //
93+
*vertices++ = {
94+
.position = p,
95+
};
96+
},
97+
p0, p1, radius);
98+
});
9899
} else {
99100
Point corners[4];
100101
if (ComputeCorners(corners, transform, cap_ == Cap::kSquare)) {
@@ -148,14 +149,16 @@ GeometryResult LineGeometry::GetPositionUVBuffer(Rect texture_coverage,
148149
const Point& p0 = p0_;
149150
const Point& p1 = p1_;
150151

151-
std::shared_ptr<Tessellator> t = renderer.GetTessellator();
152-
CircleTessellator tessellator(t, entity.GetTransform(), radius);
153-
count = tessellator.GetCircleVertexCount();
152+
std::shared_ptr<Tessellator> tessellator = renderer.GetTessellator();
153+
CircleTessellator circle_tessellator(tessellator, entity.GetTransform(),
154+
radius);
155+
count = circle_tessellator.GetCircleVertexCount();
154156
vertex_buffer = host_buffer.Emplace(
155157
count * sizeof(VT), alignof(VT),
156-
[&tessellator, &uv_transform, &p0, &p1, radius](uint8_t* buffer) {
158+
[&circle_tessellator, &uv_transform, &p0, &p1,
159+
radius](uint8_t* buffer) {
157160
auto vertices = reinterpret_cast<VT*>(buffer);
158-
tessellator.GenerateRoundCapLineTriangleStrip(
161+
circle_tessellator.GenerateRoundCapLineTriangleStrip(
159162
[&vertices, &uv_transform](const Point& p) { //
160163
*vertices++ = {
161164
.position = p,

‎impeller/entity/geometry/point_field_geometry.cc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,21 @@ PointFieldGeometry::GetPositionBufferCPU(const ContentContext& renderer,
8383
VertexBufferBuilder<SolidFillVertexShader::PerVertexData> vtx_builder;
8484

8585
if (round_) {
86-
std::shared_ptr<Tessellator> t = renderer.GetTessellator();
87-
CircleTessellator tessellator(t, entity.GetTransform(), radius_);
86+
std::shared_ptr<Tessellator> tessellator = renderer.GetTessellator();
87+
CircleTessellator circle_tessellator(tessellator, entity.GetTransform(),
88+
radius_);
8889

8990
// Get triangulation relative to {0, 0} so we can translate it to each
9091
// point in turn.
9192
std::vector<Point> circle_vertices;
92-
circle_vertices.reserve(tessellator.GetCircleVertexCount());
93-
tessellator.GenerateCircleTriangleStrip(
93+
circle_vertices.reserve(circle_tessellator.GetCircleVertexCount());
94+
circle_tessellator.GenerateCircleTriangleStrip(
9495
[&circle_vertices](const Point& p) { //
9596
circle_vertices.push_back(p);
9697
},
9798
{}, radius);
98-
FML_DCHECK(circle_vertices.size() == tessellator.GetCircleVertexCount());
99+
FML_DCHECK(circle_vertices.size() ==
100+
circle_tessellator.GetCircleVertexCount());
99101

100102
vtx_builder.Reserve((circle_vertices.size() + 2) * points_.size() - 2);
101103
for (auto& center : points_) {

‎impeller/tessellator/circle_tessellator_unittests.cc

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ namespace impeller {
1212
namespace testing {
1313

1414
TEST(CircleTessellator, DivisionVertexCounts) {
15-
auto t = std::make_shared<Tessellator>();
15+
auto tessellator = std::make_shared<Tessellator>();
1616

17-
auto test = [&t](const Matrix& transform, Scalar radius) {
18-
CircleTessellator tessellator(t, transform, radius);
19-
size_t quadrant_divisions = tessellator.GetQuadrantDivisionCount();
17+
auto test = [&tessellator](const Matrix& transform, Scalar radius) {
18+
CircleTessellator circle_tessellator(tessellator, transform, radius);
19+
size_t quadrant_divisions = circle_tessellator.GetQuadrantDivisionCount();
2020

21-
EXPECT_EQ(tessellator.GetCircleVertexCount(), (quadrant_divisions + 1) * 4)
21+
EXPECT_EQ(circle_tessellator.GetCircleVertexCount(),
22+
(quadrant_divisions + 1) * 4)
2223
<< "transform = " << transform << ", radius = " << radius;
2324

2425
// Confirm the approximation error is within the currently accepted
@@ -51,14 +52,14 @@ TEST(CircleTessellator, DivisionVertexCounts) {
5152
}
5253

5354
TEST(CircleTessellator, CircleTessellationVertices) {
54-
auto t = std::make_shared<Tessellator>();
55+
auto tessellator = std::make_shared<Tessellator>();
5556

56-
auto test = [&t](Scalar pixel_radius, Point center, Scalar radius) {
57-
CircleTessellator tessellator(t, {}, pixel_radius);
57+
auto test = [&tessellator](Scalar pixel_radius, Point center, Scalar radius) {
58+
CircleTessellator circle_tessellator(tessellator, {}, pixel_radius);
5859

59-
auto vertex_count = tessellator.GetCircleVertexCount();
60+
auto vertex_count = circle_tessellator.GetCircleVertexCount();
6061
auto vertices = std::vector<Point>();
61-
tessellator.GenerateCircleTriangleStrip(
62+
circle_tessellator.GenerateCircleTriangleStrip(
6263
[&vertices](const Point& p) { //
6364
vertices.push_back(p);
6465
},

0 commit comments

Comments
 (0)