From e8dc703813e053e5c81b6809f350d7676cc05096 Mon Sep 17 00:00:00 2001 From: Charlotte Date: Mon, 15 Jul 2024 13:53:03 -0700 Subject: [PATCH] Exclude geometry lights from propid --- Assets/__Scripts/Beatmap/Appearances/GeometryAppearanceSO.cs | 1 + Assets/__Scripts/Platforms/LightsManager.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/Assets/__Scripts/Beatmap/Appearances/GeometryAppearanceSO.cs b/Assets/__Scripts/Beatmap/Appearances/GeometryAppearanceSO.cs index ba9bbfa03..f680490dd 100644 --- a/Assets/__Scripts/Beatmap/Appearances/GeometryAppearanceSO.cs +++ b/Assets/__Scripts/Beatmap/Appearances/GeometryAppearanceSO.cs @@ -90,6 +90,7 @@ public void SetGeometryAppearance(GeometryContainer container) light.OverrideLightGroup = true; light.OverrideLightGroupID = eh.LightType ?? 0; light.LightID = eh.LightID ?? 0; + light.PropGroup = -1; } } diff --git a/Assets/__Scripts/Platforms/LightsManager.cs b/Assets/__Scripts/Platforms/LightsManager.cs index d7fb87cfa..10eaebdab 100644 --- a/Assets/__Scripts/Platforms/LightsManager.cs +++ b/Assets/__Scripts/Platforms/LightsManager.cs @@ -59,6 +59,7 @@ public void LoadOldLightOrder() public LightGroup[] GroupLightsBasedOnZ() => ControllingLights .Where(x => x.gameObject.activeInHierarchy) + .Where(x => x.PropGroup >= 0) .GroupBy(x => Mathf.RoundToInt(x.PropGroup)) .OrderBy(x => x.Key) .Select(x => new LightGroup { Lights = x.ToList() })