Increase and standardize turret z offset to counter depth errors due to float imprecision

Author: Rampastring

src/TSMapEditor/Rendering/ObjectRenderers/BuildingRenderer.cs

@@ -528,7 +528,7 @@ private void DrawVoxelTurret(Structure gameObject, Point2D drawPoint, in CommonD
 
                     DrawVoxelModel(gameObject, drawParams.BarrelVoxel,
                         gameObject.Facing, RampType.None, nonRemapColor, true, gameObject.GetRemapColor(),
-                        affectedByLighting, turretDrawPoint, Constants.DepthEpsilon * 3); // appears to need a 3x multiplier due to float imprecision
+                        affectedByLighting, turretDrawPoint, Constants.DepthEpsilon * ObjectDepthAdjustments.Turret); // appears to need a 3x multiplier due to float imprecision
                 }
                 else
                 {
@@ -538,15 +538,15 @@ private void DrawVoxelTurret(Structure gameObject, Point2D drawPoint, in CommonD
 
                     DrawVoxelModel(gameObject, drawParams.TurretVoxel,
                         gameObject.Facing, RampType.None, nonRemapColor, true, gameObject.GetRemapColor(),
-                        affectedByLighting, turretDrawPoint, Constants.DepthEpsilon * 2); // Turret is always drawn above building
+                        affectedByLighting, turretDrawPoint, Constants.DepthEpsilon * ObjectDepthAdjustments.Turret); // Turret is always drawn above building
                 }
             }
             else if (gameObject.ObjectType.Turret && !gameObject.ObjectType.TurretAnimIsVoxel &&
                      gameObject.ObjectType.BarrelAnimIsVoxel)
             {
                 DrawVoxelModel(gameObject, drawParams.BarrelVoxel,
                     gameObject.Facing, RampType.None, nonRemapColor, true, gameObject.GetRemapColor(),
-                    affectedByLighting, drawPoint, Constants.DepthEpsilon);
+                    affectedByLighting, drawPoint, Constants.DepthEpsilon * ObjectDepthAdjustments.Turret);
             }
         }
 

src/TSMapEditor/Rendering/ObjectRenderers/ObjectDepthAdjustments.cs

@@ -11,5 +11,6 @@ public static class ObjectDepthAdjustments
         public const int Terrain = 300;
         public const int Vehicle = 150;
         public const int Shadow = 0;
+        public const int Turret = 3;
     }
 }

src/TSMapEditor/Rendering/ObjectRenderers/UnitRenderer.cs

@@ -88,16 +88,16 @@ protected override void Render(Unit gameObject, Point2D drawPoint, in CommonDraw
                     else
                         RenderTurretShape(gameObject, drawPoint, drawParams, Constants.DepthEpsilon);
 
-                    RenderVoxelModel(gameObject, drawPoint + turretOffset, drawParams.BarrelVoxel, affectedByLighting, Constants.DepthEpsilon * 2);
+                    RenderVoxelModel(gameObject, drawPoint + turretOffset, drawParams.BarrelVoxel, affectedByLighting, Constants.DepthEpsilon * ObjectDepthAdjustments.Turret);
                 }
                 else
                 {
                     RenderVoxelModel(gameObject, drawPoint + turretOffset, drawParams.BarrelVoxel, affectedByLighting, Constants.DepthEpsilon);
 
                     if (gameObject.UnitType.ArtConfig.Voxel)
-                        RenderVoxelModel(gameObject, drawPoint + turretOffset, drawParams.TurretVoxel, affectedByLighting, Constants.DepthEpsilon * 2);
+                        RenderVoxelModel(gameObject, drawPoint + turretOffset, drawParams.TurretVoxel, affectedByLighting, Constants.DepthEpsilon * ObjectDepthAdjustments.Turret);
                     else
-                        RenderTurretShape(gameObject,  drawPoint, drawParams, Constants.DepthEpsilon * 2);
+                        RenderTurretShape(gameObject,  drawPoint, drawParams, Constants.DepthEpsilon * ObjectDepthAdjustments.Turret);
                 }
             }
         }