Disco light fix

onnoj · Jul 24, 2024 · fe00d2e · fe00d2e
1 parent 193d1f1
commit fe00d2e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Source/Renderer/rendering/lightmanager.cpp b/Source/Renderer/rendering/lightmanager.cpp
@@ -70,7 +70,7 @@ void LightManager::Render(FSceneNode* Frame)
 
       if (light.isDisco)
       {
-        light.d3dLight.Range *= 2.0f;
+        light.d3dLight.Range *= 3.0f;
         for (uint8_t i = 0; i < light.lightExtraCount; i++)
         {
           uint32_t discoReservedIndex = LevelLightsExtraRange.lower + light.lightExtraIndex + i;
@@ -168,8 +168,12 @@ void LightManager::Render(FSceneNode* Frame)
 
 bool LightManager::CalculateLightInfo(AActor* pActor, LightManager::LightInfo& pmInfo)
 {
+  const bool isDisco = (pActor->LightEffect == ELightEffect::LE_Disco);
+  const bool isSpotlight = (pActor->LightEffect == ELightEffect::LE_Spotlight || pActor->LightEffect == ELightEffect::LE_StaticSpot);
+  const bool isPointlight = !pmInfo.isSpotlight && !pmInfo.isDisco; //(pActor->LightEffect == ELightEffect::LE_None || pActor->LightEffect == ELightEffect::LE_NonIncidence);
+
   if (pActor == nullptr ||
-    pActor->bSpecialLit ||
+    (pActor->bSpecialLit && !isDisco) ||
     pActor->LightType != ELightType::LT_Steady ||
     pActor->LightBrightness <= 0)
   {