diff --git a/src/Magnum/Primitives/Circle.cpp b/src/Magnum/Primitives/Circle.cpp index 73a7e5ac3..0aef42ee9 100644 --- a/src/Magnum/Primitives/Circle.cpp +++ b/src/Magnum/Primitives/Circle.cpp @@ -43,7 +43,7 @@ Trade::MeshData2D Circle::solid(UnsignedInt segments) { positions.emplace_back(); /* Points on circle */ - const Rad angleIncrement(2*Constants::pi()/segments); + const Rad angleIncrement(Constants::tau()/segments); for(UnsignedInt i = 0; i != segments; ++i) { const Rad angle(Float(i)*angleIncrement); positions.emplace_back(Math::cos(angle), Math::sin(angle)); @@ -60,7 +60,7 @@ Trade::MeshData2D Circle::wireframe(UnsignedInt segments) { positions.reserve(segments); /* Points on circle */ - const Rad angleIncrement(2*Constants::pi()/segments); + const Rad angleIncrement(Constants::tau()/segments); for(UnsignedInt i = 0; i != segments; ++i) { const Rad angle(Float(i)*angleIncrement); positions.emplace_back(Math::cos(angle), Math::sin(angle)); diff --git a/src/Magnum/Primitives/Implementation/Spheroid.cpp b/src/Magnum/Primitives/Implementation/Spheroid.cpp index f8caf4684..2210af6cc 100644 --- a/src/Magnum/Primitives/Implementation/Spheroid.cpp +++ b/src/Magnum/Primitives/Implementation/Spheroid.cpp @@ -43,7 +43,7 @@ void Spheroid::capVertex(Float y, Float normalY, Float textureCoordsV) { } void Spheroid::hemisphereVertexRings(UnsignedInt count, Float centerY, Rad startRingAngle, Rad ringAngleIncrement, Float startTextureCoordsV, Float textureCoordsVIncrement) { - Rad segmentAngleIncrement(2*Constants::pi()/segments); + Rad segmentAngleIncrement(Constants::tau()/segments); Float x, y, z; for(UnsignedInt i = 0; i != count; ++i) { Rad ringAngle = startRingAngle + Float(i)*ringAngleIncrement; @@ -69,7 +69,7 @@ void Spheroid::hemisphereVertexRings(UnsignedInt count, Float centerY, Rad start } void Spheroid::cylinderVertexRings(UnsignedInt count, Float startY, Float yIncrement, Float startTextureCoordsV, Float textureCoordsVIncrement) { - Rad segmentAngleIncrement(2*Constants::pi()/segments); + Rad segmentAngleIncrement(Constants::tau()/segments); for(UnsignedInt i = 0; i != count; ++i) { for(UnsignedInt j = 0; j != segments; ++j) { Rad segmentAngle = Float(j)*segmentAngleIncrement; @@ -143,7 +143,7 @@ void Spheroid::topFaceRing() { } void Spheroid::capVertexRing(Float y, Float textureCoordsV, const Vector3& normal) { - Rad segmentAngleIncrement(2*Constants::pi()/segments); + Rad segmentAngleIncrement(Constants::tau()/segments); for(UnsignedInt i = 0; i != segments; ++i) { Rad segmentAngle = Float(i)*segmentAngleIncrement;