New Speed Limits UI #1168

kvakvs · 2021-10-18T03:33:43Z

This introduces:

New speed limits UI
New overlay for speed limits showing both current override, and defaults, or both (holding Alt). Textures rendered transparent when they overlap with TM:PE UI which reduces the overlay/UI overlapping problem since Harbor DLC.
New textures for default speed limits (blue signs), SVG source file with the graphics
New texture for no override (circle)
MIP mapped textures instead of old aliased textures

TO DO and Bugs:

Error 210.3279831: GUI Error: System.NullReferenceException: Object reference not set to an instance of an object
  at TrafficManager.U.HelperExtensions.GetScreenRectInGuiSpace (ColossalFramework.UI.UIComponent ctrl) [0x00000] in <filename unknown>:0 
  at TrafficManager.UI.SubTools.SpeedLimits.SpeedLimitsTool.CreateOverlayDrawArgs (Boolean interactive) [0x00000] in <filename unknown>:0 
  at TrafficManager.UI.SubTools.SpeedLimits.SpeedLimitsTool.RenderGenericInfoOverlay_GUI () [0x00000] in <filename unknown>:0 
  at TrafficManager.UI.TrafficManagerTool.OnToolGUIImpl (UnityEngine.Event e) [0x00000] in <filename unknown>:0 
   at CSUtil.Commons.Log.LogToFile(System.String log, LogLevel level)
   at CSUtil.Commons.Log.Error(System.String s)
   at TrafficManager.UI.TrafficManagerTool.OnToolGUIImpl(UnityEngine.Event e)
   at TrafficManager.UI.TrafficManagerTool.OnToolGUI(UnityEngine.Event e)
   at ToolBase.OnGUI()

-#if DEBUG guards for release Config version bump Reverted DebugIf to accept a lambda instead of string Copied and adapted UIScaler logic from Kian's ModTools SpeedLimits manager uses intent structs for set speed limit action

krzychu124 · 2021-10-20T21:04:58Z

It's draft, should we wait for the remaining todo's or you think it's ok to review?

kvakvs · 2021-10-20T21:07:18Z

The TODOs changes should be small.
Can review new commits separately.

DaEgi01 · 2021-10-21T05:44:43Z

The TODOs changes should be small. Can review new commits separately.

I never care for draft PR and would rather review the final one. or is it really a draft in the sense that you want some feedback first before you want to proceed?

kvakvs · 2021-10-21T10:25:35Z

You're welcome to not care for another few days, or can start reviewing right away.
This is a lot of changed lines, half of it are SVG file sources, but the other half is real code.

krzychu124

Looks good, UI nicely separated from the tool 👍
Will test in-game...

krzychu124 · 2021-11-14T17:42:39Z

Couple findings:

cursor tooltip position is wrong when UI scale is different than 100%
tooltip position blinks for a frame (I think it's worth setting correct position before first render),
opening panel takes way too long IMO (~2sec), lag is consistent, no matter how many times I try, which suggest that panel is build from scratch each time or some really slow operation is running before showing the panel.
speed limits overlay (outside tool) does not work, probably because of that:

Error 210.3279831: GUI Error: System.NullReferenceException: Object reference not set to an instance of an object
  at TrafficManager.U.HelperExtensions.GetScreenRectInGuiSpace (ColossalFramework.UI.UIComponent ctrl) [0x00000] in <filename unknown>:0 
  at TrafficManager.UI.SubTools.SpeedLimits.SpeedLimitsTool.CreateOverlayDrawArgs (Boolean interactive) [0x00000] in <filename unknown>:0 
  at TrafficManager.UI.SubTools.SpeedLimits.SpeedLimitsTool.RenderGenericInfoOverlay_GUI () [0x00000] in <filename unknown>:0 
  at TrafficManager.UI.TrafficManagerTool.OnToolGUIImpl (UnityEngine.Event e) [0x00000] in <filename unknown>:0 
   at CSUtil.Commons.Log.LogToFile(System.String log, LogLevel level)
   at CSUtil.Commons.Log.Error(System.String s)
   at TrafficManager.UI.TrafficManagerTool.OnToolGUIImpl(UnityEngine.Event e)
   at TrafficManager.UI.TrafficManagerTool.OnToolGUI(UnityEngine.Event e)
   at ToolBase.OnGUI()

apparently bugs reported about issues with loading and storing settings are gone. Cannot reproduce them once I merged this PR into latest master

One thing which once I realized about some time ago, now can't be unseen and would be nice to address it:

make default overlay view to show signs per whole road, not per direction - just like IRL.

Other minor things to consider:

add some kind of feedback to the user that shown speed limit is averaged value when one or more lanes have different speed.
since we can't(won't) change default limits per lane, maybe we should hide that from view, so we can reuse the key modifier to switch between handles per-road and per-lane

