Mercurial > ldforge / changeset

--- a/src/basics.h	Wed Feb 17 00:47:48 2016 +0200
+++ b/src/basics.h	Wed Feb 17 00:54:02 2016 +0200
@@ -188,7 +188,7 @@
 extern const Vertex Origin;
 extern const Matrix IdentityMatrix;
 
-static const double Pi = 3.14159265358979323846;
+static const double pi = 3.14159265358979323846;
 
 
 // =============================================================================

--- a/src/editmodes/circleMode.cpp	Wed Feb 17 00:47:48 2016 +0200
+++ b/src/editmodes/circleMode.cpp	Wed Feb 17 00:54:02 2016 +0200
@@ -206,7 +206,7 @@
 	double angleoffset (-bearing.angleTo (bearing2) + 90);
 	angleoffset /= (360.0 / divisions); // convert angle to 0-16 scale
 	angleoffset = round (angleoffset); // round to nearest 16th
-	angleoffset *= ((2 * Pi) / divisions); // convert to radians
+	angleoffset *= ((2 * pi) / divisions); // convert to radians
 	angleoffset *= renderer()->depthNegateFactor(); // negate based on camera
 	return angleoffset;
 }
@@ -230,7 +230,7 @@
 	const double outerdistance (m_drawedVerts.size() >= 2 ? getCircleDrawDist (1) : -1);
 	const int divisions (m_window->ringToolHiRes() ? HighResolution : LowResolution);
 	const int segments (m_window->ringToolSegments());
-	const double angleUnit (2 * Pi / divisions);
+	const double angleUnit (2 * pi / divisions);
 	Axis relX, relY;
 	renderer()->getRelativeAxes (relX, relY);
 	const double angleoffset (m_drawedVerts.size() < 3 ? getAngleOffset() : m_angleOffset);

--- a/src/grid.cpp	Wed Feb 17 00:47:48 2016 +0200
+++ b/src/grid.cpp	Wed Feb 17 00:54:02 2016 +0200
@@ -64,7 +64,7 @@
 
 qreal Grid::angleAsRadians() const
 {
-	return (Pi * angleSnap()) / 180;
+	return (pi * angleSnap()) / 180;
 }
 
 

--- a/src/primitives.cpp	Wed Feb 17 00:47:48 2016 +0200
+++ b/src/primitives.cpp	Wed Feb 17 00:54:02 2016 +0200
@@ -260,7 +260,7 @@
 
 double getRadialPoint(int i, int divs, double(*func)(double))
 {
-	return (*func)((i * 2 * Pi) / divs);
+	return (*func)((i * 2 * pi) / divs);
 };
 
 

--- a/src/toolsets/movetoolset.cpp	Wed Feb 17 00:47:48 2016 +0200
+++ b/src/toolsets/movetoolset.cpp	Wed Feb 17 00:54:02 2016 +0200
@@ -103,7 +103,7 @@
 
 double MoveToolset::getRotateActionAngle()
 {
-	return (Pi * grid()->angleSnap()) / 180;
+	return (pi * grid()->angleSnap()) / 180;
 }
 
 void MoveToolset::rotateXPos()