Move fixed-point PI into precision-specific template constants

Author: sam52796

src/fixed.h

@@ -13,6 +13,7 @@ class fixedf {
 public:
 	static const int FRAC = FRAC_BITS;
 	static const Uint64 MASK = (Uint64(1UL) << FRAC_BITS) - 1;
+	static const fixedf PI;
 
 	fixedf() :
 		v(0) {}
@@ -251,4 +252,10 @@ class fixedf {
 
 typedef fixedf<32> fixed;
 
+template<>
+constexpr fixed fixed::PI = fixed(103993, 33102);
+
+template<>
+constexpr fixedf<48> fixedf<48>::PI = fixedf<48>(103993, 33102);
+
 #endif /* _FIXED_H */

src/galaxy/CustomSystem.cpp

@@ -1125,9 +1125,9 @@ void CustomSystemsDatabase::RunLuaSystemSanityChecks(CustomSystem *csys)
 				star_B->m_inclination = star_A->m_inclination;
 				star_B->m_argOfPeriapsis = star_A->m_argOfPeriapsis;
 
-				star_B->m_orbitalPhaseAtStart = star_A->m_orbitalPhaseAtStart + FIXED_PI;
-				if (star_B->m_orbitalPhaseAtStart > fixed(2, 1) * FIXED_PI)
-					star_B->m_orbitalPhaseAtStart -= fixed(2, 1) * FIXED_PI;
+				star_B->m_orbitalPhaseAtStart = star_A->m_orbitalPhaseAtStart + fixed::PI;
+				if (star_B->m_orbitalPhaseAtStart > fixed(2, 1) * fixed::PI)
+					star_B->m_orbitalPhaseAtStart -= fixed(2, 1) * fixed::PI;
 			}
 		}
 	}

src/galaxy/StarSystemGenerator.cpp

