mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Cleanup: shorter syntax

pull/13515/head
Susan 2025-02-14 15:46:16 +00:00
parent 4e0fdbb3cf
commit acaf74c7b7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tree_cmd.cpp
View File

@ -240,14 +240,14 @@ static const double PHASE_DIVISOR = INT32_MAX / (M_PI * 2); ///< Valid values f
*/ */
std::array<Point, GROVE_RESOLUTION> CreateRandomStarShapedPolygon(const int radius) std::array<Point, GROVE_RESOLUTION> CreateRandomStarShapedPolygon(const int radius)
{ {
std::array<BlobHarmonic, GROVE_HARMONICS_COUNT> harmonics;
/* These values are ones i found in my testing that result in suitable-looking polygons that did not self-intersect and fit within a square of radius * radius dimensions. */ /* These values are ones i found in my testing that result in suitable-looking polygons that did not self-intersect and fit within a square of radius * radius dimensions. */
harmonics.at(0) = BlobHarmonic(radius / 2, Random() / PHASE_DIVISOR, 1); std::array<BlobHarmonic, GROVE_HARMONICS_COUNT> harmonics = {
harmonics.at(1) = BlobHarmonic(radius / 4, Random() / PHASE_DIVISOR, 2); BlobHarmonic(radius / 2, Random() / PHASE_DIVISOR, 1),
harmonics.at(2) = BlobHarmonic(radius / 8, Random() / PHASE_DIVISOR, 3); BlobHarmonic(radius / 4, Random() / PHASE_DIVISOR, 2),
harmonics.at(3) = BlobHarmonic(radius / 16, Random() / PHASE_DIVISOR, 4); BlobHarmonic(radius / 8, Random() / PHASE_DIVISOR, 3),
BlobHarmonic(radius / 16, Random() / PHASE_DIVISOR, 4),
};
return CreateStarShapedPolygon(radius, harmonics); return CreateStarShapedPolygon(radius, harmonics);
} }
@ -260,6 +260,7 @@ std::array<Point, GROVE_RESOLUTION> CreateRandomStarShapedPolygon(const int radi
* @param vertex0 * @param vertex0
* @param vertex1 * @param vertex1
* @param vertex2 the triangle to check against. * @param vertex2 the triangle to check against.
* @returns true if the given coordinates lie within a triangle.
*/ */
bool IsPointInTriangle(const int x, const int y, Point vertex0, Point vertex1, Point vertex2) bool IsPointInTriangle(const int x, const int y, Point vertex0, Point vertex1, Point vertex2)
{ {