Road sign themes reloadable + Canadian signs #1215

kvakvs · 2021-12-05T03:31:18Z

Features

NOTE: This is based on Speed Limits branch so the change set may look very large.
⚠ REVIEW SHORT DIFF AFTER SPEED LIMITS ARE MERGED

Road sign themes are configured in a shared list for both MPH and KMPH. Themes can be marked as supporting MPH and/or KMPH. Themes also have sign size/aspect stored in them in a nicer way.
Selecting a theme will unload previous theme and load new (save texture memory and faster loading time)
Selecting a theme without MPH support will disable the MPH checkbox
Selecting a theme without KM support will enable the MPH checkbox
Clicking MPH checkbox on a theme which doesn't support the new state, will reset theme to German_Kmph (the default).
Canadian signs contributed by a Discord user (Coreybpa)
Translations (option name and sign theme names)

TODO

Sorting currently by the translation key, which puts America in the end because the key is MPH_US. Consider sorting by translation maybe or leave like this?

-#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

…to have ResetToDefault type

…ts in speedlimits panel corrected too.

…ed, and hide on tool deactivate

…leared

…ated (rendering for another tool)

…cessible if action type is Unlimited or SetOverride

…erground to InGameUtil.cs

…ections; small optimisations

…something else.

…ngular vs square signs

… apply speed limit changes, its for preview only

…ver multiple signs)

… changed

…ckbox creation fixed

DaEgi01 · 2021-12-08T20:13:49Z

TLM/TLM/Manager/Impl/SpeedLimitManager.cs

@@ -146,11 +146,12 @@ or ItemClass.SubService.PublicTransportMetro
                laneIndex++;
            }

-            if (validLanes > 0) {
-                meanSpeedLimit = meanSpeedLimit.Scale(1.0f / validLanes);
+            switch (validLanes) {


maybe not switch case if two cases only? :D

Converted to return with validLanes == 0 ? null : ...

DaEgi01 · 2021-12-09T23:10:45Z

TLM/TLM/State/OptionsTabs/OptionsGeneralTab.cs

-        private static UIDropDown _roadSignsMphThemeDropdown;
-        private static int _roadSignMphStyleInt;
+
+        // [Obsolete("To be removed")]


meh .. plz remove :D

DaEgi01 · 2021-12-09T23:12:46Z

TLM/TLM/State/OptionsTabs/OptionsGeneralTab.cs

@@ -338,24 +371,57 @@ public static class OptionsGeneralTab {
            }
        }

-        private static void OnRoadSignsMphThemeChanged(int newRoadSignStyle) {
+        // private static void OnRoadSignsMphThemeChanged(int newRoadSignStyle) {


meh, plz remove

DaEgi01 · 2021-12-09T23:16:15Z

TLM/TLM/UI/Textures/SpeedLimitTextures.cs

+
+            private string PathPrefix;
+
+            public bool SupportsKmph;


why are these public fields that can be changed from the outside?

Changed to readonly, they are accessed from General options tab.

DaEgi01 · 2021-12-09T23:18:20Z

TLM/TLM/UI/Textures/SpeedLimitTextures.cs

-                    mip: true);
-                TexturesKmph.Add(speedLimit, resource ? resource : TexturesKmph[5]);
-            }
+        public static RoadSignTheme ActiveTheme {


lazy loading getter suck .. but ok .. same same before.

DaEgi01 · 2021-12-09T23:19:03Z

TLM/TLM/UI/Textures/SpeedLimitTextures.cs

-                    mip: true);
-                TexturesMphUK.Add(speedLimit, resourceUk ? resourceUk : TexturesMphUK[5]);
-            }
+        public const string GERMAN_KM_SIGNS = "Kmph_Germany";


why is this public and the rest not?

It is used as default fallback theme in the Options General tab

DaEgi01 · 2021-12-09T23:20:13Z

TLM/TLM/UI/Textures/SpeedLimitTextures.cs

-                        break;
-                }
-            }
+        // TODO: Split loading here into dynamic sections, static enforces everything to stay in this ctor


why static ctor?

The class is static.
The solution would be to make it a regular class and access via SpeedLimitsTextures.Instance a bit longer and slower.

TLM/TLM/UI/SubTools/SpeedLimits/SpeedLimitsTool.cs

krzychu124 · 2021-12-11T20:38:42Z

plus missing translation string (keybinds tab)

krzychu124 · 2021-12-11T21:22:50Z

Oh, and I noticed one more bug: cannot change language in main menu