@@ -1147,19 +1147,19 @@ SystemBody *StarSystemRandomGenerator::MakeBodyInOrbitSlice(Random &rand, StarSy
 	planet->m_rotationPeriod = fixed(rand.Int32(1, 200), 24);
 
 	// longitude of ascending node
-	planet->m_orbitalOffset = rand.Fixed() * 2 * FIXED_PI;
+	planet->m_orbitalOffset = rand.Fixed() * 2 * fixed::PI;
 	// inclination in the hemisphere above the equator, low probability of high-inclination orbits
 	fixed incl_scale = rand.Fixed() * fixed(666, 1000);
-	planet->m_inclination = rand.NormFixed().Abs() * incl_scale * FIXED_PI * fixed(1, 2);
+	planet->m_inclination = rand.NormFixed().Abs() * incl_scale * fixed::PI * fixed(1, 2);
 	// argument of periapsis, interval -PI .. PI
-	planet->m_argOfPeriapsis = rand.NormFixed() * FIXED_PI;
+	planet->m_argOfPeriapsis = rand.NormFixed() * fixed::PI;
 
 	// rare chance of reversed orbit
 	if (rand.Fixed() < fixed(1, 20))
-		planet->m_inclination = FIXED_PI - planet->m_inclination;
+		planet->m_inclination = fixed::PI - planet->m_inclination;
 
 	// true anomaly as rotation beyond periapsis
-	planet->m_orbitalPhaseAtStart = rand.Fixed() * 2 * FIXED_PI;
+	planet->m_orbitalPhaseAtStart = rand.Fixed() * 2 * fixed::PI;
 
 	planet->SetOrbitFromParameters();
 	planet->SetAtmFromParameters();
@@ -1271,10 +1271,10 @@ void StarSystemRandomGenerator::MakeBinaryPair(SystemBody *a, SystemBody *b, fix
 	b->m_orbit.SetPlane(matrix3x3d::RotateY(rotY - M_PI) * matrix3x3d::RotateX(rotX));
 
 	// store orbit parameters for later use to be accessible in other way than by rotMatrix
-	b->m_orbitalPhaseAtStart = b->m_orbitalPhaseAtStart + FIXED_PI;
-	b->m_orbitalPhaseAtStart = b->m_orbitalPhaseAtStart > 2 * FIXED_PI ? b->m_orbitalPhaseAtStart - 2 * FIXED_PI : b->m_orbitalPhaseAtStart;
-	a->m_orbitalPhaseAtStart = a->m_orbitalPhaseAtStart > 2 * FIXED_PI ? a->m_orbitalPhaseAtStart - 2 * FIXED_PI : a->m_orbitalPhaseAtStart;
-	a->m_orbitalPhaseAtStart = a->m_orbitalPhaseAtStart < 0 ? a->m_orbitalPhaseAtStart + 2 * FIXED_PI : a->m_orbitalPhaseAtStart;
+	b->m_orbitalPhaseAtStart = b->m_orbitalPhaseAtStart + fixed::PI;
+	b->m_orbitalPhaseAtStart = b->m_orbitalPhaseAtStart > 2 * fixed::PI ? b->m_orbitalPhaseAtStart - 2 * fixed::PI : b->m_orbitalPhaseAtStart;
+	a->m_orbitalPhaseAtStart = a->m_orbitalPhaseAtStart > 2 * fixed::PI ? a->m_orbitalPhaseAtStart - 2 * fixed::PI : a->m_orbitalPhaseAtStart;
+	a->m_orbitalPhaseAtStart = a->m_orbitalPhaseAtStart < 0 ? a->m_orbitalPhaseAtStart + 2 * fixed::PI : a->m_orbitalPhaseAtStart;
 	b->m_orbitalOffset = fixed(int(round(rotY * 10000)), 10000);
 	a->m_orbitalOffset = fixed(int(round(rotY * 10000)), 10000);
 
@@ -1450,8 +1450,8 @@ void PopulateStarSystemGenerator::PositionSettlementOnPlanet(SystemBody *sbody,
 
 	// store latitude and longitude to equivalent orbital parameters to
 	// be accessible easier
-	sbody->m_inclination = latitude * FIXED_PI * fixed(1, 2);
-	sbody->m_orbitalOffset = longitude * FIXED_PI * 2;
+	sbody->m_inclination = latitude * fixed::PI * fixed(1, 2);
+	sbody->m_orbitalOffset = longitude * fixed::PI * 2;
 
 	sbody->SetOrbitFromParameters();
 }
@@ -1714,12 +1714,12 @@ void PopulateStarSystemGenerator::PopulateAddStations(SystemBody *sbody, StarSys
 				shells[1] = innerOrbit + ((orbMaxS - innerOrbit) * fixed(1, 2)); // med
 				shells[2] = orbMaxS;											 // high
 
-				shellIncl[0] = rand.NormFixed() * FIXED_PI;
-				shellIncl[1] = rand.NormFixed() * FIXED_PI;
-				shellIncl[2] = rand.NormFixed() * FIXED_PI;
+				shellIncl[0] = rand.NormFixed() * fixed::PI;
+				shellIncl[1] = rand.NormFixed() * fixed::PI;
+				shellIncl[2] = rand.NormFixed() * fixed::PI;
 			} else {
 				shells[0] = shells[1] = shells[2] = innerOrbit;
-				shellIncl[0] = shellIncl[1] = shellIncl[2] = rand.NormFixed() * FIXED_PI;
+				shellIncl[0] = shellIncl[1] = shellIncl[2] = rand.NormFixed() * fixed::PI;
 			}
 
 			Uint32 orbitIdx = 0;
@@ -1751,9 +1751,9 @@ void PopulateStarSystemGenerator::PopulateAddStations(SystemBody *sbody, StarSys
 				// slightly random min/max orbital distance
 				sp->m_eccentricity = rand.NormFixed().Abs() * fixed(1, 8);
 				// perturb the orbital plane to avoid all stations falling in line with each other
-				sp->m_inclination = currOrbitIncl + rand.NormFixed() * fixed(1, 4) * FIXED_PI;
+				sp->m_inclination = currOrbitIncl + rand.NormFixed() * fixed(1, 4) * fixed::PI;
 				// station spacing around the primary body
-				sp->m_argOfPeriapsis = rand.Fixed() * FIXED_PI * 2;
+				sp->m_argOfPeriapsis = rand.Fixed() * fixed::PI * 2;
 				// TODO: no axial tilt for stations / axial tilt in general is strangely modeled
 				sp->m_axialTilt = fixed();