Skip to content

Update to latest build from TMPE 'master' #32

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

Open
Elesbaan70 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to latest build from TMPE 'master' #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 4 additions & 9 deletions NodeController/GUI/TrafficRulesOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ public bool DrawSignHandles(ushort nodeId,
baseZoom: TMPEUtils.GetBaseZoom());

JunctionRestrictionsManager jrMan = JunctionRestrictionsManager.Instance;
RoadSignTheme theme = RoadSignThemeManager.ActiveTheme;

#region UTURN
// draw "u-turns allowed" sign at (1; 0)
Expand All @@ -278,9 +279,7 @@ public bool DrawSignHandles(ushort nodeId,
handleClick: configurable && handleClick_,
camPos: ref camPos,
guiColor: guiColor,
signTexture: allowed
? JunctionRestrictions.Instance.UturnAllowed
: JunctionRestrictions.Instance.UturnForbidden);
signTexture: theme.GetOtherRestriction(RoadSignTheme.OtherRestriction.UTurn, allowed));

if (signHovered && handleClick_ && configurable) {
isAnyHovered = true;
Expand Down Expand Up @@ -317,9 +316,7 @@ public bool DrawSignHandles(ushort nodeId,
handleClick: configurable && handleClick_,
camPos: ref camPos,
guiColor: guiColor,
signTexture: allowed
? JunctionRestrictions.Instance.EnterBlockedJunctionAllowed
: JunctionRestrictions.Instance.EnterBlockedJunctionForbidden);
signTexture: theme.GetOtherRestriction(RoadSignTheme.OtherRestriction.EnterBlockedJunction, allowed));

if (signHovered && this.handleClick_ && configurable) {
isAnyHovered = true;
Expand Down Expand Up @@ -369,9 +366,7 @@ public bool DrawSignHandles(ushort nodeId,
handleClick: configurable && handleClick_,
camPos: ref camPos,
guiColor: guiColor,
signTexture: allowed
? JunctionRestrictions.Instance.PedestrianCrossingAllowed
: JunctionRestrictions.Instance.PedestrianCrossingForbidden);
signTexture: theme.GetOtherRestriction(RoadSignTheme.OtherRestriction.Crossing, allowed));

if (signHovered && this.handleClick_ && configurable) {
isAnyHovered = true;
Expand Down
Binary file modified libs/CSUtil.Commons.dll
View file
Open in desktop
Binary file not shown.
Binary file modified libs/TMPE.API.dll
View file
Open in desktop
Binary file not shown.
Binary file modified libs/TrafficManager.dll
View file
Open in desktop
Binary file not shown.