Merge pull request #812 from Csantucci/rotated-dpu-display

Bug fix for https://bugs.launchpad.net/or/+bug/2009955 Missing code to rotate DMU display in 2D cabs

Author: Csantucci

Source/Orts.Formats.Msts/CabViewFile.cs

@@ -1447,6 +1447,9 @@ protected int ParseNumStyle(STFReader stf)
     public class CVCScreen : CabViewControl
     {
         public readonly Dictionary<string, string> CustomParameters = new Dictionary<string, string>();
+
+        public float Rotation { get; set; }
+
         public CVCScreen()
         {
         }
@@ -1460,6 +1463,7 @@ public CVCScreen(STFReader stf, string basepath)
                 new STFReader.TokenProcessor("graphic", ()=>{ ParseGraphic(stf, basepath); }),
                 new STFReader.TokenProcessor("units", ()=>{ ParseUnits(stf); }),
                 new STFReader.TokenProcessor("parameters", ()=>{ ParseCustomParameters(stf); }),
+                new STFReader.TokenProcessor("ortsangle", () =>{ Rotation = ParseRotation(stf); }),
                 new STFReader.TokenProcessor("disablediflowvoltagepowersupplyoff", ()=>{ ParseDisabledIfLowVoltagePowerSupplyOff(stf); }),
                 new STFReader.TokenProcessor("disabledifcabpowersupplyoff", ()=>{ ParseDisabledIfCabPowerSupplyOff(stf); }),
                 new STFReader.TokenProcessor("hideifdisabled", ()=>{ ParseHideIfDisabled(stf); }),

Source/RunActivity/Viewer3D/Popups/WindowText.cs

@@ -229,8 +229,9 @@ public void Draw(SpriteBatch spriteBatch, Rectangle position, Point offset, stri
         }
 
         [CallOnThread("Render")]
-        void Draw(SpriteBatch spriteBatch, Point position, float rotation, int width, string text, LabelAlignment align, Color color, Color outline)
+        public void Draw(SpriteBatch spriteBatch, Point position, float rotation, int width, string text, LabelAlignment align, Color color, Color outline)
         {
+            if (text == null) return;
             EnsureCharacterData(text);
             var characters = Characters;
 

Source/RunActivity/Viewer3D/RollingStock/SubSystems/DistributedPowerInterface.cs

@@ -82,7 +82,7 @@ public class DistributedPowerInterface
         /// </summary>
         public bool IsSoftLayout;
         public DPIWindow ActiveWindow;
-        public DistributedPowerInterface(float height, float width, MSTSLocomotive locomotive, Viewer viewer, CabViewControl control)
+        public DistributedPowerInterface(float height, float width, MSTSLocomotive locomotive, Viewer viewer, CVCScreen control)
         {
             Viewer = viewer;
             Locomotive = locomotive;
@@ -172,7 +172,7 @@ public DPDefaultWindow(DistributedPowerInterface dpi, CabViewControl control) :
                 sUnits = sUnits.Replace('/', '_');
                 CABViewControlUnits.TryParse(sUnits, out LoadUnits);
             }
-            DPITable = new DPITable(FullTable, LoadUnits, fullScreen:true, dpi:dpi);
+            DPITable = new DPITable(FullTable, LoadUnits, fullScreen:true, dpi:dpi, (control as CVCScreen).Rotation);
             AddToLayout(DPITable, new Point(0, 0));
         }
     }
@@ -199,18 +199,20 @@ public class TextPrimitive
             public Color Color;
             public WindowTextFont Font;
             public string Text;
+            public float DrawRotation;
 
-            public TextPrimitive(Point position, Color color, string text, WindowTextFont font)
+            public TextPrimitive(Point position, Color color, string text, WindowTextFont font, float drawRotation = 0)
             {
                 Position = position;
                 Color = color;
                 Text = text;
                 Font = font;
+                DrawRotation = drawRotation;
             }
 
             public void Draw(SpriteBatch spriteBatch, Point position)
             {
-                Font.Draw(spriteBatch, position, Text, Color);
+                Font.Draw(spriteBatch, position, DrawRotation, 0, Text, LabelAlignment.Left, Color, Color.Black);
             }
         }
         public struct TexturePrimitive
@@ -372,6 +374,7 @@ public class DPITable : DPIWindow
         readonly int ColLength = 88;
         public bool FullTable = true;
         public CABViewControlUnits LoadUnits;
+        private float DrawRotation = 0;
 
         // Change text color
         readonly Dictionary<string, Color> ColorCodeCtrl = new Dictionary<string, Color>
@@ -390,22 +393,24 @@ public class DPITable : DPIWindow
 
         public readonly string[] FirstColumn = { "ID", "Throttle", "Load", "BP", "Flow", "Remote", "ER", "BC", "MR" };
 
-        public DPITable(bool fullTable, CABViewControlUnits loadUnits, bool fullScreen, DistributedPowerInterface dpi) : base(dpi, 640,  fullTable? 230 : 162)
+        public DPITable(bool fullTable, CABViewControlUnits loadUnits, bool fullScreen, DistributedPowerInterface dpi, float drawRotation) : base(dpi, 640,  fullTable? 230 : 162)
         {
             DPI = dpi;
             FullScreen = fullScreen;
             FullTable = fullTable;
             LoadUnits = loadUnits;
+            DrawRotation = drawRotation;
             BackgroundColor = DPI.BlackWhiteTheme ? Color.Black : ColorBackground;
             SetFont();
             string text = "";
             for (int iRow = 0; iRow < (fullTable ? NumberOfRowsFull : NumberOfRowsPartial); iRow++)
             {
                 for (int iCol = 0; iCol < NumberOfColumns; iCol++)
                 {
-//                    text = iCol.ToString() + "--" + iRow.ToString();
-                    TableText[iRow, iCol] = new TextPrimitive(new Point(20 + ColLength * iCol, (iRow) * (FontHeightTableText + 8)), Color.White, text, TableTextFont);
-                    TableSymbol[iRow, iCol] = new TextPrimitive(new Point(10 + ColLength * iCol, (iRow) * (FontHeightTableText + 8)), Color.Green, text, TableSymbolFont);
+                    TableText[iRow, iCol] = new TextPrimitive(new Point(20 + ColLength * iCol - (int)(iRow * (FontHeightTableText - 8) * DrawRotation / 2), (iRow) * (FontHeightTableText + 8) + (int)(ColLength * iCol * DrawRotation)),
+                        Color.White, text, TableTextFont, DrawRotation);
+                    TableSymbol[iRow, iCol] = new TextPrimitive(new Point(10 + ColLength * iCol - (int)(iRow * (FontHeightTableText - 8) * DrawRotation / 2), (iRow) * (FontHeightTableText + 8) + (int)(ColLength * iCol * DrawRotation)),
+                        Color.Green, text, TableSymbolFont, DrawRotation);
                 }
             }
         }