Skip to content

Commit 96cb0d4

Browse files
author
tpat
committed
Changed loop style. Gave points more descriptive name
1 parent bed265d commit 96cb0d4

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

src/Graphics/Glyphs/GlyphGeom.cc

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -800,27 +800,26 @@ void GlyphGeom::generateBox(const Point& center, Tensor& t, double scale, ColorR
800800
generateTransforms(center, eigvectors[0], eigvectors[1], eigvectors[2], trans, rotate);
801801

802802
// Rotate and translate points
803-
std::vector<Vector> points;
804-
for(int x = -1; x < 2; x+=2)
803+
std::vector<Vector> box_points;
804+
for(int x : {-1, 1})
805805
{
806-
for(int y = -1; y < 2; y+=2)
806+
for(int y : {-1, 1})
807807
{
808-
for(int z = -1; z < 2; z+=2)
808+
for(int z : {-1, 1})
809809
{
810-
Point translated_point = trans * Point(x * eigvals.x(), y * eigvals.y(), z * eigvals.z());
811-
points.push_back(Vector(translated_point));
810+
box_points.emplace_back(trans * Point(x * eigvals.x(), y * eigvals.y(), z * eigvals.z()));
812811
}
813812
}
814813
}
815814

816815
std::vector<Vector> column_vectors = rotate.get_column_vectors();
817816

818-
generateBoxSide(points[5], points[4], points[7], points[6], column_vectors[0], node_color);
819-
generateBoxSide(points[7], points[6], points[3], points[2], column_vectors[1], node_color);
820-
generateBoxSide(points[1], points[5], points[3], points[7], column_vectors[2], node_color);
821-
generateBoxSide(points[3], points[2], points[1], points[0], -column_vectors[0], node_color);
822-
generateBoxSide(points[1], points[0], points[5], points[4], -column_vectors[1], node_color);
823-
generateBoxSide(points[2], points[6], points[0], points[4], -column_vectors[2], node_color);
817+
generateBoxSide(box_points[5], box_points[4], box_points[7], box_points[6], column_vectors[0], node_color);
818+
generateBoxSide(box_points[7], box_points[6], box_points[3], box_points[2], column_vectors[1], node_color);
819+
generateBoxSide(box_points[1], box_points[5], box_points[3], box_points[7], column_vectors[2], node_color);
820+
generateBoxSide(box_points[3], box_points[2], box_points[1], box_points[0], -column_vectors[0], node_color);
821+
generateBoxSide(box_points[1], box_points[0], box_points[5], box_points[4], -column_vectors[1], node_color);
822+
generateBoxSide(box_points[2], box_points[6], box_points[0], box_points[4], -column_vectors[2], node_color);
824823
}
825824

826825
void GlyphGeom::generateBoxSide(const Vector& p1, const Vector& p2, const Vector& p3, const Vector& p4,

0 commit comments

Comments
 (0)