Merge pull request #641 from kvakvs/texture-reorganise

UI textures regrouped under Resources/

TLM/TLM/TLM.csproj

@@ -249,8 +249,9 @@
     <Compile Include="UI\SubTools\SpeedLimits\MphSignStyle.cs" />
     <Compile Include="UI\SubTools\SpeedLimits\SpeedLimitsTool.cs" />
     <Compile Include="UI\SubTools\SpeedLimits\SpeedUnit.cs" />
-    <Compile Include="UI\Textures\JunctionUITextures.cs" />
-    <Compile Include="UI\Textures\RoadUITextures.cs" />
+    <Compile Include="UI\Textures\JunctionRestrictions.cs" />
+    <Compile Include="UI\Textures\MainMenu.cs" />
+    <Compile Include="UI\Textures\RoadUI.cs" />
     <Compile Include="UI\Textures\SpeedLimitTextures.cs" />
     <Compile Include="UI\Textures\TextureResources.cs" />
     <Compile Include="UI\Textures\TrafficLightTextures.cs" />
@@ -304,51 +305,76 @@
     <Compile Include="Util\SegmentTraverser.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\light_1_1.png" />
-    <EmbeddedResource Include="Resources\light_1_2.png" />
-    <EmbeddedResource Include="Resources\light_1_3.png" />
-    <EmbeddedResource Include="Resources\light_2_1.png" />
-    <EmbeddedResource Include="Resources\light_2_2.png" />
-    <EmbeddedResource Include="Resources\light_2_3.png" />
-    <EmbeddedResource Include="Resources\light_3_1.png" />
-    <EmbeddedResource Include="Resources\light_3_2.png" />
-    <EmbeddedResource Include="Resources\light_3_3.png" />
-    <EmbeddedResource Include="Resources\light_4_1.png" />
-    <EmbeddedResource Include="Resources\light_4_2.png" />
-    <EmbeddedResource Include="Resources\light_4_3.png" />
-    <EmbeddedResource Include="Resources\light_5_1.png" />
-    <EmbeddedResource Include="Resources\light_5_2.png" />
-    <EmbeddedResource Include="Resources\light_5_3.png" />
-    <EmbeddedResource Include="Resources\light_6_1.png" />
-    <EmbeddedResource Include="Resources\light_6_2.png" />
-    <EmbeddedResource Include="Resources\light_6_3.png" />
-    <EmbeddedResource Include="Resources\light_counter.png" />
-    <EmbeddedResource Include="Resources\light_mode.png" />
-    <EmbeddedResource Include="Resources\light_yellow.png" />
-    <EmbeddedResource Include="Resources\pedestrian_light_1.png" />
-    <EmbeddedResource Include="Resources\pedestrian_light_2.png" />
+    <EmbeddedResource Include="Resources\JunctionRestrictions\crossing_allowed.png" />
+    <EmbeddedResource Include="Resources\JunctionRestrictions\crossing_forbidden.png" />
+    <EmbeddedResource Include="Resources\JunctionRestrictions\enterblocked_allowed.png" />
+    <EmbeddedResource Include="Resources\JunctionRestrictions\enterblocked_forbidden.png" />
+    <EmbeddedResource Include="Resources\JunctionRestrictions\lanechange_allowed.png" />
+    <EmbeddedResource Include="Resources\JunctionRestrictions\lanechange_forbidden.png" />
+    <EmbeddedResource Include="Resources\JunctionRestrictions\left_on_red_allowed.png" />
+    <EmbeddedResource Include="Resources\JunctionRestrictions\left_on_red_forbidden.png" />
+    <EmbeddedResource Include="Resources\JunctionRestrictions\right_on_red_allowed.png" />
+    <EmbeddedResource Include="Resources\JunctionRestrictions\right_on_red_forbidden.png" />
+    <EmbeddedResource Include="Resources\JunctionRestrictions\uturn_allowed.png" />
+    <EmbeddedResource Include="Resources\JunctionRestrictions\uturn_forbidden.png" />
+    <EmbeddedResource Include="Resources\MainMenu\LegacyButtons.png" />
+    <EmbeddedResource Include="Resources\MainMenu\MenuButton.png" />
+    <EmbeddedResource Include="Resources\MainMenu\noimage.png" />
+    <EmbeddedResource Include="Resources\MainMenu\remove-btn.png" />
+    <EmbeddedResource Include="Resources\MainMenu\WindowBackground.png" />
     <EmbeddedResource Include="Resources\pedestrian_mode_1.png" />
     <EmbeddedResource Include="Resources\pedestrian_mode_2.png" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\sign_none.png" />
