Fix crashes when drawing base nodes that have "remapable bibs" with no actual remap on them, fix remap of base nodes being shifted towards pink

Author: Rampastring

src/TSMapEditor/Rendering/MapView.cs

@@ -1143,13 +1143,19 @@ private void RecordBaseNode(GraphicalBaseNode graphicalBaseNode)
                 return;
             }
 
-            const float opacity = 0.35f;
+            const float opacity = 0.5f;
 
             ShapeImage bibGraphics = TheaterGraphics.BuildingBibTextures[graphicalBaseNode.BuildingType.Index];
             ShapeImage graphics = TheaterGraphics.BuildingTextures[graphicalBaseNode.BuildingType.Index];
             Color replacementColor = Color.DarkBlue;
             string iniName = graphicalBaseNode.BuildingType.ININame;
-            Color remapColor = (graphicalBaseNode.BuildingType.ArtConfig.Remapable ? graphicalBaseNode.Owner.XNAColor : Color.White) * opacity;
+            Color remapColor;
+            Color nonRemapColor = new Color(128, 128, 128, 255);
+
+            if (!graphicalBaseNode.BuildingType.ArtConfig.Remapable)
+                remapColor = nonRemapColor;
+            else
+                remapColor = new Color((byte)graphicalBaseNode.Owner.XNAColor.R, (byte)graphicalBaseNode.Owner.XNAColor.G, (byte)graphicalBaseNode.Owner.XNAColor.B, (byte)255) * opacity;
 
             int yDrawOffset = Constants.CellSizeY / -2;
             int frameIndex = 0;
@@ -1180,14 +1186,19 @@ private void RecordBaseNode(GraphicalBaseNode graphicalBaseNode)
                     objectSpriteRecord.AddGraphicsEntry(new ObjectSpriteEntry(bibGraphics.GetPaletteTexture(), bibFrame,
                         new Rectangle(bibFinalDrawPointX, bibFinalDrawPointY,
                         bibFrame.SourceRectangle.Width, bibFrame.SourceRectangle.Height),
-                        remapColor, false, false, new DepthRectangle(1f, 1f)));
+                        nonRemapColor * opacity, false, false, new DepthRectangle(1f, 1f)));
 
                     if (bibGraphics.HasRemapFrames())
                     {
-                        objectSpriteRecord.AddGraphicsEntry(new ObjectSpriteEntry(bibGraphics.GetPaletteTexture(), bibGraphics.GetRemapFrame(0),
-                            new Rectangle(bibFinalDrawPointX, bibFinalDrawPointY,
-                            bibFrame.SourceRectangle.Width, bibFrame.SourceRectangle.Height),
-                            remapColor, true, false, new DepthRectangle(1f, 1f)));
+                        var remapFrame = bibGraphics.GetRemapFrame(0);
+
+                        if (remapFrame != null)
+                        {
+                            objectSpriteRecord.AddGraphicsEntry(new ObjectSpriteEntry(bibGraphics.GetPaletteTexture(), bibGraphics.GetRemapFrame(0),
+                                new Rectangle(bibFinalDrawPointX, bibFinalDrawPointY,
+                                bibFrame.SourceRectangle.Width, bibFrame.SourceRectangle.Height),
+                                remapColor, true, false, new DepthRectangle(1f, 1f)));
+                        }
                     }
                 }
             }
@@ -1205,12 +1216,17 @@ private void RecordBaseNode(GraphicalBaseNode graphicalBaseNode)
             int y = drawPoint.Y - frame.ShapeHeight / 2 + frame.OffsetY + Constants.CellSizeY / 2 + yDrawOffset;
             Rectangle drawRectangle = new Rectangle(x, y, frame.SourceRectangle.Width, frame.SourceRectangle.Height);
 
-            objectSpriteRecord.AddGraphicsEntry(new ObjectSpriteEntry(graphics.GetPaletteTexture(), texture, frame.SourceRectangle, drawRectangle, remapColor, false, false, new DepthRectangle(1f, 1f)));
+            objectSpriteRecord.AddGraphicsEntry(new ObjectSpriteEntry(graphics.GetPaletteTexture(), texture, frame.SourceRectangle, drawRectangle, nonRemapColor * opacity, false, false, new DepthRectangle(1f, 1f)));
 
             if (graphics.HasRemapFrames())
             {
-                objectSpriteRecord.AddGraphicsEntry(new ObjectSpriteEntry(graphics.GetPaletteTexture(), graphics.GetRemapFrame(frameIndex).Texture, 
-                    graphics.GetRemapFrame(frameIndex).SourceRectangle, drawRectangle, remapColor, true, false, new DepthRectangle(1f, 1f)));
+                var remapFrame = graphics.GetRemapFrame(frameIndex);
+
+                if (remapFrame != null)
+                {
+                    objectSpriteRecord.AddGraphicsEntry(new ObjectSpriteEntry(graphics.GetPaletteTexture(), graphics.GetRemapFrame(frameIndex).Texture,
+                        graphics.GetRemapFrame(frameIndex).SourceRectangle, drawRectangle, remapColor, true, false, new DepthRectangle(1f, 1f)));
+                }
             }
 
             objectSpriteRecord.AddTextEntry(new TextEntry("#" + baseNodeIndex, baseNodeIndexColor, drawPoint));

