From 39eed3f7d6938335430c66f4d02456e78d7a1906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 17 Mar 2013 22:29:18 +0100 Subject: [PATCH] Code cleanup: shorter angle initializers. --- src/Primitives/Capsule.cpp | 6 +++--- src/Primitives/Cylinder.cpp | 2 +- src/Primitives/UVSphere.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Primitives/Capsule.cpp b/src/Primitives/Capsule.cpp index fdab14a66..e35ecb34f 100644 --- a/src/Primitives/Capsule.cpp +++ b/src/Primitives/Capsule.cpp @@ -34,7 +34,7 @@ Capsule::Capsule(UnsignedInt hemisphereRings, UnsignedInt cylinderRings, Unsigne Float height = 2.0f+length; Float hemisphereTextureCoordsVIncrement = 1.0f/(hemisphereRings*height); - Rad hemisphereRingAngleIncrement = Rad(Constants::pi())/(2*hemisphereRings); + Rad hemisphereRingAngleIncrement(Constants::pi()/(2*hemisphereRings)); /* Bottom cap vertex */ capVertex(-height/2, -1.0f, 0.0f); @@ -68,7 +68,7 @@ void Capsule::capVertex(Float y, Float normalY, Float textureCoordsV) { } void Capsule::hemisphereVertexRings(UnsignedInt count, Float centerY, Rad startRingAngle, Rad ringAngleIncrement, Float startTextureCoordsV, Float textureCoordsVIncrement) { - Rad segmentAngleIncrement = 2*Rad(Constants::pi())/segments; + Rad segmentAngleIncrement(2*Constants::pi()/segments); Float x, y, z; for(UnsignedInt i = 0; i != count; ++i) { Rad ringAngle = startRingAngle + i*ringAngleIncrement; @@ -94,7 +94,7 @@ void Capsule::hemisphereVertexRings(UnsignedInt count, Float centerY, Rad startR } void Capsule::cylinderVertexRings(UnsignedInt count, Float startY, Float yIncrement, Float startTextureCoordsV, Float textureCoordsVIncrement) { - Rad segmentAngleIncrement = 2*Rad(Constants::pi())/segments; + Rad segmentAngleIncrement(2*Constants::pi()/segments); for(UnsignedInt i = 0; i != count; ++i) { for(UnsignedInt j = 0; j != segments; ++j) { Rad segmentAngle = j*segmentAngleIncrement; diff --git a/src/Primitives/Cylinder.cpp b/src/Primitives/Cylinder.cpp index 1a924b0d3..691e5402b 100644 --- a/src/Primitives/Cylinder.cpp +++ b/src/Primitives/Cylinder.cpp @@ -57,7 +57,7 @@ Cylinder::Cylinder(UnsignedInt rings, UnsignedInt segments, Float length, Flags } void Cylinder::capVertexRing(Float y, Float textureCoordsV, const Vector3& normal) { - Rad segmentAngleIncrement = 2*Rad(Constants::pi())/segments; + Rad segmentAngleIncrement(2*Constants::pi()/segments); for(UnsignedInt i = 0; i != segments; ++i) { Rad segmentAngle = i*segmentAngleIncrement; diff --git a/src/Primitives/UVSphere.cpp b/src/Primitives/UVSphere.cpp index 91fa8c2bc..b6cde4ca3 100644 --- a/src/Primitives/UVSphere.cpp +++ b/src/Primitives/UVSphere.cpp @@ -32,7 +32,7 @@ UVSphere::UVSphere(UnsignedInt rings, UnsignedInt segments, TextureCoords textur CORRADE_ASSERT(rings >= 2 && segments >= 3, "UVSphere must have at least two rings and three segments", ); Float textureCoordsVIncrement = 1.0f/rings; - Rad ringAngleIncrement = Rad(Constants::pi())/rings; + Rad ringAngleIncrement(Constants::pi()/rings); /* Bottom cap vertex */ capVertex(-1.0f, -1.0f, 0.0f);