-    <EmbeddedResource Include="Resources\sign_priority.png" />
-    <EmbeddedResource Include="Resources\sign_stop.png" />
-    <EmbeddedResource Include="Resources\sign_yield.png" />
+    <EmbeddedResource Include="Resources\RoadUI\bicycle_infosign.png" />
+    <EmbeddedResource Include="Resources\RoadUI\bus_infosign.png" />
+    <EmbeddedResource Include="Resources\RoadUI\cargotrain_infosign.png" />
+    <EmbeddedResource Include="Resources\RoadUI\cargotruck_infosign.png" />
+    <EmbeddedResource Include="Resources\RoadUI\emergency_infosign.png" />
+    <EmbeddedResource Include="Resources\RoadUI\parking_allowed.png" />
+    <EmbeddedResource Include="Resources\RoadUI\parking_disallowed.png" />
+    <EmbeddedResource Include="Resources\RoadUI\passengercar_infosign.png" />
+    <EmbeddedResource Include="Resources\RoadUI\passengertrain_infosign.png" />
+    <EmbeddedResource Include="Resources\RoadUI\remove_signs.png" />
+    <EmbeddedResource Include="Resources\RoadUI\service_infosign.png" />
+    <EmbeddedResource Include="Resources\RoadUI\sign_none.png" />
+    <EmbeddedResource Include="Resources\RoadUI\sign_priority.png" />
+    <EmbeddedResource Include="Resources\RoadUI\sign_stop.png" />
+    <EmbeddedResource Include="Resources\RoadUI\sign_yield.png" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\lanechange_allowed.png" />
-    <EmbeddedResource Include="Resources\lanechange_forbidden.png" />
-    <EmbeddedResource Include="Resources\bicycle_infosign.png" />
-    <EmbeddedResource Include="Resources\bus_infosign.png" />
-    <EmbeddedResource Include="Resources\cargotrain_infosign.png" />
-    <EmbeddedResource Include="Resources\cargotruck_infosign.png" />
-    <EmbeddedResource Include="Resources\passengercar_infosign.png" />
-    <EmbeddedResource Include="Resources\passengertrain_infosign.png" />
-    <EmbeddedResource Include="Resources\emergency_infosign.png" />
-    <EmbeddedResource Include="Resources\service_infosign.png" />
-    <EmbeddedResource Include="Resources\taxi_infosign.png" />
-    <EmbeddedResource Include="Resources\tram_infosign.png" />
+    <EmbeddedResource Include="Resources\RoadUI\taxi_infosign.png" />
+    <EmbeddedResource Include="Resources\RoadUI\tram_infosign.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\clock_pause.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\clock_play.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\clock_test.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_1_1.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_1_2.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_1_3.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_2_1.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_2_2.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_2_3.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_3_1.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_3_2.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_3_3.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_4_1.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_4_2.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_4_3.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_5_1.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_5_2.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_5_3.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_6_1.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_6_2.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_6_3.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_counter.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_counter_ja.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_counter_pl.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_mode.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_mode_ja.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_mode_pl.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\light_yellow.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\pedestrian_light_1.png" />
+    <EmbeddedResource Include="Resources\TrafficLights\pedestrian_light_2.png" />
     <EmbeddedResource Include="Resources\bus_allowed.png" />
     <EmbeddedResource Include="Resources\bus_forbidden.png" />
     <EmbeddedResource Include="Resources\cargotrain_allowed.png" />
@@ -365,29 +391,7 @@
     <EmbeddedResource Include="Resources\service_forbidden.png" />
     <EmbeddedResource Include="Resources\taxi_allowed.png" />
     <EmbeddedResource Include="Resources\taxi_forbidden.png" />
-    <EmbeddedResource Include="Resources\light_counter_pl.png" />
-    <EmbeddedResource Include="Resources\light_mode_pl.png" />
     <EmbeddedResource Include="Resources\pedestrian_mode_2_pl.png" />
-    <EmbeddedResource Include="Resources\light_counter_ja.png" />
-    <EmbeddedResource Include="Resources\light_mode_ja.png" />
-    <EmbeddedResource Include="Resources\clock_pause.png" />
-    <EmbeddedResource Include="Resources\clock_test.png" />
-    <EmbeddedResource Include="Resources\clock_play.png" />
-    <EmbeddedResource Include="Resources\remove_signs.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\crossing_allowed.png" />
-    <EmbeddedResource Include="Resources\crossing_forbidden.png" />
-    <EmbeddedResource Include="Resources\enterblocked_allowed.png" />
-    <EmbeddedResource Include="Resources\enterblocked_forbidden.png" />
-    <EmbeddedResource Include="Resources\uturn_allowed.png" />
-    <EmbeddedResource Include="Resources\uturn_forbidden.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\MenuButton.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\noimage.png" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\incompatible_mods.txt" />
@@ -414,25 +418,6 @@
       <Name>TMPE.GenericGameBridge</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\mainmenu-btns.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\parking_allowed.png" />