src/TSMapEditor/Rendering/ShapeImage.cs

@@ -131,43 +131,49 @@ public void RenderToGraphicsPreparationObject(GraphicsPreparationClass graphicsP
                 if (frameInfo == null || frameData == null)
                     continue;
 
-                var positionedTexture = new PositionedTexture(shpFile.Width, shpFile.Height, frameInfo.XOffset, frameInfo.YOffset, null, Rectangle.Empty);
-
-                Point offset = graphicsPreparationObject.AddImage(frameInfo.Width, frameInfo.Height, frameData, positionedTexture);
-                positionedTexture.SourceRectangle = new Rectangle(offset.X, offset.Y, frameInfo.Width, frameInfo.Height);
-                Frames[i] = positionedTexture;
+                byte[] remapColorArray = null;
+                bool hasRemap = false;
 
                 if (remapable)
                 {
-                    byte[] remapColorArray = frameData.Select(b =>
+                    remapColorArray = new byte[frameData.Length];
+
+                    // If the sprite is remapable, copy the remapped areas to the remap sprite data
+                    // and erase them from the non-remapped sprite data.
+                    // We do this because the remapped areas are pink by default, causing sprites'
+                    // team colors to "shift" towards pink if sprites are drawn as transparent
+                    // (for example, in base nodes) without erasing the remap data from the regular
+                    // sprite, since sprites are drawn so that the regular sprite is drawn first,
+                    // and the teamcolored sprite is layered on top of the regular sprite.
+
+                    // Also, we record whether the sprite actually has remap data at all - some
+                    // objects declare themselves as remapable, while actually having 0 remapable pixels.
+                    // We can save (V)RAM by not generating remap textures for those objects.
+                    for (int pixelIndex = 0; pixelIndex < frameData.Length; pixelIndex++)
                     {
+                        byte b = frameData[pixelIndex];
                         if (b >= 0x10 && b <= 0x1F)
                         {
-                            // This is a remap color
-                            return (byte)b;
-                        }
-
-                        return (byte)0;
-                    }).ToArray();
-
-                    bool hasRemap = false;
-                    for (int b = 0; b < remapColorArray.Length; b++)
-                    {
-                        if (remapColorArray[b] != 0)
-                        {
+                            remapColorArray[pixelIndex] = b;
                             hasRemap = true;
-                            break;
+                            frameData[pixelIndex] = 0;
                         }
                     }
+                }
 
-                    if (hasRemap)
-                    {
-                        var remapTexture = new PositionedTexture(shpFile.Width, shpFile.Height, frameInfo.XOffset, frameInfo.YOffset, null, Rectangle.Empty);
+                var positionedTexture = new PositionedTexture(shpFile.Width, shpFile.Height, frameInfo.XOffset, frameInfo.YOffset, null, Rectangle.Empty);
 
-                        offset = graphicsPreparationObject.AddImage(frameInfo.Width, frameInfo.Height, remapColorArray, remapTexture);
-                        remapTexture.SourceRectangle = new Rectangle(offset.X, offset.Y, frameInfo.Width, frameInfo.Height);
-                        RemapFrames[i] = remapTexture;
-                    }
+                Point offset = graphicsPreparationObject.AddImage(frameInfo.Width, frameInfo.Height, frameData, positionedTexture);
+                positionedTexture.SourceRectangle = new Rectangle(offset.X, offset.Y, frameInfo.Width, frameInfo.Height);
+                Frames[i] = positionedTexture;
+
+                if (hasRemap)
+                {
+                    var remapTexture = new PositionedTexture(shpFile.Width, shpFile.Height, frameInfo.XOffset, frameInfo.YOffset, null, Rectangle.Empty);
+
+                    offset = graphicsPreparationObject.AddImage(frameInfo.Width, frameInfo.Height, remapColorArray, remapTexture);
+                    remapTexture.SourceRectangle = new Rectangle(offset.X, offset.Y, frameInfo.Width, frameInfo.Height);
+                    RemapFrames[i] = remapTexture;
                 }
             }
         }