Render infantry and vehicles on bridges above bridges

Author: Rampastring

src/TSMapEditor/Rendering/ObjectRenderers/InfantryRenderer.cs

@@ -23,6 +23,15 @@ protected override CommonDrawParams GetDrawParams(Infantry gameObject)
 
         protected override float GetDepthAddition(Infantry gameObject)
         {
+            if (gameObject.High)
+            {
+                // Add extra depth to the unit so it is rendered above the bridge.
+                // Why are we adding exactly this much?
+                // Because it happened to work - this is at least currently no smart mathematical formula.
+                int height = Constants.CellSizeY * 7;
+                return ((height / (float)Map.HeightInPixelsWithCellHeight) * Constants.DownwardsDepthRenderSpace) + (4 * Constants.DepthRenderStep) + Constants.DepthEpsilon * ObjectDepthAdjustments.Vehicle;
+            }
+
             return Constants.DepthEpsilon * ObjectDepthAdjustments.Infantry;
         }
 

src/TSMapEditor/Rendering/ObjectRenderers/UnitRenderer.cs

@@ -55,6 +55,15 @@ protected override float GetDepthFromPosition(Unit gameObject, Rectangle drawing
 
         protected override float GetDepthAddition(Unit gameObject)
         {
+            if (gameObject.High)
+            {
+                // Add extra depth to the unit so it is rendered above the bridge.
+                // Why are we adding exactly this much?
+                // Because it happened to work - this is at least currently no smart mathematical formula.
+                int height = Constants.CellSizeY * 7;
+                return ((height / (float)Map.HeightInPixelsWithCellHeight) * Constants.DownwardsDepthRenderSpace) + (4 * Constants.DepthRenderStep) + Constants.DepthEpsilon * ObjectDepthAdjustments.Vehicle;
+            }
+
             return Constants.DepthEpsilon * ObjectDepthAdjustments.Vehicle;
         }
 

src/TSMapEditor/UI/Windows/InfantryOptionsWindow.cs

@@ -128,6 +128,8 @@ private void BtnOK_LeftClick(object sender, EventArgs e)
             infantry.Mission = ddMission.SelectedItem == null ? infantry.Mission : ddMission.SelectedItem.Text;
             infantry.Veterancy = (int)ddVeterancy.SelectedItem.Tag;
 
+            bool refresh = false;
+
             if (ddSubCell.SelectedIndex != (int)infantry.SubCell && ddSubCell.SelectedIndex >= 0 && ddSubCell.SelectedIndex < (int)SubCell.Count)
             {
                 var infantryCell = map.GetTile(infantry.Position);
@@ -136,11 +138,21 @@ private void BtnOK_LeftClick(object sender, EventArgs e)
                     infantryCell.MoveInfantryToSubCell(infantry, (SubCell)ddSubCell.SelectedIndex);
                 }
 
-                mapView.AddRefreshPoint(infantryCell.CoordsToPoint());
+                refresh = true;
+            }
+
+            if (infantry.High != chkOnBridge.Checked)
+            {
+                infantry.High = chkOnBridge.Checked;
+                refresh = true;
+            }
+
+            if (refresh)
+            {
+                mapView.AddRefreshPoint(infantry.Position);
             }
 
             infantry.Group = tbGroup.Value;
-            infantry.High = chkOnBridge.Checked;
             infantry.AutocreateNoRecruitable = chkAutocreateNoRecruitable.Checked;
             infantry.AutocreateYesRecruitable = chkAutocreateYesRecruitable.Checked;
             infantry.AttachedTag = (Tag)attachedTagSelector.Tag;

src/TSMapEditor/UI/Windows/VehicleOptionsWindow.cs

@@ -19,13 +19,15 @@ public VehicleOptionsWindow(WindowManager windowManager, Map map, EditorState ed
             this.map = map;
             this.editorState = editorState;
             this.setFollowerCursorAction = new SetFollowerCursorAction(cursorActionTarget);
+            this.cursorActionTarget = cursorActionTarget;
         }
 
         public event EventHandler<TagEventArgs> TagOpened;
 
         private readonly Map map;
         private readonly EditorState editorState;
         private readonly SetFollowerCursorAction setFollowerCursorAction;
+        private readonly ICursorActionTarget cursorActionTarget;
 
         private XNATrackbar trbStrength;
         private XNALabel lblStrengthValue;
@@ -148,7 +150,13 @@ private void BtnOK_LeftClick(object sender, EventArgs e)
             unit.Veterancy = (int)ddVeterancy.SelectedItem.Tag;
             unit.Group = tbGroup.Value;
             unit.FollowerUnit = followerSelector.Tag as Unit;
-            unit.High = chkOnBridge.Checked;
+
+            if (unit.High != chkOnBridge.Checked)
+            {
+                unit.High = chkOnBridge.Checked;
+                cursorActionTarget.AddRefreshPoint(unit.Position);
+            }
+
             unit.AutocreateNoRecruitable = chkAutocreateNoRecruitable.Checked;
             unit.AutocreateYesRecruitable = chkAutocreateYesRecruitable.Checked;
             unit.AttachedTag = (Tag)attachedTagSelector.Tag;