NullReferenceException: Object reference not set to an instance of an object
  at TrafficManager.State.OptionsGeneralTab.OnLanguageChanged (Int32 newLanguageIndex) [0x00000] in <filename unknown>:0 
  at UIHelper+<AddDropdown>c__AnonStorey2.<>m__0 (ColossalFramework.UI.UIComponent c, Int32 sel) [0x00000] in <filename unknown>:0 
  at ColossalFramework.UI.UIDropDown.OnSelectedIndexChanged () [0x00000] in <filename unknown>:0 
  at ColossalFramework.UI.UIDropDown.set_selectedIndex (Int32 value) [0x00000] in <filename unknown>:0 
  at ColossalFramework.UI.UIDropDown.PopupSelectedIndexChanged (ColossalFramework.UI.UIComponent component, Int32 si) [0x00000] in <filename unknown>:0 
  at ColossalFramework.UI.UIListBox.OnSelectedIndexChanged () [0x00000] in <filename unknown>:0 
  at ColossalFramework.UI.UIListBox.set_selectedIndex (Int32 value) [0x00000] in <filename unknown>:0 
  at ColossalFramework.UI.UIListBox.OnMouseDown (ColossalFramework.UI.UIMouseEventParameter p) [0x00000] in <filename unknown>:0 
  at ColossalFramework.UI.UIInput+MouseHandler.ProcessInput (IInputTranslator translator, Ray ray, ColossalFramework.UI.UIComponent component, Boolean retainFocusSetting) [0x00000] in <filename unknown>:0 
  at ColossalFramework.UI.UIInput.ProcessMouseInput () [0x00000] in <filename unknown>:0 
  at ColossalFramework.UI.UIInput.Update () [0x00000] in <filename unknown>:0

…for crash on language change from main menu

…themes

originalfoo · 2021-12-28T18:45:12Z

Not sure if in scope of this PR (can move to the scope creep issue if preferred) but...

Still testing this; I'm finding the choice of speed unit vs. sign theme to be uncomfortable. IMO it would be better with a single drop down list.

In mod options:

Speed display:
- American (MPH)
- British (MPH)
- Canadian (km/h)
- German (km/h)
- German (MPH)

And on the speed palette, clicking the speed unit button could show the drop down list?

kvakvs · 2021-12-28T21:41:37Z

@aubergine10 Yes the drop down list is listed in your suggestions in #1221
The real world themes, except the German, support only one unit. It would be unnatural and confusing to see British signs showing km/h, so that's the only one theme doing it. I can make it repeat twice once per unit, though.

originalfoo · 2021-12-28T21:58:56Z

I can make it repeat twice once per unit, though.

Yup, that would be fine so long as units are clearly shown in the list items.

… for MPH theme; Updated strings

krzychu124

fc66449 @kvakvs have you tested that? It still does not work because in the main menu there is no instance of ModUI 😉

Also this when switching between Km/h and Mph

NullReferenceException: Object reference not set to an instance of an object
  at TrafficManager.U.Panel.BaseUWindowPanel.OnDestroy () [0x00000] in <filename unknown>:0

underlined field is null

…bscribers can be null

krzychu124

Still does not work as expected. I also found memory leak in SpeedLimitsToolWindow

3x switched between speed units:

green - latest, working panel,
red - garbage, all contain the same set of components,

TLM/TLM/State/OptionsTabs/OptionsGeneralTab.cs

krzychu124 · 2021-12-30T20:21:37Z

I'm 99.9% sure you should destroy Window gameObject at line 141, not just Window component here

TMPE/TLM/TLM/UI/SubTools/SpeedLimits/SpeedLimitsTool.cs

Lines 135 to 145 in f2b571f

    
           private void DestroyWindow() { 
        
               // Create a generic self-sizing window with padding of 4px. 
        
               if (this.Window != null) { 
        
                   this.Window.Hide(); 
        
                   // The constructor of new window will try to delete it by name, but we can help it 
        
                   UnityEngine.Object.Destroy(this.Window); 
        
               } 
        
               this.Window = null; 
        
           }

krzychu124

Finally! XD

kvakvs added 30 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

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

6ed359a

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)

SetSpeedLimitAction.cs: Speed limit value is now guarded, and only ac…

ec7897a

…cessible if action type is Unlimited or SetOverride

Minor cosmetics for SegmentLaneMarker.cs, moved useful function IsUnd…

cbe20d5

…erground to InGameUtil.cs

WIP render segment center signs

d327e4a

Merge Master into U-Speedlimits-Tool-7

05c126b

Show single speed limit mode for segments; average value for both dir…

42eec09

…ections; small optimisations

Set speed limits for segment

4940d9c

Render seg-default speed limit if Alt is held

8353d1e

