Overlay rendering

- also, sequences for HBOX and PBOX

OpenRa.FileFormats/Map.cs

@@ -124,7 +124,6 @@ namespace OpenRa.FileFormats
 			for( int i = 0 ; i < 128 ; i++ )
 				for( int j = 0 ; j < 128 ; j++ )
 					MapTiles[ j, i ].overlay = ReadByte( ms );
-
 		}
 
 		void ReadTrees( IniFile file )

OpenRa.Game/Game.cs

@@ -30,7 +30,7 @@ namespace OpenRa.Game
 			Rules.LoadRules();
 
 			for( int i = 0 ; i < 8 ; i++ )
-				players.Add(i, new Player(i, string.Format("Multi{0}", i), OpenRa.TechTree.Race.Soviet));
+				players.Add(i, new Player(i, string.Format("Multi{0}", i), OpenRa.TechTree.Race.Allies));
 
 			map = new Map(new IniFile(FileSystem.Open(mapName)));
 			FileSystem.Mount(new Package(map.Theater + ".mix"));

OpenRa.Game/Graphics/OverlayRenderer.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using OpenRa.FileFormats;
+
+namespace OpenRa.Game.Graphics
+{
+	class OverlayRenderer
+	{
+		static string[] overlaySpriteNames = new string[]
+			{
+				"sbag", "cycl", "brik", "fenc", "wood",
+				"gold01", "gold02", "gold03", "gold04",
+				"gem01", "gem02", "gem03", "gem04",
+				"v12", "v13", "v14", "v15", "v16", "v17", "v18",
+				"fpls", "wcrate", "scrate", "barb", "sbag"
+			};
+		Sprite[][] overlaySprites;
+
+		SpriteRenderer spriteRenderer;
+		Map map;
+
+		public OverlayRenderer( Renderer renderer, Map map )
+		{
+			this.spriteRenderer = new SpriteRenderer( renderer, true );
+			this.map = map;
+
+			overlaySprites = new Sprite[ overlaySpriteNames.Length ][];
+			for( int i = 0 ; i < overlaySpriteNames.Length ; i++ )
+				overlaySprites[ i ] = SpriteSheetBuilder.LoadAllSprites( overlaySpriteNames[ i ], ".shp", ".tem", ".sno" );
+		}
+
+		public void Draw()
+		{
+			for( int y = 0 ; y < 128 ; y++ )
+			{
+				for( int x = 0 ; x < 128 ; x++ )
+				{
+					if( map.MapTiles[ x, y ].overlay < overlaySprites.Length )
+					{
+						var location = new int2( x, y );
+						var sprites = overlaySprites[ map.MapTiles[ x, y ].overlay ];
+						spriteRenderer.DrawSprite( sprites[ sprites.Length / 2-1 ], 24 * (float2)( location - map.Offset ), 0 );
+					}
+				}
+			}
+
+			spriteRenderer.Flush();
+		}
+	}
+}

OpenRa.Game/Graphics/SpriteSheetBuilder.cs

@@ -5,16 +5,24 @@ namespace OpenRa.Game.Graphics
 {
 	static class SpriteSheetBuilder
 	{
-		static Dictionary<string, Sprite> sprites =
-			new Dictionary<string, Sprite>();
+		static Dictionary<string, Sprite[]> sprites =
+			new Dictionary<string, Sprite[]>();
 
-		public static Sprite LoadSprite(string filename)
+		public static Sprite LoadSprite(string filename, params string[] exts )
 		{
-			Sprite value;
-			if (!sprites.TryGetValue(filename, out value))
+			return LoadAllSprites( filename, exts )[ 0 ];
+		}
+
+		public static Sprite[] LoadAllSprites( string filename, params string[] exts )
+		{
+			Sprite[] value;
+			if( !sprites.TryGetValue( filename, out value ) )
 			{
-				ShpReader shp = new ShpReader(FileSystem.Open(filename));
-				sprites.Add(filename, value = SheetBuilder.Add(shp[0].Image, shp.Size));
+				ShpReader shp = new ShpReader( FileSystem.OpenWithExts( filename, exts ) );
+				value = new Sprite[ shp.ImageCount ];
+				for( int i = 0 ; i < shp.ImageCount ; i++ )
+					value[ i ] = SheetBuilder.Add( shp[ i ].Image, shp.Size );
+				sprites.Add( filename, value );
 			}
 
 			return value;

OpenRa.Game/Graphics/TerrainRenderer.cs

@@ -17,6 +17,7 @@ namespace OpenRa.Game.Graphics
 		Renderer renderer;
 		Map map;
         Viewport viewport;
+		OverlayRenderer overlayRenderer;
 
 		public TerrainRenderer(Renderer renderer, Map map, Viewport viewport)
 		{
@@ -25,6 +26,7 @@ namespace OpenRa.Game.Graphics
 			region = Region.Create(viewport, DockStyle.Left, viewport.Width - 128, Draw, null );
 			viewport.AddRegion(region);
 			this.map = map;
+			overlayRenderer = new OverlayRenderer( renderer, map );
 
 			tileSet = new TileSet( map.TileSuffix );
 
@@ -78,6 +80,8 @@ namespace OpenRa.Game.Graphics
                     new Range<int>(verticesPerRow * firstRow, verticesPerRow * lastRow),
                     new Range<int>(indicesPerRow * firstRow, indicesPerRow * lastRow),
                     terrainSheet.Texture, PrimitiveType.TriangleList));
+
+			overlayRenderer.Draw();
 		}
 	}
 }

OpenRa.Game/OpenRa.Game.csproj

@@ -77,6 +77,7 @@
     <Compile Include="Graphics\Animation.cs" />
     <Compile Include="Game.cs" />
     <Compile Include="Graphics\LineRenderer.cs" />
+    <Compile Include="Graphics\OverlayRenderer.cs" />
     <Compile Include="Graphics\WorldRenderer.cs" />
     <Compile Include="IOrderGenerator.cs" />
     <Compile Include="TechTree\Item.cs" />

OpenRa.Game/Sidebar.cs

@@ -71,7 +71,7 @@ namespace OpenRa.Game
 				string key = line.Substring(0, line.IndexOf(','));
 				int secondComma = line.IndexOf(',', line.IndexOf(',') + 1);
 				string group = line.Substring(secondComma + 1, line.Length - secondComma - 1);
-				sprites.Add(key, SpriteSheetBuilder.LoadSprite(key + "icon.shp"));
+				sprites.Add( key, SpriteSheetBuilder.LoadSprite( key + "icon", ".shp" ) );
 				itemGroups.Add(key, group);
 			}
 		}

OpenRa.Game/World.cs

@@ -19,8 +19,6 @@ namespace OpenRa.Game
 
 		int lastTime = Environment.TickCount + 2000;
 
-
-
 		public void Update()
 		{
 			int t = Environment.TickCount;

sequences.xml

@@ -183,6 +183,20 @@
 		<sequence name="make" start="0" length="*" src="tslamake" />
 	</unit>
 
+	<!-- pillbox -->
+	<unit name="pbox">
+		<sequence name="idle" start="0"/>
+		<sequence name="damaged-idle" start="1"/>
+		<sequence name="make" start="0" length="*" src="pboxmake" />
+	</unit>
+
+	<!-- camo pillbox -->
+	<unit name="hbox">
+		<sequence name="idle" start="0"/>
+		<sequence name="damaged-idle" start="1"/>
+		<sequence name="make" start="0" length="*" src="hboxmake" />
+	</unit>
+
 	<!-- iron curtain -->
 	<unit name="iron">
 		<sequence name="idle" start="0" length="11"/>