Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PT demand - request color change performance improvements #1725

Merged
merged 5 commits into from
Mar 20, 2023
Merged

PT demand - request color change performance improvements #1725

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a44b46a
Remove clamping - it's performed in Color.Lerp()
krzychu124 Feb 26, 2023
cf4d848
Removed building color update - can cause small performance issues
krzychu124 Feb 26, 2023
1cc9f00
Merge branch 'master' into bugfix/building-color-update
krzychu124 Mar 9, 2023
892c7f2
Merge branch 'master' into bugfix/building-color-update
krzychu124 Mar 20, 2023
1751871
Merge branch 'master' into bugfix/building-color-update
krzychu124 Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions TLM/TLM/Manager/Impl/AdvancedParkingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2971,7 +2971,7 @@ InfoProperties.ModeProperties[] modeProperties
color = Color.Lerp(
modeProperties[(int)infoMode].m_targetColor,
modeProperties[(int)infoMode].m_negativeColor,
Mathf.Clamp01(extBuilding.parkingSpaceDemand * 0.01f));
extBuilding.parkingSpaceDemand * 0.01f);
return true;
}

Expand All @@ -2981,11 +2981,10 @@ InfoProperties.ModeProperties[] modeProperties
color = Color.Lerp(
modeProperties[(int)InfoManager.InfoMode.Traffic].m_targetColor,
modeProperties[(int)InfoManager.InfoMode.Traffic].m_negativeColor,
Mathf.Clamp01(
(TrafficManagerTool.CurrentTransportDemandViewMode ==
TransportDemandViewMode.Outgoing
? extBuilding.outgoingPublicTransportDemand
: extBuilding.incomingPublicTransportDemand) * 0.01f));
: extBuilding.incomingPublicTransportDemand) * 0.01f);
return true;
}

Expand Down
14 changes: 0 additions & 14 deletions TLM/TLM/Manager/Impl/ExtBuildingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,12 @@ public void AddParkingSpaceDemand(ref ExtBuilding extBuilding, uint delta) {
extBuilding.parkingSpaceDemand = (byte)Math.Min(
100,
(int)extBuilding.parkingSpaceDemand + delta);

RequestColorUpdate(extBuilding.buildingId);
}

public void RemoveParkingSpaceDemand(ref ExtBuilding extBuilding, uint delta) {
extBuilding.parkingSpaceDemand = (byte)Math.Max(
0,
(int)extBuilding.parkingSpaceDemand - delta);

RequestColorUpdate(extBuilding.buildingId);
}

public void ModifyParkingSpaceDemand(ref ExtBuilding extBuilding,
Expand All @@ -98,8 +94,6 @@ public void ModifyParkingSpaceDemand(ref ExtBuilding extBuilding,
extBuilding.parkingSpaceDemand + (int)Mathf.Round(delta),
0,
100);

RequestColorUpdate(extBuilding.buildingId);
}

public void
Expand All @@ -114,8 +108,6 @@ public void
} else {
extBuilding.incomingPublicTransportDemand = newDemand;
}

RequestColorUpdate(extBuilding.buildingId);
}

public void RemovePublicTransportDemand(ref ExtBuilding extBuilding,
Expand All @@ -131,12 +123,6 @@ public void RemovePublicTransportDemand(ref ExtBuilding extBuilding,
} else {
extBuilding.incomingPublicTransportDemand = newDemand;
}

RequestColorUpdate(extBuilding.buildingId);
}

private void RequestColorUpdate(ushort buildingId) {
Singleton<BuildingManager>.instance.UpdateBuildingColors(buildingId);
}

protected override void InternalPrintDebugInfo() {
Expand Down