-    <EmbeddedResource Include="Resources\parking_disallowed.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\remove-btn.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\WindowBackground.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\left_on_red_allowed.png" />
-    <EmbeddedResource Include="Resources\left_on_red_forbidden.png" />
-    <EmbeddedResource Include="Resources\right_on_red_allowed.png" />
-    <EmbeddedResource Include="Resources\right_on_red_forbidden.png" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>

TLM/TLM/UI/MainMenu/MenuButton.cs

@@ -4,7 +4,11 @@
     using TrafficManager.UI.Textures;
     using UnityEngine;
 
+    /// <summary>Base class for main menu panel buttons.</summary>
     public abstract class MenuButton : LinearSpriteButton {
+        /// <summary>
+        /// Defines tool types for TM:PE. Modes are exclusive, one can be active at a time.
+        /// </summary>
         public enum ButtonFunction {
             LaneConnector,
             ClearTraffic,
@@ -18,9 +22,10 @@ public enum ButtonFunction {
             TimedTrafficLights,
             ToggleTrafficLights,
             VehicleRestrictions,
-            ParkingRestrictions
+            ParkingRestrictions,
         }
 
+        /// <summary>Menu button gameobject name.</summary>
         private const string MENU_BUTTON = "TMPE_MenuButton";
 
         public override void HandleClick(UIMouseEventParameter p) { }
@@ -57,7 +62,7 @@ public override string[] FunctionNames {
             }
         }
 
-        public override Texture2D AtlasTexture => TextureResources.MainMenuButtonsTexture2D;
+        public override Texture2D AtlasTexture => Textures.MainMenu.MainMenuButtons;
 
         public override int Width => 50;
 

TLM/TLM/UI/RemoveCitizenInstanceButtonExtender.cs

@@ -82,7 +82,7 @@ public override void HandleClick(UIMouseEventParameter p) {
 
             public override bool Active => false;
 
-            public override Texture2D AtlasTexture => TextureResources.RemoveButtonTexture2D;
+            public override Texture2D AtlasTexture => Textures.MainMenu.RemoveButton;
 
             public override string ButtonName => "RemoveCitizenInstance";
 

TLM/TLM/UI/RemoveVehicleButtonExtender.cs

@@ -79,7 +79,7 @@ public override void HandleClick(UIMouseEventParameter p) {
 
             public override bool Active => false;
 
-            public override Texture2D AtlasTexture => TextureResources.RemoveButtonTexture2D;
+            public override Texture2D AtlasTexture => Textures.MainMenu.RemoveButton;
 
             public override string ButtonName => "RemoveVehicle";
 

TLM/TLM/UI/SubTool.cs

@@ -11,7 +11,7 @@ private Texture2D WindowTexture {
             get {
                 if (windowTexture_ == null) {
                     windowTexture_ = TrafficManagerTool.AdjustAlpha(
-                        TextureResources.WindowBackgroundTexture2D,
+                        Textures.MainMenu.WindowBackground,
                         TrafficManagerTool.GetWindowAlpha());
                 }
 

TLM/TLM/UI/SubTools/JunctionRestrictionsTool.cs

@@ -288,8 +288,8 @@ private bool drawSignHandles(bool debug,
                         y,
                         guiColor,
                         allowed
-                            ? JunctionUITextures.LaneChangeAllowedTexture2D
-                            : JunctionUITextures.LaneChangeForbiddenTexture2D,
+                            ? JunctionRestrictions.LaneChangeAllowed
+                            : JunctionRestrictions.LaneChangeForbidden,
                         out signHovered);
 
                     if (signHovered && handleClick) {
@@ -335,8 +335,8 @@ private bool drawSignHandles(bool debug,
                         y,
                         guiColor,
                         allowed
-                            ? JunctionUITextures.UturnAllowedTexture2D
-                            : JunctionUITextures.UturnForbiddenTexture2D,
+                            ? JunctionRestrictions.UturnAllowed
+                            : JunctionRestrictions.UturnForbidden,
                         out signHovered);
 
                     if (signHovered && handleClick) {
@@ -396,8 +396,8 @@ private bool drawSignHandles(bool debug,
                         y,
                         guiColor,
                         allowed
-                            ? JunctionUITextures.EnterBlockedJunctionAllowedTexture2D
-                            : JunctionUITextures.EnterBlockedJunctionForbiddenTexture2D,
+                            ? JunctionRestrictions.EnterBlockedJunctionAllowed
+                            : JunctionRestrictions.EnterBlockedJunctionForbidden,
                         out signHovered);
 
                     if (signHovered && handleClick) {
@@ -442,8 +442,8 @@ private bool drawSignHandles(bool debug,
                         y,
                         guiColor,
                         allowed
-                            ? JunctionUITextures.PedestrianCrossingAllowedTexture2D
-                            : JunctionUITextures.PedestrianCrossingForbiddenTexture2D,
+                            ? JunctionRestrictions.PedestrianCrossingAllowed
+                            : JunctionRestrictions.PedestrianCrossingForbidden,
                         out signHovered);
 
                     if (signHovered && handleClick) {
@@ -507,8 +507,8 @@ private bool drawSignHandles(bool debug,
                         y,
                         guiColor,
                         allowed
-                            ? JunctionUITextures.LeftOnRedAllowedTexture2D
-                            : JunctionUITextures.LeftOnRedForbiddenTexture2D,
+                            ? JunctionRestrictions.LeftOnRedAllowed
+                            : JunctionRestrictions.LeftOnRedForbidden,
                         out signHovered);
 
                     if (signHovered && handleClick) {
@@ -561,8 +561,8 @@ private bool drawSignHandles(bool debug,
                         y,
                         guiColor,
                         allowed
-                            ? JunctionUITextures.RightOnRedAllowedTexture2D
-                            : JunctionUITextures.RightOnRedForbiddenTexture2D,
+                            ? JunctionRestrictions.RightOnRedAllowed
+                            : JunctionRestrictions.RightOnRedForbidden,
                         out signHovered);
 
                     if (signHovered && handleClick) {

TLM/TLM/UI/SubTools/ManualTrafficLightsTool.cs

@@ -244,7 +244,7 @@ public override void OnToolGUI(Event e) {
 
                                 GUI.DrawTexture(
                                     infoRect,
-                                    RoadUITextures.VehicleInfoSignTextures[TrafficManagerTool.InfoSignsToDisplay[k]]);
+                                    RoadUI.VehicleInfoSignTextures[TrafficManagerTool.InfoSignsToDisplay[k]]);
 
                                 ++numInfos;
                             }

TLM/TLM/UI/SubTools/ParkingRestrictionsTool.cs

@@ -182,7 +182,7 @@ private bool DrawParkingRestrictionHandles(ushort segmentId,
                 }
 
                 GUI.color = guiColor;
-                GUI.DrawTexture(boundingBox, RoadUITextures.ParkingRestrictionTextures[allowed]);
+                GUI.DrawTexture(boundingBox, RoadUI.ParkingRestrictionTextures[allowed]);
 
                 if (hoveredHandle && clicked && !IsCursorInPanel() &&
                     parkingManager.ToggleParkingAllowed(segmentId, e.Key)) {

TLM/TLM/UI/SubTools/PrioritySignsTool.cs

@@ -379,7 +379,7 @@ private void ShowGUI(bool viewOnly) {
                         }
 
                         if (MainTool.DrawGenericSquareOverlayTexture(
-                                RoadUITextures.PrioritySignTextures[sign],
+                                RoadUI.PrioritySignTextures[sign],
                                 camPos,
                                 signPos,
                                 90f,
@@ -425,7 +425,7 @@ private void ShowGUI(bool viewOnly) {
                     // draw remove button and handle click
                     if (showRemoveButton
                         && MainTool.DrawHoverableSquareOverlayTexture(
-                            RoadUITextures.SignRemove,
+                            RoadUI.SignRemove,
                             camPos,
                             nodePos,
                             90f)

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

@@ -430,7 +430,7 @@ private void UpdateRoadTex(NetInfo info) {
             }
 
             // fallback to "noimage" texture
-            roadTexture = TextureResources.NoImageTexture2D;
+            roadTexture = Textures.MainMenu.NoImage;
         }
 
         /// <summary>
@@ -649,7 +649,7 @@ private void DrawSpeedLimitHandles(ushort segmentId,
                         && ((laneInfo.m_vehicleType & VehicleInfo.VehicleType.Monorail) !=
                             VehicleInfo.VehicleType.None))
                     {
-                        Texture2D tex1 = RoadUITextures.VehicleInfoSignTextures[
+                        Texture2D tex1 = RoadUI.VehicleInfoSignTextures[
                             LegacyExtVehicleType.ToNew(ExtVehicleType.PassengerTrain)];
                         MainTool.DrawStaticSquareOverlayGridTexture(
                             tex1,

TLM/TLM/UI/SubTools/TimedTrafficLightsTool.cs

@@ -1650,7 +1650,7 @@ private void ShowGUI() {
                                 guiColor.a = TrafficManagerTool.GetHandleAlpha(false);
                                 GUI.DrawTexture(
                                     infoRect,
-                                    RoadUITextures.VehicleInfoSignTextures[
+                                    RoadUI.VehicleInfoSignTextures[
                                         TrafficManagerTool.InfoSignsToDisplay[k]]);
                                 ++numInfos;
                             }