Skip to content

no parking signs on bus lanes. #1707

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

Merged
merged 4 commits into from
Dec 8, 2022
Merged

no parking signs on bus lanes. #1707

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87e57ec
no parking signs on bus lanes.
kianzarrin Dec 6, 2022
cf5764e
bugfix LHT
kianzarrin Dec 6, 2022
2b779fc
kianzarrin Dec 6, 2022
0d3387c
kianzarrin Dec 6, 2022
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
21 changes: 18 additions & 3 deletions TLM/TLM/Manager/Impl/ParkingRestrictionsManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,30 @@ private ParkingRestrictionsManager() { }

public bool MayHaveParkingRestriction(ushort segmentId) {
ref NetSegment segment = ref segmentId.ToSegment();
if ((segment.m_flags & NetSegment.Flags.Created) == NetSegment.Flags.None) {
return true;
if (!segment.IsValid()) {
return false;
}

ItemClass connectionClass = segment.Info.GetConnectionClass();

return connectionClass.m_service == ItemClass.Service.Road && segment.Info.m_hasParkingSpaces;
}

public bool MayHaveParkingRestriction(ushort segmentId, NetInfo.Direction finalDir) {
ref NetSegment segment = ref segmentId.ToSegment();
var dir = Shortcuts.RHT ? finalDir : NetInfo.InvertDirection(finalDir);
bool right = (dir == NetInfo.Direction.Forward) != segment.m_flags.IsFlagSet(NetSegment.Flags.Invert);
if (right) {
if (segment.m_flags.IsFlagSet(NetSegment.Flags.StopRight | NetSegment.Flags.StopRight2)) {
return false;
}
} else {
if (!right && segment.m_flags.IsFlagSet(NetSegment.Flags.StopLeft | NetSegment.Flags.StopLeft2)) {
return false;
}
}
return MayHaveParkingRestriction(segmentId);
}

public bool IsParkingAllowed(ushort segmentId, NetInfo.Direction finalDir) {
return parkingAllowed[segmentId][GetDirIndex(finalDir)];
}
Expand Down
6 changes: 5 additions & 1 deletion TLM/TLM/UI/SubTools/ParkingRestrictionsTool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,17 @@ private NetInfo.Direction DrawParkingRestrictionHandles(ushort segmentId,
}

foreach (KeyValuePair<NetInfo.Direction, Vector3> e in segCenter) {
bool configurable = parkingManager.MayHaveParkingRestriction(segmentId, e.Key);
if (!configurable) {
continue;
}

bool allowed = parkingManager.IsParkingAllowed(segmentId, e.Key);
if (allowed && viewOnly) {
continue;
}

bool visible = GeometryUtil.WorldToScreenPoint(e.Value, out Vector3 screenPos);

if (!visible) {
continue;
}
Expand Down