more accurate impulse estimation

Author: Causeless

Source/Entities/AEmitter.cpp

@@ -259,22 +259,23 @@ void AEmitter::EnableEmission(bool enable) {
 float AEmitter::EstimateImpulse(bool burst) {
 	// Calculate the impulse generated by the emissions, once and store the result
 	if ((!burst && m_AvgImpulse < 0) || (burst && m_AvgBurstImpulse < 0)) {
-		float impulse = 0;
+		float impulse = 0.0F;
 		float velMin, velMax, velRange, spread;
 
 		// Go through all emissions and emit them according to their respective rates
 		for (auto eItr = m_EmissionList.begin(); eItr != m_EmissionList.end(); ++eItr) {
 			// Only check emissions that push the emitter
 			if ((*eItr).PushesEmitter()) {
-				double emissions = (*eItr).GetRate() * g_TimerMan.GetDeltaTimeSecs() / 60.0f;
+				float emissions = ((*eItr).GetRate() / 60.0f) * g_TimerMan.GetDeltaTimeSecs();
+				float scale = 1.0F;
 				if (burst) {
 					emissions *= (*eItr).GetBurstSize();
+					scale = m_BurstScale;
 				}
 
-				velMin = std::min((*eItr).GetMinVelocity(), (*eItr).GetMaxVelocity());
-				velMax = std::max((*eItr).GetMinVelocity(), (*eItr).GetMaxVelocity());
-				velRange = (velMax - velMin) * 0.5;
-				spread = std::max(static_cast<float>(c_PI) - (*eItr).GetSpread(), .0f) / c_PI; // A large spread will cause the forces to cancel eachother out
+				velMin = (*eItr).GetMinVelocity() * scale;
+				velRange = ((*eItr).GetMaxVelocity() - (*eItr).GetMinVelocity()) * 0.5F * scale;
+				spread = (std::max(static_cast<float>(c_PI) - (*eItr).GetSpread(), 0.0F) / c_PI) * scale; // A large spread will cause the forces to cancel eachother out
 
 				// Add to accumulative recoil impulse generated, F = m * a.
 				impulse += (velMin + velRange) * spread * (*eItr).m_pEmission->GetMass() * emissions;
@@ -446,7 +447,7 @@ void AEmitter::Update() {
 
 				for (int i = 0; i < emissionCount; ++i) {
 					velMin = emission.GetMinVelocity() * scale;
-					velRange = emission.GetMaxVelocity() - emission.GetMinVelocity() * scale;
+					velRange = (emission.GetMaxVelocity() - emission.GetMinVelocity()) * scale;
 					spread = emission.GetSpread() * scale;
 					// Make a copy after the reference particle
 					pParticle = dynamic_cast<MovableObject*>(emission.GetEmissionParticlePreset()->Clone());

Source/Entities/PEmitter.cpp

@@ -219,24 +219,26 @@ void PEmitter::EnableEmission(bool enable) {
 float PEmitter::EstimateImpulse(bool burst) {
 	// Calculate the impulse generated by the emissions, once and store the result
 	if ((!burst && m_AvgImpulse < 0) || (burst && m_AvgBurstImpulse < 0)) {
-		float impulse = 0;
+		float impulse = 0.0F;
 		float velMin, velMax, velRange, spread;
 
 		// Go through all emissions and emit them according to their respective rates
 		for (auto eItr = m_EmissionList.begin(); eItr != m_EmissionList.end(); ++eItr) {
 			// Only check emissions that push the emitter
-			if (eItr->PushesEmitter()) {
-				double emissions = eItr->GetRate() * g_TimerMan.GetDeltaTimeSecs() / 60.0f;
-				if (burst)
-					emissions *= eItr->GetBurstSize();
+			if ((*eItr).PushesEmitter()) {
+				float emissions = ((*eItr).GetRate() / 60.0f) * g_TimerMan.GetDeltaTimeSecs();
+				float scale = 1.0F;
+				if (burst) {
+					emissions *= (*eItr).GetBurstSize();
+					scale = m_BurstScale;
+				}
 
-				velMin = std::min(eItr->GetMinVelocity(), eItr->GetMaxVelocity());
-				velMax = std::max(eItr->GetMinVelocity(), eItr->GetMaxVelocity());
-				velRange = (velMax - velMin) * 0.5;
-				spread = std::max(static_cast<float>(c_PI) - eItr->GetSpread(), .0f) / c_PI; // A large spread will cause the forces to cancel eachother out
+				velMin = (*eItr).GetMinVelocity() * scale;
+				velRange = ((*eItr).GetMaxVelocity() - (*eItr).GetMinVelocity()) * 0.5F * scale;
+				spread = (std::max(static_cast<float>(c_PI) - (*eItr).GetSpread(), 0.0F) / c_PI) * scale; // A large spread will cause the forces to cancel eachother out
 
 				// Add to accumulative recoil impulse generated, F = m * a.
-				impulse += (velMin + velRange) * spread * eItr->m_pEmission->GetMass() * emissions;
+				impulse += (velMin + velRange) * spread * (*eItr).m_pEmission->GetMass() * emissions;
 			}
 		}