Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-26 05:50:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

use arrays

Browse source
This commit is contained in:
in0finite 2021-06-25 22:16:27 +02:00
parent 417272e027
commit 65eb14afad
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Assets/Scripts/Behaviours/World/StaticGeometry.cs
View file

@ -64,10 +64,11 @@ namespace SanAndreasUnity.Behaviours.World
public bool IsVisibleBasedOnCurrentDayTime => this.ObjectDefinition is TimeObjectDef timeObjectDef ? IsObjectVisibleBasedOnCurrentDayTime(timeObjectDef) : true; public bool IsVisibleBasedOnCurrentDayTime => this.ObjectDefinition is TimeObjectDef timeObjectDef ? IsObjectVisibleBasedOnCurrentDayTime(timeObjectDef) : true;
private List<LightSource> m_lightSources = null; // use arrays to save memory
private List<LightSource> m_trafficLightSources = null; // set them to null to save memory
private LightSource[] m_lightSources = null;
private LightSource[] m_trafficLightSources = null;
private int m_activeTrafficLightIndex = -1; private int m_activeTrafficLightIndex = -1;
//private float m_timeSinceUpdatedTrafficLights = 0;
public void Initialize(Instance inst, Dictionary<Instance, StaticGeometry> dict) public void Initialize(Instance inst, Dictionary<Instance, StaticGeometry> dict)
@ -308,14 +309,14 @@ namespace SanAndreasUnity.Behaviours.World
if (lights.Count == 0) if (lights.Count == 0)
return; return;
m_lightSources = lights; m_lightSources = lights.ToArray();
m_trafficLightSources = lights m_trafficLightSources = lights
.Where(l => l.LightInfo.CoronaShowModeFlags == TwoDEffect.Light.CoronaShowMode.TRAFFICLIGHT) .Where(l => l.LightInfo.CoronaShowModeFlags == TwoDEffect.Light.CoronaShowMode.TRAFFICLIGHT)
.ToList(); .ToArray();
if (m_trafficLightSources.Count % 3 != 0) if (m_trafficLightSources.Length % 3 != 0)
Debug.LogError($"Traffic lights count must be multiple of 3, found {m_trafficLightSources.Count}"); Debug.LogError($"Traffic lights count must be multiple of 3, found {m_trafficLightSources.Length}");
this.InvokeRepeating(nameof(this.UpdateLights), 0f, 0.2f); this.InvokeRepeating(nameof(this.UpdateLights), 0f, 0.2f);
} }
@ -384,13 +385,13 @@ namespace SanAndreasUnity.Behaviours.World
if (cam != null) if (cam != null)
{ {
for (int i = 0; i < m_lightSources.Count; i++) for (int i = 0; i < m_lightSources.Length; i++)
{ {
m_lightSources[i].transform.forward = -cam.transform.forward; m_lightSources[i].transform.forward = -cam.transform.forward;
} }
} }
if (m_trafficLightSources.Count % 3 == 0) if (m_trafficLightSources.Length % 3 == 0)
{ {
// update active traffic light // update active traffic light
m_activeTrafficLightIndex = this.CalculateActiveTrafficLightIndex(); m_activeTrafficLightIndex = this.CalculateActiveTrafficLightIndex();
@ -401,7 +402,7 @@ namespace SanAndreasUnity.Behaviours.World
var yellowLights = m_trafficLightSources.Where(l => IsColorInRange(l.LightInfo.Color, new Color32(255, 255, 0, 0), 50, 150, 80)).ToList(); var yellowLights = m_trafficLightSources.Where(l => IsColorInRange(l.LightInfo.Color, new Color32(255, 255, 0, 0), 50, 150, 80)).ToList();
var greenLights = m_trafficLightSources.Where(l => IsColorInRange(l.LightInfo.Color, Color.green, 50, 50, 50)).ToList(); var greenLights = m_trafficLightSources.Where(l => IsColorInRange(l.LightInfo.Color, Color.green, 50, 50, 50)).ToList();
if (redLights.Count + yellowLights.Count + greenLights.Count != m_trafficLightSources.Count) if (redLights.Count + yellowLights.Count + greenLights.Count != m_trafficLightSources.Length)
{ {
Debug.LogError("Failed to identify some light colors"); Debug.LogError("Failed to identify some light colors");
} }