Merge branch 'lifetime-variation' of https://github.com/cortex-command-community/Cortex-Command-Community-Project into lifetime-variation

Author: pawnishoovy

CHANGELOG.md

@@ -8,8 +8,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 <details><summary><b>Added</b></summary>
 
-- New `MovableObject` INI and Lua (R/W) property `LifeVariation` which can be used to randomize the `Lifetime` of MOs from when they're added to the simulation.
-
 </details>
 
 <details><summary><b>Changed</b></summary>

Source/Entities/Emission.cpp

@@ -15,7 +15,7 @@ void Emission::Clear() {
 	m_Spread = 0;
 	m_MinVelocity = 0;
 	m_MaxVelocity = 0;
-	m_LifeVariation = 0.1F;
+	m_LifeVariation = 0.1;
 	m_PushesEmitter = true;
 	m_InheritsVel = 0;
 	m_StartTimer.SetSimTimeLimitMS(0);

Source/Entities/Emission.h

@@ -151,7 +151,7 @@ namespace RTE {
 		float m_MinVelocity;
 		// The maximum velocity an emitted MO can have when emitted
 		float m_MaxVelocity;
-		// The variation in life time of each emitted particle, in percentage of the existing life time of the particle
+		// The variation in life time of each emitted aprticle, in percentage of the existing life time of the partilcle
 		float m_LifeVariation;
 		// Whether these emissions push the emitter around with recoil or not.
 		bool m_PushesEmitter;

Source/Entities/MovableObject.cpp

@@ -51,7 +51,6 @@ void MovableObject::Clear() {
 	m_AgeTimer.Reset();
 	m_RestTimer.Reset();
 	m_Lifetime = 0;
-	m_LifeVariation = 0.0F;
 	m_Sharpness = 1.0;
 	//    m_MaterialId = 0;
 	m_CheckTerrIntersection = false;
@@ -287,7 +286,6 @@ int MovableObject::ReadProperty(const std::string_view& propName, Reader& reader
 	MatchProperty("PinStrength", { reader >> m_PinStrength; });
 	MatchProperty("RestThreshold", { reader >> m_RestThreshold; });
 	MatchProperty("LifeTime", { reader >> m_Lifetime; });
-	MatchProperty("LifeVariation", { reader >> m_LifeVariation; });
 	MatchProperty("Age", {
 		double age;
 		reader >> age;
@@ -417,8 +415,6 @@ int MovableObject::Save(Writer& writer) const {
 	writer << m_RestThreshold;
 	writer.NewProperty("LifeTime");
 	writer << m_Lifetime;
-	writer.NewProperty("LifeVariation");
-	writer << m_LifeVariation;
 	writer.NewProperty("Sharpness");
 	writer << m_Sharpness;
 	writer.NewProperty("HitsMOs");

Source/Entities/MovableObject.h

@@ -225,14 +225,6 @@ namespace RTE {
 		/// @return A unsigned long describing the current lifetime in ms. 0 means unlimited.
 		unsigned long GetLifetime() const { return m_Lifetime; }
 
-		/// Gets the specified variation in lifetime of the emitted particles.
-		/// @return The life variation rationally expressed.. 0.1 = up to 10% variation.
-		float GetLifeVariation() const { return m_LifeVariation; }
-
-		/// Sets the specified variation in lifetime of the emitted particles.
-		/// @param newVariation The life variation rationally expressed.. 0.1 = up to 10% variation.
-		void SetLifeVariation(float newVariation) { m_LifeVariation = newVariation; }
-
 		/// Gets the MOID of this MovableObject for this frame.
 		/// @return An int specifying the MOID that this MovableObject is
 		/// assigned for the current frame only.
@@ -1135,8 +1127,6 @@ namespace RTE {
 		Timer m_RestTimer;
 
 		unsigned long m_Lifetime;
-		// The variation in life time of this MO, in percentage of the initial lifetime
-		float m_LifeVariation;
 		// The sharpness factor that gets added to single pixel hit impulses in
 		// applicable situations.
 		float m_Sharpness;

Source/Entities/Round.cpp

@@ -20,7 +20,7 @@ void Round::Clear() {
 	m_FireVel = 0;
 	m_InheritsFirerVelocity = false;
 	m_Separation = 0;
-	m_LifeVariation = 0.0F;
+	m_LifeVariation = 0;
 	m_Shell = 0;
 	m_ShellVel = 0;
 	m_FireSound.Reset();

Source/Lua/LuaBindingsEntities.cpp

@@ -893,7 +893,6 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, MovableObject) {
 	    .property("AirThreshold", &MovableObject::GetAirThreshold, &MovableObject::SetAirThreshold)
 	    .property("Age", &MovableObject::GetAge, &MovableObject::SetAge)
 	    .property("Lifetime", &MovableObject::GetLifetime, &MovableObject::SetLifetime)
-	    .property("LifeVariation", &MovableObject::GetLifeVariation, &MovableObject::SetLifeVariation)
 	    .property("ID", &MovableObject::GetID)
 	    .property("UniqueID", &MovableObject::GetUniqueID)
 	    .property("RootID", &MovableObject::GetRootID)

Source/Managers/MovableMan.cpp

@@ -667,7 +667,7 @@ void MovableMan::AddActor(Actor* actorToAdd) {
 			}
 			actorToAdd->NotResting();
 			actorToAdd->NewFrame();
-			actorToAdd->SetAge(static_cast<int>(actorToAdd->GetLifetime() * actorToAdd->GetLifeVariation() * RandomNormalNum()));
+			actorToAdd->SetAge(0);
 		}
 
 		{
@@ -695,7 +695,7 @@ void MovableMan::AddItem(HeldDevice* itemToAdd) {
 			}
 			itemToAdd->NotResting();
 			itemToAdd->NewFrame();
-			itemToAdd->SetAge(static_cast<int>(itemToAdd->GetLifetime() * itemToAdd->GetLifeVariation() * RandomNormalNum()));
+			itemToAdd->SetAge(0);
 		}
 
 		std::lock_guard<std::mutex> lock(m_AddedItemsMutex);
@@ -718,7 +718,7 @@ void MovableMan::AddParticle(MovableObject* particleToAdd) {
 			// TODO consider moving particles out of grass. It's old code that was removed because it's slow to do this for every particle.
 			particleToAdd->NotResting();
 			particleToAdd->NewFrame();
-			particleToAdd->SetAge(static_cast<int>(particleToAdd->GetLifetime() * particleToAdd->GetLifeVariation() * RandomNormalNum()));
+			particleToAdd->SetAge(0);
 		}
 		if (particleToAdd->IsDevice()) {
 			std::lock_guard<std::mutex> lock(m_AddedItemsMutex);