krzychu124 · 2021-11-14T21:36:51Z

I found one more issue:

Overlay seems to be cached, so after moving segment it shows sign handles at the same place

kvakvs · 2021-11-14T21:41:54Z

Added the notes to the TODO list, will begin fixing one by one now.

krzychu124 · 2021-11-14T22:37:13Z

apparently bugs reported about issues with loading and storing settings are gone. Cannot reproduce them once I merged this PR into latest master

Nope, after loading older savegame everything is ok, but once saved and reloaded any lane/segment I touched with speed limits tool is gone. Investigating...

krzychu124 · 2021-11-14T22:47:53Z

Yup, there is a bug in conversion when loading settings

krzychu124 · 2021-11-14T23:22:37Z

@kvakvs

TMPE/TLM/TLM/State/Flags.cs

Line 573 in b703cc4

laneSpeedLimit[laneId] = action.Override.Value.GetKmph();

limit per lane dictionary is filled with Kmph, but then while saving they are treated as GameUnits

TMPE/TLM/TLM/Manager/Impl/SpeedLimitManager.cs

Lines 922 to 926 in b703cc4

    
           foreach (KeyValuePair<uint, float> e in Flags.GetAllLaneSpeedLimits()) { 
        
               try { 
        
                   var laneSpeedLimit = new Configuration.LaneSpeedLimit( 
        
                       e.Key, 
        
                       new SpeedValue(e.Value));

TMPE/TLM/TLM/State/Flags.cs

Lines 893 to 899 in b703cc4

    
           internal static IDictionary<uint, float> GetAllLaneSpeedLimits() { 
        
               IDictionary<uint, float> ret; 
        
               lock(laneSpeedLimitLock) { 
        
                   ret = new Dictionary<uint, float>(laneSpeedLimit); 
        
               } 
        
               return ret;

here converting again to Kmph

TMPE/TLM/TLM/State/Configuration.cs

Lines 21 to 23 in b703cc4

    
           public LaneSpeedLimit(uint laneId, SpeedValue speed) { 
        
               this.laneId = laneId; 
        
               this.speedLimit = speed.ToKmphPrecise().Kmph;

Am I missing something here?

kvakvs · 2021-11-14T23:25:01Z

Thanks for investigating
That is the conversion point and i made it safe to that point but i always forget how speeds are stored in the savefile 😀

krzychu124 · 2021-11-14T23:30:55Z

laneSpeedLimit[laneId] = action.Override.Value.GetKmph();

That lane was changed in previous PR, probably by accident, since the code for loading and saving data is pretty much the same. I did 20? quick saves that's why values were so big.

I haven't found any new issues other than those from previous comments😃 👍

…to have ResetToDefault type

…ts in speedlimits panel corrected too.

…ed, and hide on tool deactivate

…leared

…ated (rendering for another tool)

kvakvs · 2021-12-07T03:07:07Z

Added cheaper simple changes back. Layout changes are not cheap, the UI allows some of those tricks you desire, and doesn't allow some others, so it quickly becomes messy.

originalfoo · 2021-12-07T03:12:47Z

❤️ the new layout!

kvakvs · 2021-12-07T03:14:35Z

❤️ the new layout!

The change size was growing, and i yet have to do some other work tonight. We can return to it later, probably, or redo it a bit cleaner.

originalfoo

Tested:

✔️ Loading/conversion of speed customisations from v11.5.2 and v11.6.1 saves
✔️ Vanilla + Workshop roads (including some weird roads I had subscribed)
✔️ Lane vs. segment
✔️ Inside/outside central 25 tile area
✔️ km/h vs. mph speeds
✔️ Setting default speeds
✔️ OSD collision transparency
✔️ Camera angles/zooms
✔️ Road vs. tracks
✔️ Short segments
✔️ Asymmetric roads
✔️ 1-way and 2-way roads/tracks
✔️ Esc exits tool

I've not tested save/load yet as another mod is currently breaking my saves. I've not tested monorail/tram-only networks or trolleybus. Those can be tested in future PR.

kvakvs · 2021-12-07T03:28:25Z

If Hold Alt to show defaults is not in this branch i can add it, the change set is short for that.

originalfoo · 2021-12-07T03:55:31Z

If Hold Alt to show defaults is not in

It's in (tested via latest appveyor build)

…lows editing

kvakvs · 2021-12-07T03:58:36Z

If Hold Alt to show defaults is not in

It's in (tested via latest appveyor build)

I mean holding Alt and editing defaults, and holding Alt in defaults and editing overrides.
It is in now, just pushed.

…r now

… active

originalfoo · 2021-12-08T23:42:23Z

Regarding minor task in OP:

(Minor) add some kind of feedback to the user that shown speed limit is averaged value when one or more lanes have different speed.

Maybe:

Use basic circle icon (similar to default speeds, but different colour/shape)?
Or, rotate the icon by 45 degrees? Or make bigger than normal?
Or, force per-lane speed display on segments that have lanes with different speeds? (might clutter overlay tho)

If leaving to later PR, add to #1221 to track.

…mporary public route segments

kvakvs marked this pull request as draft October 18, 2021 03:34

kvakvs added 4 commits October 18, 2021 05:39

Speedlimits UI changes preparation: Changes to U library

7ae637e

-#if DEBUG guards for release Config version bump Reverted DebugIf to accept a lambda instead of string Copied and adapted UIScaler logic from Kian's ModTools SpeedLimits manager uses intent structs for set speed limit action

Remove Redirection Framework

b250236

Speed Limits UI: New textures, new overlay and util classes

0e415a9

Rebase on fresh master

3301b4b

kvakvs force-pushed the u-speedlimits-tool-7 branch from 25707ba to 3301b4b Compare October 18, 2021 04:04

krzychu124 reviewed Nov 14, 2021

View reviewed changes

Merge branch 'master' into u-speedlimits-tool-7

6ed359a

kvakvs added 7 commits November 15, 2021 00:59

Fixes for after master was merged

22ec96a

laneSpeedLimit and laneSpeedLimitArray use game units for speed

4d80bfb

SetLaneSpeedLimit accepts action with null override, but requires it …

31448bd

…to have ResetToDefault type

Tooltip position for speedlimits is now corrected for UIScale. UI fon…

b47ff59

…ts in speedlimits panel corrected too.

Do not recreate Speed Limits tool window if MPH setting was not chang…

60b58ed

…ed, and hide on tool deactivate

On tool reactivation, visible segments and segment centers cache is c…

01d9291

…leared

Check for Null when rendering overlay, if window has not been yet cre…

ae77565

…ated (rendering for another tool)

krzychu124 added this to the 11.6.0 milestone Nov 19, 2021

krzychu124 added enhancement Improve existing feature SPEED LIMITS Feature: Speed limits labels Nov 19, 2021

Keypress does not work as good as Keyup.

73ab6fa

originalfoo approved these changes Dec 7, 2021

View reviewed changes

Holding Alt shows defauls; Holding Alt in defaults shows override; Al…

061be92

…lows editing

kvakvs and others added 3 commits December 8, 2021 15:50

Merge branch 'master' into u-speedlimits-tool-7

eaf4eda

notify speed limit changes in the new speed limit manager

f668a8f

Check IsValid() on segments

623cdbe

DaEgi01 approved these changes Dec 8, 2021

View reviewed changes

kvakvs added 3 commits December 8, 2021 23:48

Destroy tool window on language change; Rebuild on tool activation

bd35801

Unlimited button goes right most, but label hangs out and its fine fo…

0680159

…r now

In debug build, fade overlay under debug menu while speed limits tool…

0c04d80

… active

kvakvs added 2 commits December 9, 2021 00:55

Test netinfo name vs vanilla asset names collection, to filter out te…

a4af5b5

…mporary public route segments

Translations; UI buttons 40px now to match main menu; Minor corrections

cc74853

krzychu124 approved these changes Dec 9, 2021

View reviewed changes

kvakvs merged commit 08cf09f into CitiesSkylinesMods:master Dec 9, 2021

originalfoo added the Overlays Overlays, data vis, etc. label Dec 9, 2021

This was referenced Dec 10, 2021

[EPIC] Speeds Tool v2 #84

Open

Speed limits UI is huge #299

Closed

Further enhancement to speed palette #406

Closed

Allow default speeds to be edited direct on roads/tracks on the map #389

Closed

originalfoo mentioned this pull request Jan 2, 2022

TMPE toolbar (menu) can be dragged if it is behind dragged speed limit palette #683

Closed

krzychu124 mentioned this pull request Jan 8, 2022

Version bump - 11.6.2 #1278

Merged

originalfoo modified the milestones: 11.6.0, 11.6.2 Jan 18, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New Speed Limits UI #1168

New Speed Limits UI #1168

kvakvs commented Oct 18, 2021 •

edited

Loading

krzychu124 commented Oct 20, 2021

kvakvs commented Oct 20, 2021 •

edited

Loading

DaEgi01 commented Oct 21, 2021

kvakvs commented Oct 21, 2021

krzychu124 left a comment

krzychu124 commented Nov 14, 2021

krzychu124 commented Nov 14, 2021

kvakvs commented Nov 14, 2021

krzychu124 commented Nov 14, 2021

krzychu124 commented Nov 14, 2021

krzychu124 commented Nov 14, 2021

kvakvs commented Nov 14, 2021

krzychu124 commented Nov 14, 2021

kvakvs commented Dec 7, 2021

originalfoo commented Dec 7, 2021

kvakvs commented Dec 7, 2021 •

edited

Loading

originalfoo left a comment •

edited

Loading

kvakvs commented Dec 7, 2021 •

edited

Loading

originalfoo commented Dec 7, 2021

kvakvs commented Dec 7, 2021

originalfoo commented Dec 8, 2021

New Speed Limits UI #1168

New Speed Limits UI #1168

Conversation

kvakvs commented Oct 18, 2021 • edited Loading

krzychu124 commented Oct 20, 2021

kvakvs commented Oct 20, 2021 • edited Loading

DaEgi01 commented Oct 21, 2021

kvakvs commented Oct 21, 2021

krzychu124 left a comment

Choose a reason for hiding this comment

krzychu124 commented Nov 14, 2021

krzychu124 commented Nov 14, 2021

kvakvs commented Nov 14, 2021

krzychu124 commented Nov 14, 2021

krzychu124 commented Nov 14, 2021

krzychu124 commented Nov 14, 2021

kvakvs commented Nov 14, 2021

krzychu124 commented Nov 14, 2021

kvakvs commented Dec 7, 2021

originalfoo commented Dec 7, 2021

kvakvs commented Dec 7, 2021 • edited Loading

originalfoo left a comment • edited Loading

Choose a reason for hiding this comment

kvakvs commented Dec 7, 2021 • edited Loading

originalfoo commented Dec 7, 2021

kvakvs commented Dec 7, 2021

originalfoo commented Dec 8, 2021

kvakvs commented Oct 18, 2021 •

edited

Loading

kvakvs commented Oct 20, 2021 •

edited

Loading

kvakvs commented Dec 7, 2021 •

edited

Loading

originalfoo left a comment •

edited

Loading

kvakvs commented Dec 7, 2021 •

edited

Loading