thermal vision view model material override when using xray

AdamTadeusz · nullsystem · commit a586c7ca819e · 2025-02-23T11:13:54.000Z
diff --git a/src/game/shared/neo/neo_predicted_viewmodel.cpp b/src/game/shared/neo/neo_predicted_viewmodel.cpp
@@ -225,6 +225,7 @@ void CNEOPredictedViewModel::ClientThink()
 }
 
 extern ConVar mat_neo_toc_test;
+extern ConVar glow_outline_effect_enable;
 int CNEOPredictedViewModel::DrawModel(int flags)
 {
 	auto pPlayer = static_cast<C_NEO_Player*>(GetOwner());
@@ -254,7 +255,7 @@ int CNEOPredictedViewModel::DrawModel(int flags)
 			
 			return 0;
 		}
-		if (pPlayer->GetClass() == NEO_CLASS_SUPPORT && pPlayer->IsInVision())
+		if (pPlayer->GetClass() == NEO_CLASS_SUPPORT && pPlayer->IsInVision() && !glow_outline_effect_enable.GetBool())
 		{
 			IMaterial* pass = materials->FindMaterial("dev/thermal_view_model", TEXTURE_GROUP_MODEL);
 			Assert(pass && !pass->IsErrorMaterial());

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,7 @@ void CNEOPredictedViewModel::ClientThink()`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`extern ConVar mat_neo_toc_test;`
	`228`	`+extern ConVar glow_outline_effect_enable;`
`228`	`229`	`int CNEOPredictedViewModel::DrawModel(int flags)`
`229`	`230`	`{`
`230`	`231`	`auto pPlayer = static_cast<C_NEO_Player*>(GetOwner());`
`@@ -254,7 +255,7 @@ int CNEOPredictedViewModel::DrawModel(int flags)`
`254`	`255`
`255`	`256`	`return 0;`
`256`	`257`	`}`
`257`		`- if (pPlayer->GetClass() == NEO_CLASS_SUPPORT && pPlayer->IsInVision())`
	`258`	`+ if (pPlayer->GetClass() == NEO_CLASS_SUPPORT && pPlayer->IsInVision() && !glow_outline_effect_enable.GetBool())`
`258`	`259`	`{`
`259`	`260`	`IMaterial* pass = materials->FindMaterial("dev/thermal_view_model", TEXTURE_GROUP_MODEL);`
`260`	`261`	`Assert(pass && !pass->IsErrorMaterial());`