Triple mode for edit Segments, Lanes and Defaults. Holding alt shows …

8929f32

…something else.

Draw circle with default speed limit, when no override. Fix for recta…

10a7518

…ngular vs square signs

Review cleanup

d0f02ca

Null window check for getting the mouse coords

1a9a15f

Krzychu's fix to parking manager freeze bug

ad8cb8e

Merge master

f408bfa

Keybind for speed limits now opens speed limits; Holding Alt will not…

5d5ac2b

… apply speed limit changes, its for preview only

Draw hovered segments and lanes (even more than one if mouse hovers o…

ab8fb29

…ver multiple signs)

Speed limits Translations: English, Russian, Ukrainian

d324e73

Events in ModUI grouped into a inner class; New event for UI Language…

e243837

… changed

Lane highlight for speed limits lane mode with Shift; Warning for che…

4352e6f

…ckbox creation fixed

DaEgi01 reviewed Dec 9, 2021

View reviewed changes

Speed limit themes: Minor corrections for Egi's review

9ecee42

originalfoo mentioned this pull request Dec 10, 2021

Speed tool - reset to default setting wrong speed #1226

Closed

krzychu124 requested changes Dec 11, 2021

View reviewed changes

TLM/TLM/UI/SubTools/SpeedLimits/SpeedLimitsTool.cs Outdated Show resolved Hide resolved

krzychu124 added this to the 11.6.0 milestone Dec 12, 2021

kvakvs added 4 commits December 24, 2021 02:30

Window visibility is maintained when the window must be rebuilt; Fix …

fc66449

…for crash on language change from main menu

Translations update

5a30aaf

Merge branch 'master' into feature/dynamic-sign-themes

8394e02

Merge remote-tracking branch 'tmpe/master' into feature/dynamic-sign-…

262fb4e

…themes

Sign themes use only one unit per theme; Use British signs as default…

9b72e58

… for MPH theme; Updated strings

krzychu124 self-requested a review December 29, 2021 19:57

krzychu124 requested changes Dec 29, 2021

View reviewed changes

kvakvs added 2 commits December 30, 2021 00:57

Check the game is loaded before firing option changed events

6d91794

Null propagation when disposing of event subscribers where event unsu…

f2b571f

…bscribers can be null

krzychu124 self-requested a review December 30, 2021 19:16

krzychu124 requested changes Dec 30, 2021

View reviewed changes

TLM/TLM/State/OptionsTabs/OptionsGeneralTab.cs Outdated Show resolved Hide resolved

RebuildMenu regardless of isGameLoaded; Destroy gameobject not component

971fef8

krzychu124 self-requested a review December 31, 2021 00:48

krzychu124 approved these changes Dec 31, 2021

View reviewed changes

+translations for themes branch

0360e50

kvakvs merged commit c5f8c1e into CitiesSkylinesMods:master Dec 31, 2021

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

Road sign themes reloadable + Canadian signs #1215

Road sign themes reloadable + Canadian signs #1215

kvakvs commented Dec 5, 2021 •

edited

DaEgi01 Dec 8, 2021

kvakvs Dec 10, 2021

DaEgi01 Dec 9, 2021

kvakvs Dec 10, 2021

DaEgi01 Dec 9, 2021

kvakvs Dec 10, 2021

DaEgi01 Dec 9, 2021

kvakvs Dec 10, 2021

DaEgi01 Dec 9, 2021

DaEgi01 Dec 9, 2021

kvakvs Dec 10, 2021

DaEgi01 Dec 9, 2021

kvakvs Dec 10, 2021

krzychu124 commented Dec 11, 2021

krzychu124 commented Dec 11, 2021

originalfoo commented Dec 28, 2021

kvakvs commented Dec 28, 2021

originalfoo commented Dec 28, 2021

krzychu124 left a comment

krzychu124 left a comment

krzychu124 commented Dec 30, 2021

krzychu124 left a comment

Road sign themes reloadable + Canadian signs #1215

Road sign themes reloadable + Canadian signs #1215

Conversation

kvakvs commented Dec 5, 2021 • edited

Features

TODO

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

krzychu124 commented Dec 11, 2021

krzychu124 commented Dec 11, 2021

originalfoo commented Dec 28, 2021

kvakvs commented Dec 28, 2021

originalfoo commented Dec 28, 2021

krzychu124 left a comment

Choose a reason for hiding this comment

krzychu124 left a comment

Choose a reason for hiding this comment

krzychu124 commented Dec 30, 2021

krzychu124 left a comment

Choose a reason for hiding this comment

kvakvs commented Dec 5, 2021 •

edited