fix(draw): Fix illogical dirt effect update code in W3DTruckDraw::doDrawModule(), W3DTankTruckDraw::doDrawModule() (#2234)

xezon · web-flow · commit f58c2fdca90c · 2026-02-02T19:10:03.000+01:00
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTankTruckDraw.cpp
@@ -631,9 +631,6 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			if (speed>SIZE_CAP) {
 				speed = SIZE_CAP;
 			}
-			m_dustEffect->setSizeMultiplier(speed);
-		}
-		if (m_dirtEffect) {
 			if (wheelInfo && wheelInfo->m_framesAirborne>3) {
 				Real factor = 1 + wheelInfo->m_framesAirborne/16;
 				if (factor>2.0) factor = 2.0;
@@ -642,9 +639,7 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 				m_landingSound.setPosition(obj->getPosition());
 				TheAudio->addAudioEvent(&m_landingSound);
 			} else {
-				if (!accelerating || speed>2.0f) {
-					m_dirtEffect->stop();
-				}
+				m_dustEffect->setSizeMultiplier(speed);
 			}
 		}
 		if (m_powerslideEffect) {
@@ -656,7 +651,7 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			}
 		}
 		if (m_dirtEffect) {
-			if (!accelerating || speed>2.0f) {
+			if (!accelerating) {
 				m_dirtEffect->stop();
 			}
 		}
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DTruckDraw.cpp
@@ -588,9 +588,6 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			if (speed>SIZE_CAP) {
 				speed = SIZE_CAP;
 			}
-			m_dustEffect->setSizeMultiplier(speed);
-		}
-		if (m_dirtEffect) {
 			if (wheelInfo && wheelInfo->m_framesAirborne>3) {
 				Real factor = 1 + wheelInfo->m_framesAirborne/16;
 				if (factor>2.0) factor = 2.0;
@@ -599,9 +596,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 				m_landingSound.setObjectID(obj->getID());
 				TheAudio->addAudioEvent(&m_landingSound);
 			} else {
-				if (!accelerating || speed>2.0f) {
-					m_dirtEffect->stop();
-				}
+				m_dustEffect->setSizeMultiplier(speed);
 			}
 		}
 		if (m_powerslideEffect) {
@@ -613,7 +608,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)
 			}
 		}
 		if (m_dirtEffect) {
-			if (!accelerating || speed>2.0f) {
+			if (!accelerating) {
 				m_dirtEffect->stop();
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -631,9 +631,6 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)`
`631`	`631`	`if (speed>SIZE_CAP) {`
`632`	`632`	`speed = SIZE_CAP;`
`633`	`633`	`}`
`634`		`- m_dustEffect->setSizeMultiplier(speed);`
`635`		`- }`
`636`		`- if (m_dirtEffect) {`
`637`	`634`	`if (wheelInfo && wheelInfo->m_framesAirborne>3) {`
`638`	`635`	`Real factor = 1 + wheelInfo->m_framesAirborne/16;`
`639`	`636`	`if (factor>2.0) factor = 2.0;`
`@@ -642,9 +639,7 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)`
`642`	`639`	`m_landingSound.setPosition(obj->getPosition());`
`643`	`640`	`TheAudio->addAudioEvent(&m_landingSound);`
`644`	`641`	`} else {`
`645`		`- if (!accelerating \|\| speed>2.0f) {`
`646`		`- m_dirtEffect->stop();`
`647`		`- }`
	`642`	`+ m_dustEffect->setSizeMultiplier(speed);`
`648`	`643`	`}`
`649`	`644`	`}`
`650`	`645`	`if (m_powerslideEffect) {`
`@@ -656,7 +651,7 @@ void W3DTankTruckDraw::doDrawModule(const Matrix3D* transformMtx)`
`656`	`651`	`}`
`657`	`652`	`}`
`658`	`653`	`if (m_dirtEffect) {`
`659`		`- if (!accelerating \|\| speed>2.0f) {`
	`654`	`+ if (!accelerating) {`
`660`	`655`	`m_dirtEffect->stop();`
`661`	`656`	`}`
`662`	`657`	`}`
Original file line number	Diff line number	Diff line change
`@@ -588,9 +588,6 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)`
`588`	`588`	`if (speed>SIZE_CAP) {`
`589`	`589`	`speed = SIZE_CAP;`
`590`	`590`	`}`
`591`		`- m_dustEffect->setSizeMultiplier(speed);`
`592`		`- }`
`593`		`- if (m_dirtEffect) {`
`594`	`591`	`if (wheelInfo && wheelInfo->m_framesAirborne>3) {`
`595`	`592`	`Real factor = 1 + wheelInfo->m_framesAirborne/16;`
`596`	`593`	`if (factor>2.0) factor = 2.0;`
`@@ -599,9 +596,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)`
`599`	`596`	`m_landingSound.setObjectID(obj->getID());`
`600`	`597`	`TheAudio->addAudioEvent(&m_landingSound);`
`601`	`598`	`} else {`
`602`		`- if (!accelerating \|\| speed>2.0f) {`
`603`		`- m_dirtEffect->stop();`
`604`		`- }`
	`599`	`+ m_dustEffect->setSizeMultiplier(speed);`
`605`	`600`	`}`
`606`	`601`	`}`
`607`	`602`	`if (m_powerslideEffect) {`
`@@ -613,7 +608,7 @@ void W3DTruckDraw::doDrawModule(const Matrix3D* transformMtx)`
`613`	`608`	`}`
`614`	`609`	`}`
`615`	`610`	`if (m_dirtEffect) {`
`616`		`- if (!accelerating \|\| speed>2.0f) {`
	`611`	`+ if (!accelerating) {`
`617`	`612`	`m_dirtEffect->stop();`
`618`	`613`	`}`
`619`	`614`	`}`