Skip rendering InvisibleInGame=yes objects and building foundation li…

…nes when extracting megamap

src/TSMapEditor/Config/EditorRules.ini

@@ -13,6 +13,22 @@ RenderInEditor=no
 [RAAPWR_S]
 RenderInEditor=no
 
+; Hide editor-only overlay and terrain objects from map previews
+[IMOV]
+InvisibleInGame=yes
+
+[NOVERLAY]
+InvisibleInGame=yes
+
+[TUNENT]
+InvisibleInGame=yes
+
+[NOBUILD]
+InvisibleInGame=yes
+
+[IMTO]
+InvisibleInGame=yes
+
 [ObjectOwnerOverrides]
 GDI1=GDI
 GDI2=GDI

src/TSMapEditor/Models/GameObject.cs

@@ -47,6 +47,8 @@ public override int GetHashCode()
 
         public virtual bool Remapable() => false;
 
+        public virtual bool IsInvisibleInGame() => false;
+
         public virtual Color GetRemapColor() => Color.White;
     }
 }

src/TSMapEditor/Models/GameObjectType.cs

@@ -21,6 +21,8 @@ public GameObjectType(string iniName)
         public string EditorCategory { get; set; }
         public bool EditorVisible { get; set; } = true;
 
+        public bool InvisibleInGame { get; set; }
+
         /// <summary>
         /// Specifies which theaters this terrain object type can be placed down in.
         /// If empty, it is considered valid for all theaters.

src/TSMapEditor/Models/Overlay.cs

@@ -18,6 +18,8 @@ public override int GetShadowFrameIndex(int frameCount)
             return 100;
         }
 
+        public override bool IsInvisibleInGame() => OverlayType.InvisibleInGame;
+
         public override int GetYDrawOffset()
         {
             if (OverlayType.IsVeinholeMonster)

src/TSMapEditor/Models/Techno.cs

@@ -27,6 +27,8 @@ public override double GetGapGeneratorRange()
 
         public override Color GetRadialColor() => Owner?.XNAColor ?? Color.White;
 
+        public override bool IsInvisibleInGame() => ObjectType.InvisibleInGame;
+
         public T ObjectType { get; }
     }
 

src/TSMapEditor/Models/TerrainObject.cs

@@ -21,6 +21,8 @@ public TerrainObject(TerrainType terrainType, Point2D position) : this(terrainTy
 
         public TerrainType TerrainType { get; private set; }
 
+        public override bool IsInvisibleInGame() => TerrainType.InvisibleInGame;
+
         public override int GetYDrawOffset()
         {
             if (TerrainType.SpawnsTiberium)

src/TSMapEditor/Rendering/EditorState.cs

@@ -251,6 +251,8 @@ public RenderObjectFlags RenderObjectFlags
             }
         }
 
+        public bool RenderInvisibleInGameObjects { get; set; } = true;
+
         public CopiedMapData CopiedMapData { get; set; }
     }
 }

src/TSMapEditor/Rendering/MapView.cs

@@ -983,6 +983,9 @@ private void DrawObjects()
 
         private void DrawObject(GameObject gameObject)
         {
+            if (!EditorState.RenderInvisibleInGameObjects && gameObject.IsInvisibleInGame())
+                return;
+
             switch (gameObject.WhatAmI())
             {
                 case RTTIType.Aircraft:
@@ -1962,6 +1965,8 @@ public void ExtractMegamapTo(string path)
 
         private void InstantRenderMinimap()
         {
+            EditorState.RenderInvisibleInGameObjects = false;
+
             // Register ourselves as a minimap user so the minimap texture gets refreshed
             MinimapUsers.Add(this);
 
@@ -1990,6 +1995,8 @@ private void InstantRenderMinimap()
             Renderer.EndDraw();
 
             MinimapUsers.Remove(this);
+
+            EditorState.RenderInvisibleInGameObjects = true;
         }
     }
 }

src/TSMapEditor/Rendering/ObjectRenderers/BuildingRenderer.cs

@@ -91,7 +91,8 @@ private void DrawBibGraphics(Structure gameObject, ShapeImage bibGraphics, int h
 
         protected override void Render(Structure gameObject, int heightOffset, Point2D drawPoint, in CommonDrawParams drawParams)
         {
-            DrawFoundationLines(gameObject);
+            if (RenderDependencies.EditorState.RenderInvisibleInGameObjects)
+                DrawFoundationLines(gameObject);
 
             bool affectedByLighting = RenderDependencies.EditorState.IsLighting && (drawParams.ShapeImage != null && drawParams.ShapeImage.SubjectToLighting);