Fix player joins resetting the server timestep.

World.ShroudExplores depends on RenderPlayer,
which makes it completely bogus for this purpose.

.gitignore

@@ -70,4 +70,11 @@ StyleCopViolations.xml
 
 # SublimeText
 *.sublime-project
-*.sublime-workspace
+*.sublime-workspace
+
+# NUnit
+/TestResult.xml
+/lib/
+
+# Support directory
+/Support

.kateproject

@@ -0,0 +1,9 @@
+{
+  "name": "OpenRA"
+, "files": [ { "git": 1 } ]
+, "build": {
+  "directory": "."
+  , "build": "make all"
+  , "clean": "make clean"
+  }
+}

.travis.yml

@@ -2,7 +2,7 @@
 # see travis-ci.org for details
 
 language: csharp
-mono: 4.0.0
+mono: 4.4.2
 
 # http://docs.travis-ci.com/user/migrating-from-legacy
 sudo: false
@@ -28,12 +28,14 @@ env:
 # Run the build script
 # Check source code with StyleCop
 # call OpenRA to check for YAML errors
+# Run the NUnit tests
 script:
  - travis_retry make all-dependencies
- - make all
+ - make all SDK="-sdk:4.5"
  - make check
  - make check-scripts
  - make test
+ - make nunit
 
 # Automatically update the trait documentation and Lua API
 after_success:

AUTHORS

@@ -26,6 +26,7 @@ Also thanks to:
     * Adam Valy (Tschokky)
     * Akseli Virtanen (RAGEQUIT)
     * Alexander Fast (mizipzor)
+    * Alexis Hunt (alercah)
     * Allen262
     * Andrew Aldridge (i80and)
     * Andrew Perkins
@@ -44,6 +45,7 @@ Also thanks to:
     * clem
     * Cody Brittain (Generalcamo)
     * D2k Sardaukar
+    * D'Arcy Rush (r34ch)
     * Daniel Derejvanik (Harisson)
     * Danny Keary (Dan9550)
     * David Jiménez (Rydra)
@@ -54,6 +56,7 @@ Also thanks to:
     * Eric Bajumpaa (SteelPhase)
     * Evgeniy Sergeev (evgeniysergeev)
     * Fahrradkette
+    * Florian Wiesbauer (FiveAces)
     * Frank Razenberg (zzattack)
     * Gareth Needham (Ripley`)
     * Glen Anderson (GlenAnderson)
@@ -74,9 +77,12 @@ Also thanks to:
     * Jeff Harris (jeff_1amstudios)
     * Jes
     * Joakim Lindberg (booom3)
+    * John Turner (whinis)
+    * Jonas A. Lind (SoScared)
     * Joppy Furr
     * Kanar
     * Kenny Hoxworth (hoxworth)
+    * Kevin Azzam (ChaoticMind)
     * Krishnakanth Mallik
     * Kyrre Soerensen (zypres)
     * Lawrence Wang
@@ -89,6 +95,7 @@ Also thanks to:
     * Matthijs Benschop (Nerdie)
     * Max621
     * Max Ugrumov (katzsmile)
+    * Michael Rätzel
     * Michael Sztolcman (s1w_)
     * Mustafa Alperen Seki (MustaphaTR)
     * Neil Shivkar (havok13888)
@@ -99,13 +106,18 @@ Also thanks to:
     * Paolo Chiodi (paolochiodi)
     * Paul Dovydaitis (pdovy)
     * Pavlos Touboulidis (pav)
+    * Pedro Ferreira Ramos (bateramos)
     * Pizzaoverhead
+    * Piët Delport (pjdelport)
     * Psydev
+    * Raphael Vogt (TheRaffy, Yellow)
     * Raymond Bedrossian (Squiggles211)
     * Raymond Martineau (mart0258)
     * Riderr3
+    * riiga
     * Rikhardur Bjarni Einarsson (WolfGaming)
     * Sascha Biedermann (bidifx)
+    * Sean Hunt (coppro)
     * Sebastien Kerguen (xanax)
     * Shawn Collins (UberWaffe)
     * Simon Verbeke (Saticmotion)
@@ -138,11 +150,8 @@ distributed under the CC BY-SA 3.0 license.
 Using SharpFont created by Robert Rouhani and
 distributed under the MIT license.
 
-Using the Open Toolkit distributed under the
-MIT license.
-
-Using SDL2# created by Ethan Lee and released
-under the zlib license.
+Using SDL2-CS and OpenAL-CS created by Ethan
+Lee and released under the zlib license.
 
 Using Eluant created by Chris Howie and released
 under the MIT license.
@@ -150,8 +159,9 @@ under the MIT license.
 Using FuzzyLogicLibrary (fuzzynet) by Dmitry
 Kaluzhny and released under the GNU GPL terms.
 
-Using Mono.Nat by Alan McGovern and Ben
-Motmans and distributed under the MIT license.
+Using Open.Nat by Lucas Ontivero, based on the work
+of Alan McGovern and Ben Motmans and distributed
+under the MIT license.
 
 Using ICSharpCode.SharpZipLib initially by Mike
 Krueger and distributed under the GNU GPL terms.
@@ -163,4 +173,3 @@ distributed under the LGPL version 2.1 or later.
 Finally, special thanks goes to the original teams
 at Westwood Studios and EA for creating the classic
 games which OpenRA aims to reimagine.
-

INSTALL.md

@@ -7,7 +7,7 @@ Windows
 =======
 
 * [Windows PowerShell >= 4.0](http://microsoft.com/powershell)
-* [.NET Framework >= 4.0 (Client Profile)](http://www.microsoft.com/en-us/download/details.aspx?id=17113)
+* [.NET Framework >= 4.5 (Client Profile)](http://www.microsoft.com/en-us/download/details.aspx?id=30653)
 * [SDL 2](http://www.libsdl.org/download-2.0.php) (included)
 * [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm) (included)
 * [zlib](http://gnuwin32.sourceforge.net/packages/zlib.htm) (included)
@@ -34,16 +34,15 @@ Type `sudo make install-all` for system wide installation. Run `make install-lin
 Debian/Ubuntu
 -------------
 
-* mono-dmcs
-* libmono-system-windows-forms4.0-cil
 * nuget
-* cli-common-dev (>= 2.10)
+* mono-devel
 * libfreetype6
 * libopenal1
 * liblua5.1-0
 * libsdl2-2.0-0
 * xdg-utils
 * zenity
+* curl
 
 openSUSE
 --------
@@ -56,6 +55,7 @@ openSUSE
 * lua51
 * xdg-utils
 * zenity
+* curl
 
 Gentoo
 ------
@@ -71,3 +71,13 @@ Gentoo
 * dev-lang/lua-5.1.5
 * x11-misc/xdg-utils
 * gnome-extra/zenity
+* net-misc/curl
+
+OSX
+=====
+
+Use `make dependencies` to map the native libraries to your system.
+
+To compile OpenRA, run `make` from the command line.
+
+Run with `mono --debug OpenRA.Game.exe`.

Makefile

@@ -6,6 +6,11 @@
 # to compile with development tools, run:
 #   make all [DEBUG=false]
 #
+# to check unit tests (requires NUnit version >= 2.6), run:
+#  make nunit [NUNIT_CONSOLE=<path-to/nunit[2]-console>] [NUNIT_LIBS_PATH=<path-to-libs-dir>] [NUNIT_LIBS=<nunit-libs>]
+#      Use NUNIT_CONSOLE if nunit[3|2]-console was not downloaded by `make dependencies` nor is it in bin search paths
+#      Use NUNIT_LIBS_PATH if NUnit libs are not in search paths. Include trailing /
+#      Use NUNIT_LIBS if NUnit libs have different names (such as including a prefix or suffix)
 # to check the official mods for erroneous yaml files, run:
 #   make test
 #
@@ -37,10 +42,13 @@
 
 ############################## TOOLCHAIN ###############################
 #
-CSC         = dmcs
+SDK         ?=
+CSC         = mcs $(SDK)
 CSFLAGS     = -nologo -warn:4 -codepage:utf8 -unsafe -warnaserror
 DEFINE      = TRACE
-COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/Mono.Nat.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/MaxMind.GeoIP2.dll thirdparty/download/Eluant.dll thirdparty/download/SmarIrc4net.dll
+COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/MaxMind.GeoIP2.dll thirdparty/download/Eluant.dll thirdparty/download/SmarIrc4net.dll
+NUNIT_LIBS_PATH :=
+NUNIT_LIBS  := $(NUNIT_LIBS_PATH)nunit.framework.dll
 
 DEBUG = true
 ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
@@ -79,7 +87,7 @@ INSTALL_PROGRAM = $(INSTALL) -m755
 INSTALL_DATA = $(INSTALL) -m644
 
 # program targets
-CORE = pdefault pnull game utility
+CORE = pdefault game utility server
 TOOLS = gamemonitor
 VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
 
@@ -100,7 +108,7 @@ endif
 game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
 game_TARGET = OpenRA.Game.exe
 game_KIND = winexe
-game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/download/SharpFont.dll
+game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/download/SharpFont.dll thirdparty/download/Open.Nat.dll
 game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
 PROGRAMS += game
 game: $(game_TARGET)
@@ -110,15 +118,9 @@ pdefault_SRCS := $(shell find OpenRA.Platforms.Default/ -iname '*.cs')
 pdefault_TARGET = OpenRA.Platforms.Default.dll
 pdefault_KIND = library
 pdefault_DEPS = $(game_TARGET)
-pdefault_LIBS = $(COMMON_LIBS) thirdparty/download/SDL2-CS.dll $(pdefault_DEPS)
-
-pnull_SRCS := $(shell find OpenRA.Platforms.Null/ -iname '*.cs')
-pnull_TARGET = OpenRA.Platforms.Null.dll
-pnull_KIND = library
-pnull_DEPS = $(game_TARGET)
-pnull_LIBS = $(COMMON_LIBS) $(pnull_DEPS)
-PROGRAMS += pdefault pnull
-platforms: $(pdefault_TARGET) $(pnull_TARGET)
+pdefault_LIBS = $(COMMON_LIBS) thirdparty/download/SDL2-CS.dll thirdparty/download/OpenAL-CS.dll $(pdefault_DEPS)
+PROGRAMS += pdefault
+platforms: $(pdefault_TARGET)
 
 # Mods Common
 mod_common_SRCS := $(shell find OpenRA.Mods.Common/ -iname '*.cs')
@@ -129,6 +131,16 @@ mod_common_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) thirdparty/download/StyleCop.dl
 PROGRAMS += mod_common
 mod_common: $(mod_common_TARGET)
 
+# NUnit testing
+test_dll_SRCS := $(shell find OpenRA.Test/ -iname '*.cs')
+test_dll_TARGET = OpenRA.Test.dll
+test_dll_KIND = library
+test_dll_DEPS = $(game_TARGET) $(mod_common_TARGET)
+test_dll_FLAGS = -warn:1
+test_dll_LIBS = $(COMMON_LIBS) $(game_TARGET) $(mod_common_TARGET) $(NUNIT_LIBS)
+PROGRAMS += test_dll
+test_dll: $(test_dll_TARGET)
+
 ##### Official Mods #####
 
 STD_MOD_LIBS	= $(game_TARGET)
@@ -184,9 +196,6 @@ check: utility mods
 	@echo "Checking for code style violations in OpenRA.Platforms.Default..."
 	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Platforms.Default
 	@echo
-	@echo "Checking for code style violations in OpenRA.Platforms.Null..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Platforms.Null
-	@echo
 	@echo "Checking for code style violations in OpenRA.GameMonitor..."
 	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.GameMonitor
 	@echo
@@ -210,6 +219,31 @@ check: utility mods
 	@echo
 	@echo "Checking for code style violations in OpenRA.Test..."
 	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Test
+	@echo
+	@echo "Checking for explicit interface violations..."
+	@mono --debug OpenRA.Utility.exe all --check-explicit-interfaces
+	@echo
+	@echo "Checking for code style violations in OpenRA.Server..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Server
+
+NUNIT_CONSOLE := $(shell test -f thirdparty/download/nunit3-console.exe && echo mono thirdparty/download/nunit3-console.exe || \
+	which nunit3-console 2>/dev/null || which nunit2-console 2>/dev/null || which nunit-console 2>/dev/null)
+nunit: test_dll
+	@echo
+	@echo "Checking unit tests..."
+	@if [ "$(NUNIT_CONSOLE)" = "" ] ; then \
+		echo 'nunit[3|2]-console not found!'; \
+		echo 'Was "make dependencies" called or is NUnit installed?'>&2; \
+		echo 'See "make help".'; \
+		exit 1; \
+	fi
+	@if $(NUNIT_CONSOLE) --help | head -n 1 | grep -E "NUnit version (1|2\.[0-5])";then \
+		echo 'NUnit version >= 2.6 required'>&2; \
+		echo 'Try "make dependencies" first to use NUnit from NuGet.'>&2; \
+		echo 'See "make help".'; \
+		exit 1; \
+	fi
+	@$(NUNIT_CONSOLE) --noresult OpenRA.Test.nunit
 
 test: utility mods
 	@echo
@@ -246,6 +280,15 @@ utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/download/ICSharpCode.Sh
 PROGRAMS += utility
 utility: $(utility_TARGET)
 
+# Dedicated server
+server_SRCS := $(shell find OpenRA.Server/ -iname '*.cs')
+server_TARGET = OpenRA.Server.exe
+server_KIND = exe
+server_DEPS = $(game_TARGET)
+server_LIBS = $(COMMON_LIBS) $(server_DEPS)
+PROGRAMS += server
+server: $(server_TARGET)
+
 # Patches binary headers to work around a mono bug
 fixheader.exe: packaging/fixheader.cs
 	@echo CSC fixheader.exe
@@ -275,7 +318,7 @@ $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
 #
 default: core
 
-core: game platforms mods utility
+core: game platforms mods utility server
 
 tools: gamemonitor
 
@@ -296,7 +339,6 @@ cli-dependencies:
 	@./thirdparty/fetch-thirdparty-deps.sh
 	@ $(CP_R) thirdparty/download/*.dll .
 	@ $(CP_R) thirdparty/download/*.dll.config .
-	@ $(CP) thirdparty/SDL2-CS.dll.config .
 
 linux-dependencies: cli-dependencies linux-native-dependencies
 
@@ -320,7 +362,9 @@ all-dependencies: cli-dependencies windows-dependencies osx-dependencies
 version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modchooser/mod.yaml mods/all/mod.yaml
 	@for i in $? ; do \
 		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
-		mv -f $${i}.tmp $${i} ; \
+		awk '{sub("\tmodchooser:.*$$","\tmodchooser: $(VERSION)"); print $0}' $${i}.tmp > $${i}.tmp2 && \
+		awk '{sub("/[^/]*: User$$", "/$(VERSION): User"); print $0}' $${i}.tmp2 > $${i} && \
+		rm $${i}.tmp $${i}.tmp2; \
 	done
 
 docs: utility mods version
@@ -359,16 +403,16 @@ install-core: default
 	@$(CP_R) glsl "$(DATA_INSTALL_DIR)"
 	@$(CP_R) lua "$(DATA_INSTALL_DIR)"
 	@$(CP) SDL2-CS* "$(DATA_INSTALL_DIR)"
+	@$(CP) OpenAL-CS* "$(DATA_INSTALL_DIR)"
 	@$(CP) Eluant* "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) FuzzyLogicLibrary.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) SharpFont.dll "$(DATA_INSTALL_DIR)"
 	@$(CP) SharpFont.dll.config "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) Mono.Nat.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) Open.Nat.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) MaxMind.Db.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) MaxMind.GeoIP2.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) Newtonsoft.Json.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) RestSharp.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) SmarIrc4net.dll "$(DATA_INSTALL_DIR)"
 
 ifneq ($(UNAME_S),Darwin)
@@ -395,6 +439,7 @@ install-linux-mime:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
 	@$(INSTALL_DATA) packaging/linux/openra-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
 	@$(INSTALL_DATA) packaging/linux/openra-replays.desktop "$(DESTDIR)$(datadir)/applications"
+	@$(INSTALL_DATA) packaging/linux/openra-launch-mod.desktop "$(DESTDIR)$(datadir)/applications"
 
 install-linux-appdata:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/appdata/"
@@ -423,10 +468,26 @@ endif
 	@$(INSTALL_PROGRAM) -m +rx openra "$(BIN_INSTALL_DIR)"
 	@-$(RM) openra
 
+	@echo "#!/bin/sh" > openra-server
+	@echo 'cd "$(gameinstalldir)"' >> openra-server
+ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
+	@echo 'mono OpenRA.Server.exe "$$@"' >> openra-server
+else
+	@echo 'mono --debug OpenRA.Server.exe "$$@"' >> openra-server
+endif
+
+	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx openra-server "$(BIN_INSTALL_DIR)"
+	@-$(RM) openra-server
+
 uninstall:
 	@-$(RM_R) "$(DATA_INSTALL_DIR)"
 	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-server"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-join-servers.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-launch-mod.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-join-servers.desktop"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra.png"
@@ -437,32 +498,38 @@ uninstall:
 	@-$(RM_F) "$(DESTDIR)$(mandir)/man6/openra.6"
 
 help:
-	@echo to compile, run:
-	@echo \ \ make [DEBUG=false]
+	@echo 'to compile, run:'
+	@echo '  make [DEBUG=false]'
 	@echo
-	@echo to compile with development tools, run:
-	@echo \ \ make all [DEBUG=false]
+	@echo 'to compile with development tools, run:'
+	@echo '  make all [DEBUG=false]'
 	@echo
-	@echo to check the official mods for erroneous yaml files, run:
-	@echo \ \ make test
+	@echo 'to check unit tests (requires NUnit version >= 2.6), run:'
+	@echo '  make nunit [NUNIT_CONSOLE=<path-to/nunit[3|2]-console>] [NUNIT_LIBS_PATH=<path-to-libs-dir>] [NUNIT_LIBS=<nunit-libs>]'
+	@echo '     Use NUNIT_CONSOLE if nunit[3|2]-console was not downloaded by `make dependencies` nor is it in bin search paths'
+	@echo '     Use NUNIT_LIBS_PATH if NUnit libs are not in search paths. Include trailing /'
+	@echo '     Use NUNIT_LIBS if NUnit libs have different names (such as including a prefix or suffix)'
 	@echo
-	@echo to generate documentation aimed at modders, run:
-	@echo \ \ make docs
+	@echo 'to check the official mods for erroneous yaml files, run:'
+	@echo '  make test'
 	@echo
-	@echo to install, run:
-	@echo \ \ make \[prefix=/foo\] \[bindir=/bar/bin\] install
+	@echo 'to generate documentation aimed at modders, run:'
+	@echo '  make docs'
 	@echo
-	@echo to install with development tools, run:
-	@echo \ \ make \[prefix=/foo\] \[bindir=/bar/bin\] install-all
+	@echo 'to install, run:'
+	@echo '  make [prefix=/foo] [bindir=/bar/bin] install'
 	@echo
-	@echo to install Linux startup scripts, desktop files and icons
-	@echo \ \ make install-linux-shortcuts [DEBUG=false]
+	@echo 'to install with development tools, run:'
+	@echo '  make [prefix=/foo] [bindir=/bar/bin] install-all'
 	@echo
-	@echo to uninstall, run:
-	@echo \ \ make uninstall
+	@echo 'to install Linux startup scripts, desktop files and icons'
+	@echo '  make install-linux-shortcuts [DEBUG=false]'
 	@echo
-	@echo to start the game, run:
-	@echo \ \ openra
+	@echo 'to uninstall, run:'
+	@echo '  make uninstall'
+	@echo
+	@echo 'to start the game, run:'
+	@echo '  openra'
 
 
 
@@ -473,4 +540,4 @@ help:
 
 .SUFFIXES:
 
-.PHONY: core tools package all mods clean distclean dependencies version $(PROGRAMS)
+.PHONY: core tools package all mods clean distclean dependencies version $(PROGRAMS) nunit

OpenRA.Game/Activities/Activity.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/Activities/CallFunc.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/Actor.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -24,6 +25,13 @@ namespace OpenRA
 {
 	public sealed class Actor : IScriptBindable, IScriptNotifyBind, ILuaTableBinding, ILuaEqualityBinding, ILuaToStringBinding, IEquatable<Actor>, IDisposable
 	{
+		internal struct SyncHash
+		{
+			public readonly ISync Trait;
+			public readonly int Hash;
+			public SyncHash(ISync trait, int hash) { Trait = trait; Hash = hash; }
+		}
+
 		public readonly ActorInfo Info;
 
 		public readonly World World;
@@ -44,6 +52,7 @@ namespace OpenRA
 		public Rectangle VisualBounds { get; private set; }
 		public IEffectiveOwner EffectiveOwner { get; private set; }
 		public IOccupySpace OccupiesSpace { get; private set; }
+		public ITargetable[] Targetables { get; private set; }
 
 		public bool IsIdle { get { return currentActivity == null; } }
 		public bool IsDead { get { return Disposed || (health != null && health.IsDead); } }
@@ -61,6 +70,8 @@ namespace OpenRA
 			}
 		}
 
+		internal IEnumerable<SyncHash> SyncHashes { get; private set; }
+
 		readonly IFacing facing;
 		readonly IHealth health;
 		readonly IRenderModifier[] renderModifiers;
@@ -97,6 +108,9 @@ namespace OpenRA
 				}
 			}
 
+			// PERF: Cache all these traits as soon as the actor is created. This is a fairly cheap one-off cost per
+			// actor that allows us to provide some fast implementations of commonly used methods that are relied on by
+			// performance-sensitive parts of the core game engine, such as pathfinding, visibility and rendering.
 			Bounds = DetermineBounds();
 			VisualBounds = DetermineVisualBounds();
 			EffectiveOwner = TraitOrDefault<IEffectiveOwner>();
@@ -107,6 +121,13 @@ namespace OpenRA
 			disables = TraitsImplementing<IDisable>().ToArray();
 			visibilityModifiers = TraitsImplementing<IVisibilityModifier>().ToArray();
 			defaultVisibility = Trait<IDefaultVisibility>();
+			Targetables = TraitsImplementing<ITargetable>().ToArray();
+
+			SyncHashes =
+				TraitsImplementing<ISync>()
+				.Select(sync => Pair.New(sync, Sync.GetHashFunction(sync)))
+				.ToArray()
+				.Select(pair => new SyncHash(pair.First, pair.Second(pair.First)));
 		}
 
 		Rectangle DetermineBounds()
@@ -140,7 +161,7 @@ namespace OpenRA
 		public void Tick()
 		{
 			var wasIdle = IsIdle;
-			currentActivity = Traits.Util.RunActivity(this, currentActivity);
+			currentActivity = ActivityUtils.RunActivity(this, currentActivity);
 
 			if (!wasIdle && IsIdle)
 				foreach (var n in TraitsImplementing<INotifyBecomingIdle>())
@@ -149,6 +170,7 @@ namespace OpenRA
 
 		public IEnumerable<IRenderable> Render(WorldRenderer wr)
 		{
+			// PERF: Avoid LINQ.
 			var renderables = Renderables(wr);
 			foreach (var modifier in renderModifiers)
 				renderables = modifier.ModifyRender(this, wr, renderables);
@@ -157,6 +179,13 @@ namespace OpenRA
 
 		IEnumerable<IRenderable> Renderables(WorldRenderer wr)
 		{
+			// PERF: Avoid LINQ.
+			// Implementations of Render are permitted to return both an eagerly materialized collection or a lazily
+			// generated sequence.
+			// For large amounts of renderables, a lazily generated sequence (e.g. as returned by LINQ, or by using
+			// `yield`) will avoid the need to allocate a large collection.
+			// For small amounts of renderables, allocating a small collection can often be faster and require less
+			// memory than creating the objects needed to represent a sequence.
 			foreach (var render in renders)
 				foreach (var renderable in render.Render(this, wr))
 					yield return renderable;
@@ -206,6 +235,7 @@ namespace OpenRA
 
 		public override string ToString()
 		{
+			// PERF: Avoid format strings.
 			var name = Info.Name + " " + ActorID;
 			if (!IsInWorld)
 				name += " (not in world)";
@@ -271,11 +301,11 @@ namespace OpenRA
 				Owner = newOwner;
 				Generation++;
 
+				foreach (var t in TraitsImplementing<INotifyOwnerChanged>())
+					t.OnOwnerChanged(this, oldOwner, newOwner);
+
 				if (wasInWorld)
 					w.Add(this);
-
-				foreach (var t in this.TraitsImplementing<INotifyOwnerChanged>())
-					t.OnOwnerChanged(this, oldOwner, newOwner);
 			});
 		}
 
@@ -287,12 +317,12 @@ namespace OpenRA
 			return (health == null) ? DamageState.Undamaged : health.DamageState;
 		}
 
-		public void InflictDamage(Actor attacker, int damage, IWarhead warhead)
+		public void InflictDamage(Actor attacker, Damage damage)
 		{
 			if (Disposed || health == null)
 				return;
 
-			health.InflictDamage(this, attacker, damage, warhead, false);
+			health.InflictDamage(this, attacker, damage, false);
 		}
 
 		public void Kill(Actor attacker)
@@ -305,6 +335,7 @@ namespace OpenRA
 
 		public bool IsDisabled()
 		{
+			// PERF: Avoid LINQ.
 			foreach (var disable in disables)
 				if (disable.Disabled)
 					return true;
@@ -313,6 +344,7 @@ namespace OpenRA
 
 		public bool CanBeViewedByPlayer(Player player)
 		{
+			// PERF: Avoid LINQ.
 			foreach (var visibilityModifier in visibilityModifiers)
 				if (!visibilityModifier.IsVisible(this, player))
 					return false;
@@ -320,6 +352,33 @@ namespace OpenRA
 			return defaultVisibility.IsVisible(this, player);
 		}
 
+		public IEnumerable<string> GetAllTargetTypes()
+		{
+			// PERF: Avoid LINQ.
+			foreach (var targetable in Targetables)
+				foreach (var targetType in targetable.TargetTypes)
+					yield return targetType;
+		}
+
+		public IEnumerable<string> GetEnabledTargetTypes()
+		{
+			// PERF: Avoid LINQ.
+			foreach (var targetable in Targetables)
+				if (targetable.IsTraitEnabled())
+					foreach (var targetType in targetable.TargetTypes)
+						yield return targetType;
+		}
+
+		public bool IsTargetableBy(Actor byActor)
+		{
+			// PERF: Avoid LINQ.
+			foreach (var targetable in Targetables)
+				if (targetable.IsTraitEnabled() && targetable.TargetableBy(this, byActor))
+					return true;
+
+			return false;
+		}
+
 		#region Scripting interface
 
 		Lazy<ScriptActorInterface> luaInterface;
@@ -338,7 +397,7 @@ namespace OpenRA
 		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
 			Actor a, b;
-			if (!left.TryGetClrValue<Actor>(out a) || !right.TryGetClrValue<Actor>(out b))
+			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
 				return false;
 
 			return a == b;

OpenRA.Game/CPos.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -73,7 +74,7 @@ namespace OpenRA
 		{
 			CPos a;
 			CVec b;
-			if (!left.TryGetClrValue<CPos>(out a) || !right.TryGetClrValue<CVec>(out b))
+			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
 				throw new LuaException("Attempted to call CPos.Add(CPos, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
 
 			return new LuaCustomClrObject(a + b);
@@ -83,7 +84,7 @@ namespace OpenRA
 		{
 			CPos a;
 			CVec b;
-			if (!left.TryGetClrValue<CPos>(out a) || !right.TryGetClrValue<CVec>(out b))
+			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
 				throw new LuaException("Attempted to call CPos.Subtract(CPos, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
 
 			return new LuaCustomClrObject(a - b);
@@ -92,7 +93,7 @@ namespace OpenRA
 		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
 			CPos a, b;
-			if (!left.TryGetClrValue<CPos>(out a) || !right.TryGetClrValue<CPos>(out b))
+			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
 				return false;
 
 			return a == b;

OpenRA.Game/CVec.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -75,7 +76,7 @@ namespace OpenRA
 		public LuaValue Add(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
 			CVec a, b;
-			if (!left.TryGetClrValue<CVec>(out a) || !right.TryGetClrValue<CVec>(out b))
+			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
 				throw new LuaException("Attempted to call CVec.Add(CVec, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
 
 			return new LuaCustomClrObject(a + b);
@@ -84,7 +85,7 @@ namespace OpenRA
 		public LuaValue Subtract(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
 			CVec a, b;
-			if (!left.TryGetClrValue<CVec>(out a) || !right.TryGetClrValue<CVec>(out b))
+			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
 				throw new LuaException("Attempted to call CVec.Subtract(CVec, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
 
 			return new LuaCustomClrObject(a - b);
@@ -98,7 +99,7 @@ namespace OpenRA
 		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
 			CVec a, b;
-			if (!left.TryGetClrValue<CVec>(out a) || !right.TryGetClrValue<CVec>(out b))
+			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
 				return false;
 
 			return a == b;
@@ -118,7 +119,7 @@ namespace OpenRA
 
 			set
 			{
-				throw new LuaException("WVec is read-only. Use CVec.New to create a new value");
+				throw new LuaException("CVec is read-only. Use CVec.New to create a new value");
 			}
 		}
 

OpenRA.Game/CacheStorage.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/ContentInstaller.cs

@@ -1,37 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-
-namespace OpenRA
-{
-	// Referenced from ModMetadata, so needs to be in OpenRA.Game :(
-	public class ContentInstaller : IGlobalModData
-	{
-		public readonly string[] TestFiles = { };
-		public readonly string[] DiskTestFiles = { };
-		public readonly string PackageToExtractFromCD = null;
-		public readonly bool OverwriteFiles = true;
-
-		public readonly Dictionary<string, string[]> CopyFilesFromCD = new Dictionary<string, string[]>();
-		public readonly Dictionary<string, string[]> ExtractFilesFromCD = new Dictionary<string, string[]>();
-
-		public readonly string PackageMirrorList = null;
-
-		public readonly string MusicPackageMirrorList = null;
-		public readonly int ShippedSoundtracks = 0;
-
-		/// <summary> InstallShield .CAB file IDs, used to extract Mod-specific files. </summary>
-		public readonly HashSet<int> InstallShieldCABFileIds = new HashSet<int>();
-
-		/// <summary> InstallShield .CAB file IDs, used to extract Mod-specific archives and extract contents of ExtractFilesFromCD. </summary>
-		public readonly HashSet<string> InstallShieldCABFilePackageIds = new HashSet<string>();
-	}
-}

OpenRA.Game/Download.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -16,8 +17,8 @@ namespace OpenRA
 {
 	public class Download
 	{
+		readonly object syncObject = new object();
 		WebClient wc;
-		bool cancelled;
 
 		public static string FormatErrorMessage(Exception e)
 		{
@@ -27,6 +28,8 @@ namespace OpenRA
 
 			switch (ex.Status)
 			{
+				case WebExceptionStatus.RequestCanceled:
+					return "Cancelled";
 				case WebExceptionStatus.NameResolutionFailure:
 					return "DNS lookup failed";
 				case WebExceptionStatus.Timeout:
@@ -40,40 +43,42 @@ namespace OpenRA
 			}
 		}
 
-		public Download(string url, string path, Action<DownloadProgressChangedEventArgs> onProgress, Action<AsyncCompletedEventArgs, bool> onComplete)
+		public Download(string url, string path, Action<DownloadProgressChangedEventArgs> onProgress, Action<AsyncCompletedEventArgs> onComplete)
 		{
-			wc = new WebClient();
-			wc.Proxy = null;
-
-			wc.DownloadProgressChanged += (_, a) => onProgress(a);
-			wc.DownloadFileCompleted += (_, a) => onComplete(a, cancelled);
-
-			Game.OnQuit += Cancel;
-			wc.DownloadFileCompleted += (_, a) => { Game.OnQuit -= Cancel; };
-
-			wc.DownloadFileAsync(new Uri(url), path);
+			lock (syncObject)
+			{
+				wc = new WebClient { Proxy = null };
+				wc.DownloadProgressChanged += (_, a) => onProgress(a);
+				wc.DownloadFileCompleted += (_, a) => { DisposeWebClient(); onComplete(a); };
+				wc.DownloadFileAsync(new Uri(url), path);
+			}
 		}
 
-		public Download(string url, Action<DownloadProgressChangedEventArgs> onProgress, Action<DownloadDataCompletedEventArgs, bool> onComplete)
+		public Download(string url, Action<DownloadProgressChangedEventArgs> onProgress, Action<DownloadDataCompletedEventArgs> onComplete)
 		{
-			wc = new WebClient();
-			wc.Proxy = null;
-
-			wc.DownloadProgressChanged += (_, a) => onProgress(a);
-			wc.DownloadDataCompleted += (_, a) => onComplete(a, cancelled);
-
-			Game.OnQuit += Cancel;
-			wc.DownloadDataCompleted += (_, a) => { Game.OnQuit -= Cancel; };
-
-			wc.DownloadDataAsync(new Uri(url));
+			lock (syncObject)
+			{
+				wc = new WebClient { Proxy = null };
+				wc.DownloadProgressChanged += (_, a) => onProgress(a);
+				wc.DownloadDataCompleted += (_, a) => { DisposeWebClient(); onComplete(a); };
+				wc.DownloadDataAsync(new Uri(url));
+			}
 		}
 
-		public void Cancel()
+		void DisposeWebClient()
 		{
-			Game.OnQuit -= Cancel;
-			wc.CancelAsync();
-			wc.Dispose();
-			cancelled = true;
+			lock (syncObject)
+			{
+				wc.Dispose();
+				wc = null;
+			}
+		}
+
+		public void CancelAsync()
+		{
+			lock (syncObject)
+				if (wc != null)
+					wc.CancelAsync();
 		}
 	}
 }

OpenRA.Game/Effects/AsyncAction.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/Effects/DelayedAction.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/Effects/IEffect.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -18,4 +19,6 @@ namespace OpenRA.Effects
 		void Tick(World world);
 		IEnumerable<IRenderable> Render(WorldRenderer r);
 	}
+
+	public interface IEffectAboveShroud { IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr); }
 }

OpenRA.Game/Effects/SpriteEffect.cs

@@ -1,40 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using OpenRA.Graphics;
-
-namespace OpenRA.Effects
-{
-	public class SpriteEffect : IEffect
-	{
-		readonly string palette;
-		readonly Animation anim;
-		readonly WPos pos;
-
-		public SpriteEffect(WPos pos, World world, string image, string palette)
-		{
-			this.pos = pos;
-			this.palette = palette;
-			anim = new Animation(world, image);
-			anim.PlayThen("idle", () => world.AddFrameEndTask(w => w.Remove(this)));
-		}
-
-		public void Tick(World world)
-		{
-			anim.Tick();
-		}
-
-		public IEnumerable<IRenderable> Render(WorldRenderer wr)
-		{
-			return anim.Render(pos, WVec.Zero, 0, wr.Palette(palette), 1f / wr.Viewport.Zoom);
-		}
-	}
-}

OpenRA.Game/Exts.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -113,6 +114,7 @@ namespace OpenRA
 
 		public static bool HasModifier(this Modifiers k, Modifiers mod)
 		{
+			// PERF: Enum.HasFlag is slower and requires allocations.
 			return (k & mod) == mod;
 		}
 
@@ -326,6 +328,15 @@ namespace OpenRA
 			return root;
 		}
 
+		public static int IntegerDivisionRoundingAwayFromZero(int dividend, int divisor)
+		{
+			int remainder;
+			var quotient = Math.DivRem(dividend, divisor, out remainder);
+			if (remainder == 0)
+				return quotient;
+			return quotient + (Math.Sign(dividend) == Math.Sign(divisor) ? 1 : -1);
+		}
+
 		public static string JoinWith<T>(this IEnumerable<T> ts, string j)
 		{
 			return string.Join(j, ts);
@@ -350,7 +361,7 @@ namespace OpenRA
 
 		public static Dictionary<TKey, TElement> ToDictionaryWithConflictLog<TSource, TKey, TElement>(
 			this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector,
-			string debugName, Func<TKey, string> logKey, Func<TElement, string> logValue)
+			string debugName, Func<TKey, string> logKey = null, Func<TElement, string> logValue = null)
 		{
 			// Fall back on ToString() if null functions are provided:
 			logKey = logKey ?? (s => s.ToString());
@@ -478,6 +489,11 @@ namespace OpenRA
 			return int.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);
 		}
 
+		public static bool TryParseInt64Invariant(string s, out long i)
+		{
+			return long.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);
+		}
+
 		public static bool IsTraitEnabled(this object trait)
 		{
 			return trait as IDisabledTrait == null || !(trait as IDisabledTrait).IsTraitDisabled;

OpenRA.Game/FieldLoader.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -16,6 +17,7 @@ using System.Drawing.Imaging;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.Serialization;
 using System.Text.RegularExpressions;
 using OpenRA.Graphics;
 using OpenRA.Primitives;
@@ -24,6 +26,7 @@ namespace OpenRA
 {
 	public static class FieldLoader
 	{
+		[Serializable]
 		public class MissingFieldsException : YamlException
 		{
 			public readonly string[] Missing;
@@ -42,6 +45,13 @@ namespace OpenRA
 				Header = missing.Length > 1 ? header : headerSingle ?? header;
 				Missing = missing;
 			}
+
+			public override void GetObjectData(SerializationInfo info, StreamingContext context)
+			{
+				base.GetObjectData(info, context);
+				info.AddValue("Missing", Missing);
+				info.AddValue("Header", Header);
+			}
 		}
 
 		public static Func<string, Type, string, object> InvalidValueAction = (s, t, f) =>
@@ -212,21 +222,9 @@ namespace OpenRA
 			}
 			else if (fieldType == typeof(Color))
 			{
-				if (value != null)
-				{
-					var parts = value.Split(',');
-					if (parts.Length == 3)
-						return Color.FromArgb(
-							Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
-							Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
-							Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255));
-					if (parts.Length == 4)
-						return Color.FromArgb(
-							Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
-							Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
-							Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255),
-							Exts.ParseIntegerInvariant(parts[3]).Clamp(0, 255));
-				}
+				Color color;
+				if (value != null && HSLColor.TryParseRGB(value, out color))
+					return color;
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
@@ -235,20 +233,11 @@ namespace OpenRA
 				if (value != null)
 				{
 					var parts = value.Split(',');
-
-					if (parts.Length % 4 != 0)
-						return InvalidValueAction(value, fieldType, fieldName);
-
-					var colors = new Color[parts.Length / 4];
+					var colors = new Color[parts.Length];
 
 					for (var i = 0; i < colors.Length; i++)
-					{
-						colors[i] = Color.FromArgb(
-							Exts.ParseIntegerInvariant(parts[4 * i]).Clamp(0, 255),
-							Exts.ParseIntegerInvariant(parts[4 * i + 1]).Clamp(0, 255),
-							Exts.ParseIntegerInvariant(parts[4 * i + 2]).Clamp(0, 255),
-							Exts.ParseIntegerInvariant(parts[4 * i + 3]).Clamp(0, 255));
-					}
+						if (!HSLColor.TryParseRGB(parts[i], out colors[i]))
+							return InvalidValueAction(value, fieldType, fieldName);
 
 					return colors;
 				}
@@ -259,9 +248,12 @@ namespace OpenRA
 			{
 				if (value != null)
 				{
-					var parts = value.Split(',');
+					Color rgb;
+					if (HSLColor.TryParseRGB(value, out rgb))
+						return new HSLColor(rgb);
 
-					// Allow old ColorRamp format to be parsed as HSLColor
+					// Allow old HSLColor/ColorRamp formats to be parsed as HSLColor
+					var parts = value.Split(',');
 					if (parts.Length == 3 || parts.Length == 4)
 						return new HSLColor(
 							(byte)Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
@@ -382,6 +374,28 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
+			else if (fieldType == typeof(CVec[]))
+			{
+				if (value != null)
+				{
+					var parts = value.Split(',');
+
+					if (parts.Length % 2 != 0)
+						return InvalidValueAction(value, fieldType, fieldName);
+
+					var vecs = new CVec[parts.Length / 2];
+					for (var i = 0; i < vecs.Length; i++)
+					{
+						int rx, ry;
+						if (int.TryParse(parts[2 * i], out rx) && int.TryParse(parts[2 * i + 1], out ry))
+							vecs[i] = new CVec(rx, ry);
+					}
+
+					return vecs;
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType.IsEnum)
 			{
 				try
@@ -494,6 +508,26 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
+			else if (fieldType == typeof(float3))
+			{
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					float x = 0;
+					float y = 0;
+					float z = 0;
+					float.TryParse(parts[0], NumberStyles.Float, NumberFormatInfo.InvariantInfo, out x);
+					float.TryParse(parts[1], NumberStyles.Float, NumberFormatInfo.InvariantInfo, out y);
+
+					// z component is optional for compatibility with older float2 definitions
+					if (parts.Length > 2)
+						float.TryParse(parts[2], NumberStyles.Float, NumberFormatInfo.InvariantInfo, out z);
+
+					return new float3(x, y, z);
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType == typeof(Rectangle))
 			{
 				if (value != null)
@@ -722,7 +756,7 @@ namespace OpenRA
 		}
 	}
 
-	// mirrors DescriptionAttribute from System.ComponentModel but we dont want to have to use that everywhere.
+	// Mirrors DescriptionAttribute from System.ComponentModel but we don't want to have to use that everywhere.
 	[AttributeUsage(AttributeTargets.All)]
 	public sealed class DescAttribute : Attribute
 	{

OpenRA.Game/FieldSaver.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -16,6 +17,7 @@ using System.Drawing.Imaging;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using OpenRA.Graphics;
 
 namespace OpenRA
 {
@@ -73,14 +75,16 @@ namespace OpenRA
 
 			var t = v.GetType();
 
-			// Color.ToString() does the wrong thing; force it to format as an array
+			// Color.ToString() does the wrong thing; force it to format as rgb[a] hex
 			if (t == typeof(Color))
 			{
-				var c = (Color)v;
-				return "{0},{1},{2},{3}".F(((int)c.A).Clamp(0, 255),
-					((int)c.R).Clamp(0, 255),
-					((int)c.G).Clamp(0, 255),
-					((int)c.B).Clamp(0, 255));
+				return HSLColor.ToHexString((Color)v);
+			}
+
+			// HSLColor.ToString() does the wrong thing; force it to format as rgb[a] hex
+			if (t == typeof(HSLColor))
+			{
+				return ((HSLColor)v).ToHexString();
 			}
 
 			if (t == typeof(ImageFormat))
@@ -123,7 +127,7 @@ namespace OpenRA
 				return result;
 			}
 
-			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(OpenRA.Primitives.Cache<,>))
+			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Primitives.Cache<,>))
 				return ""; // TODO
 
 			if (t == typeof(DateTime))

OpenRA.Game/FileFormats/Blast.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  *
  * This file is based on the blast routines (version 1.1 by Mark Adler)
  * included in zlib/contrib
@@ -56,16 +57,19 @@ namespace OpenRA.FileFormats
 		static Huffman lencode = new Huffman(lenlen, lenlen.Length, 16);
 		static Huffman distcode = new Huffman(distlen, distlen.Length, 64);
 
-		// Decode PKWare Compression Library stream.
-		public static byte[] Decompress(byte[] src)
+		/// <summary>PKWare Compression Library stream.</summary>
+		/// <param name="input">Compressed input stream.</param>
+		/// <param name="output">Stream to write the decompressed output.</param>
+		/// <param name="onProgress">Progress callback, invoked with (read bytes, written bytes).</param>
+		public static void Decompress(Stream input, Stream output, Action<long, long> onProgress = null)
 		{
-			var br = new BitReader(src);
+			var br = new BitReader(input);
 
 			// Are literals coded?
 			var coded = br.ReadBits(8);
 
 			if (coded < 0 || coded > 1)
-				throw new NotImplementedException("Invalid datastream");
+				throw new NotImplementedException("Invalid data stream");
 			var encodedLiterals = coded == 1;
 
 			// log2(dictionary size) - 6
@@ -77,7 +81,9 @@ namespace OpenRA.FileFormats
 			ushort next = 0; // index of next write location in out[]
 			var first = true; // true to check distances (for first 4K)
 			var outBuffer = new byte[MAXWIN]; // output buffer and sliding window
-			var ms = new MemoryStream();
+
+			var inputStart = input.Position;
+			var outputStart = output.Position;
 
 			// decode literals and length/distance pairs
 			do
@@ -93,7 +99,10 @@ namespace OpenRA.FileFormats
 					if (len == 519)
 					{
 						for (var i = 0; i < next; i++)
-							ms.WriteByte(outBuffer[i]);
+							output.WriteByte(outBuffer[i]);
+
+						if (onProgress != null)
+							onProgress(input.Position - inputStart, output.Position - outputStart);
 						break;
 					}
 
@@ -136,9 +145,12 @@ namespace OpenRA.FileFormats
 						if (next == MAXWIN)
 						{
 							for (var i = 0; i < next; i++)
-								ms.WriteByte(outBuffer[i]);
+								output.WriteByte(outBuffer[i]);
 							next = 0;
 							first = false;
+
+							if (onProgress != null)
+								onProgress(input.Position - inputStart, output.Position - outputStart);
 						}
 					} while (len != 0);
 				}
@@ -150,17 +162,18 @@ namespace OpenRA.FileFormats
 					if (next == MAXWIN)
 					{
 						for (var i = 0; i < next; i++)
-							ms.WriteByte(outBuffer[i]);
+							output.WriteByte(outBuffer[i]);
 						next = 0;
 						first = false;
+
+						if (onProgress != null)
+							onProgress(input.Position - inputStart, output.Position - outputStart);
 					}
 				}
 			} while (true);
-
-			return ms.ToArray();
 		}
 
-		// Decode a code using huffman table h.
+		// Decode a code using Huffman table h.
 		static int Decode(Huffman h, BitReader br)
 		{
 			var code = 0; // len bits being decoded
@@ -184,14 +197,13 @@ namespace OpenRA.FileFormats
 
 	class BitReader
 	{
-		readonly byte[] src;
-		int offset = 0;
-		int bitBuffer = 0;
+		readonly Stream stream;
+		byte bitBuffer = 0;
 		int bitCount = 0;
 
-		public BitReader(byte[] src)
+		public BitReader(Stream stream)
 		{
-			this.src = src;
+			this.stream = stream;
 		}
 
 		public int ReadBits(int count)
@@ -202,7 +214,7 @@ namespace OpenRA.FileFormats
 			{
 				if (bitCount == 0)
 				{
-					bitBuffer = src[offset++];
+					bitBuffer = stream.ReadUInt8();
 					bitCount = 8;
 				}
 

OpenRA.Game/FileFormats/Blowfish.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/FileFormats/BlowfishKeyProvider.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -55,7 +56,7 @@ namespace OpenRA.FileFormats
 				{
 					var pn = (byte*)tempPn;
 					var i = blen * 4;
-					for (; i > klen; i--) pn[i - 1] = (byte)sign;
+					for (; i > klen; i--) pn[i - 1] = sign;
 					for (; i > 0; i--) pn[i - 1] = key[klen - i];
 				}
 			}

OpenRA.Game/FileFormats/CRC32.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -111,11 +112,11 @@ namespace OpenRA.FileFormats
 
 		/// <summary>
 		/// A fast (native) CRC32 implementation that can be used on a pinned byte array using
-		/// default polynomal.
+		/// default polynomial.
 		/// </summary>
 		/// <param name="data">		[in,out] If non-null, the.</param>
-		/// <param name="len">		The length of the data data.</param>
-		/// <param name="polynomial">The polynomal to xor with.</param>
+		/// <param name="len">		The length of the data.</param>
+		/// <param name="polynomial">The polynomial to XOR with.</param>
 		/// <returns>The calculated checksum.</returns>
 		public static unsafe uint Calculate(byte* data, uint len, uint polynomial)
 		{

OpenRA.Game/FileFormats/HvaReader.cs

@@ -1,17 +1,17 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 
 #endregion
 
 using System;
 using System.IO;
-using System.Linq;
 using OpenRA.Graphics;
 
 namespace OpenRA.FileFormats

OpenRA.Game/FileFormats/IdxReader.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/FileFormats/PngLoader.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -41,114 +42,126 @@ namespace OpenRA.FileFormats
 				Color[] palette = null;
 				var data = new List<byte>();
 
-				for (;;)
+				try
 				{
-					var length = IPAddress.NetworkToHostOrder(br.ReadInt32());
-					var type = Encoding.UTF8.GetString(br.ReadBytes(4));
-					var content = br.ReadBytes(length);
-					/*var crc = */br.ReadInt32();
+					for (;;)
+					{
+						var length = IPAddress.NetworkToHostOrder(br.ReadInt32());
+						var type = Encoding.UTF8.GetString(br.ReadBytes(4));
+						var content = br.ReadBytes(length);
+						/*var crc = */br.ReadInt32();
 
-					using (var ms = new MemoryStream(content))
-					using (var cr = new BinaryReader(ms))
-						switch (type)
-						{
-							case "IHDR":
-								{
-									var width = IPAddress.NetworkToHostOrder(cr.ReadInt32());
-									var height = IPAddress.NetworkToHostOrder(cr.ReadInt32());
-									var bitDepth = cr.ReadByte();
-									var colorType = (PngColorType)cr.ReadByte();
-									var compression = cr.ReadByte();
-									/*var filter = */cr.ReadByte();
-									var interlace = cr.ReadByte();
+						if (bitmap == null && type != "IHDR")
+							throw new InvalidDataException("Invalid PNG file - header does not appear first.");
 
-									if (compression != 0) throw new InvalidDataException("Compression method not supported");
-									if (interlace != 0) throw new InvalidDataException("Interlacing not supported");
-
-									bitmap = new Bitmap(width, height, MakePixelFormat(bitDepth, colorType));
-								}
-
-								break;
-
-							case "PLTE":
-								{
-									palette = new Color[256];
-									for (var i = 0; i < 256; i++)
+						using (var ms = new MemoryStream(content))
+						using (var cr = new BinaryReader(ms))
+							switch (type)
+							{
+								case "IHDR":
 									{
-										var r = cr.ReadByte(); var g = cr.ReadByte(); var b = cr.ReadByte();
-										palette[i] = Color.FromArgb(r, g, b);
+										if (bitmap != null)
+											throw new InvalidDataException("Invalid PNG file - duplicate header.");
+
+										var width = IPAddress.NetworkToHostOrder(cr.ReadInt32());
+										var height = IPAddress.NetworkToHostOrder(cr.ReadInt32());
+										var bitDepth = cr.ReadByte();
+										var colorType = (PngColorType)cr.ReadByte();
+										var compression = cr.ReadByte();
+										/*var filter = */cr.ReadByte();
+										var interlace = cr.ReadByte();
+
+										if (compression != 0) throw new InvalidDataException("Compression method not supported");
+										if (interlace != 0) throw new InvalidDataException("Interlacing not supported");
+
+										bitmap = new Bitmap(width, height, MakePixelFormat(bitDepth, colorType));
 									}
-								}
 
-								break;
+									break;
 
-							case "tRNS":
-								{
-									if (palette == null)
-										throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
-
-									for (var i = 0; i < length; i++)
-										palette[i] = Color.FromArgb(cr.ReadByte(), palette[i]);
-								}
-
-								break;
-
-							case "IDAT":
-								{
-									data.AddRange(content);
-								}
-
-								break;
-
-							case "IEND":
-								{
-									if (bitmap == null)
-										throw new InvalidDataException("Image header not found.");
-
-									var bits = bitmap.LockBits(bitmap.Bounds(),
-										ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-									using (var ns = new MemoryStream(data.ToArray()))
+								case "PLTE":
 									{
-										// 'zlib' flags bytes; confuses the DeflateStream.
-										/*var flags = (byte)*/ns.ReadByte();
-										/*var moreFlags = (byte)*/ns.ReadByte();
-
-										using (var ds = new DeflateStream(ns, CompressionMode.Decompress))
-										using (var dr = new BinaryReader(ds))
+										palette = new Color[256];
+										for (var i = 0; i < 256; i++)
 										{
-											var prevLine = new byte[bitmap.Width];	// all zero
-											for (var y = 0; y < bitmap.Height; y++)
-											{
-												var filter = (PngFilter)dr.ReadByte();
-												var line = dr.ReadBytes(bitmap.Width);
-
-												for (var i = 0; i < bitmap.Width; i++)
-													line[i] = i > 0
-														? UnapplyFilter(filter, line[i], line[i - 1], prevLine[i], prevLine[i - 1])
-														: UnapplyFilter(filter, line[i], 0, prevLine[i], 0);
-
-												Marshal.Copy(line, 0, new IntPtr(bits.Scan0.ToInt64() + y * bits.Stride), line.Length);
-												prevLine = line;
-											}
+											var r = cr.ReadByte(); var g = cr.ReadByte(); var b = cr.ReadByte();
+											palette[i] = Color.FromArgb(r, g, b);
 										}
 									}
 
-									bitmap.UnlockBits(bits);
+									break;
 
-									if (palette == null)
-										throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
-
-									using (var temp = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
+								case "tRNS":
 									{
-										var cp = temp.Palette;
-										for (var i = 0; i < 256; i++)
-											cp.Entries[i] = palette[i];		// finalize the palette.
-										bitmap.Palette = cp;
-										return bitmap;
+										if (palette == null)
+											throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
+
+										for (var i = 0; i < length; i++)
+											palette[i] = Color.FromArgb(cr.ReadByte(), palette[i]);
 									}
-								}
-						}
+
+									break;
+
+								case "IDAT":
+									{
+										data.AddRange(content);
+									}
+
+									break;
+
+								case "IEND":
+									{
+										var bits = bitmap.LockBits(bitmap.Bounds(),
+											ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
+
+										using (var ns = new MemoryStream(data.ToArray()))
+										{
+											// 'zlib' flags bytes; confuses the DeflateStream.
+											/*var flags = (byte)*/ns.ReadByte();
+											/*var moreFlags = (byte)*/ns.ReadByte();
+
+											using (var ds = new DeflateStream(ns, CompressionMode.Decompress))
+											using (var dr = new BinaryReader(ds))
+											{
+												var prevLine = new byte[bitmap.Width];  // all zero
+												for (var y = 0; y < bitmap.Height; y++)
+												{
+													var filter = (PngFilter)dr.ReadByte();
+													var line = dr.ReadBytes(bitmap.Width);
+
+													for (var i = 0; i < bitmap.Width; i++)
+														line[i] = i > 0
+															? UnapplyFilter(filter, line[i], line[i - 1], prevLine[i], prevLine[i - 1])
+															: UnapplyFilter(filter, line[i], 0, prevLine[i], 0);
+
+													Marshal.Copy(line, 0, new IntPtr(bits.Scan0.ToInt64() + y * bits.Stride), line.Length);
+													prevLine = line;
+												}
+											}
+										}
+
+										bitmap.UnlockBits(bits);
+
+										if (palette == null)
+											throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
+
+										using (var temp = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
+										{
+											var cp = temp.Palette;
+											for (var i = 0; i < 256; i++)
+												cp.Entries[i] = palette[i];     // finalize the palette.
+											bitmap.Palette = cp;
+											return bitmap;
+										}
+									}
+							}
+					}
+				}
+				catch
+				{
+					if (bitmap != null)
+						bitmap.Dispose();
+					throw;
 				}
 			}
 		}
@@ -187,7 +200,7 @@ namespace OpenRA.FileFormats
 			if (bitDepth == 8 && colorType == (PngColorType.Indexed | PngColorType.Color))
 				return PixelFormat.Format8bppIndexed;
 
-			throw new InvalidDataException("Unknown pixelformat");
+			throw new InvalidDataException("Unknown pixel format");
 		}
 	}
 }

OpenRA.Game/FileFormats/ReplayMetadata.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/FileFormats/VxlReader.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 
 #endregion

OpenRA.Game/FileFormats/XccGlobalDatabase.cs

@@ -1,44 +1,54 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 
 namespace OpenRA.FileFormats
 {
-	public class XccGlobalDatabase
+	public class XccGlobalDatabase : IDisposable
 	{
 		public readonly string[] Entries;
-		public XccGlobalDatabase(Stream s)
+		readonly Stream s;
+
+		public XccGlobalDatabase(Stream stream)
 		{
+			s = stream;
+
 			var entries = new List<string>();
-			var reader = new BinaryReader(s);
-			while (reader.PeekChar() > -1)
+			while (s.Peek() > -1)
 			{
-				var count = reader.ReadInt32();
+				var count = s.ReadInt32();
 				for (var i = 0; i < count; i++)
 				{
 					var chars = new List<char>();
-					char c;
+					byte c;
 
 					// Read filename
-					while ((c = reader.ReadChar()) != 0)
-						chars.Add(c);
+					while ((c = s.ReadUInt8()) != 0)
+						chars.Add((char)c);
 					entries.Add(new string(chars.ToArray()));
 
 					// Skip comment
-					while ((c = reader.ReadChar()) != 0) { }
+					while ((c = s.ReadUInt8()) != 0) { }
 				}
 			}
 
 			Entries = entries.ToArray();
 		}
+
+		public void Dispose()
+		{
+			s.Dispose();
+		}
 	}
 }

OpenRA.Game/FileFormats/XccLocalDatabase.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -49,11 +50,11 @@ namespace OpenRA.FileFormats
 				writer.Write(Encoding.ASCII.GetBytes("XCC by Olaf van der Spek"));
 				writer.Write(new byte[] { 0x1A, 0x04, 0x17, 0x27, 0x10, 0x19, 0x80, 0x00 });
 
-				writer.Write((int)(Entries.Aggregate(Entries.Length, (a, b) => a + b.Length) + 52)); // Size
-				writer.Write((int)0); // Type
-				writer.Write((int)0); // Version
-				writer.Write((int)0); // Game/Format (0 == TD)
-				writer.Write((int)Entries.Length); // Entries
+				writer.Write(Entries.Aggregate(Entries.Length, (a, b) => a + b.Length) + 52); // Size
+				writer.Write(0); // Type
+				writer.Write(0); // Version
+				writer.Write(0); // Game/Format (0 == TD)
+				writer.Write(Entries.Length); // Entries
 				foreach (var e in Entries)
 				{
 					writer.Write(Encoding.ASCII.GetBytes(e));

OpenRA.Game/FileSystem/BagFile.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -19,19 +20,17 @@ using OpenRA.Primitives;
 
 namespace OpenRA.FileSystem
 {
-	public sealed class BagFile : IFolder
+	public sealed class BagFile : IReadOnlyPackage
 	{
-		static readonly uint[] Nothing = { };
+		public string Name { get; private set; }
+		public IEnumerable<string> Contents { get { return index.Keys; } }
 
-		readonly string bagFilename;
 		readonly Stream s;
-		readonly int bagFilePriority;
-		readonly Dictionary<uint, IdxEntry> index;
+		readonly Dictionary<string, IdxEntry> index;
 
-		public BagFile(string filename, int priority)
+		public BagFile(FileSystem context, string filename)
 		{
-			bagFilename = filename;
-			bagFilePriority = priority;
+			Name = filename;
 
 			// A bag file is always accompanied with an .idx counterpart
 			// For example: audio.bag requires the audio.idx file
@@ -39,23 +38,20 @@ namespace OpenRA.FileSystem
 
 			// Build the index and dispose the stream, it is no longer needed after this
 			List<IdxEntry> entries;
-			using (var indexStream = GlobalFileSystem.Open(indexFilename))
+			using (var indexStream = context.Open(indexFilename))
 				entries = new IdxReader(indexStream).Entries;
 
-			index = entries.ToDictionaryWithConflictLog(x => x.Hash,
+			index = entries.ToDictionaryWithConflictLog(x => x.Filename,
 				"{0} (bag format)".F(filename),
 				null, x => "(offs={0}, len={1})".F(x.Offset, x.Length));
 
-			s = GlobalFileSystem.Open(filename);
+			s = context.Open(filename);
 		}
 
-		public int Priority { get { return 1000 + bagFilePriority; } }
-		public string Name { get { return bagFilename; } }
-
-		public Stream GetContent(uint hash)
+		public Stream GetStream(string filename)
 		{
 			IdxEntry entry;
-			if (!index.TryGetValue(hash, out entry))
+			if (!index.TryGetValue(filename, out entry))
 				return null;
 
 			s.Seek(entry.Offset, SeekOrigin.Begin);
@@ -72,7 +68,7 @@ namespace OpenRA.FileSystem
 				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("WAVE"));
 				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fmt "));
 				waveHeaderMemoryStream.Write(BitConverter.GetBytes(16));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)WavLoader.WaveType.Pcm));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)1));
 				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)channels));
 				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.SampleRate));
 				waveHeaderMemoryStream.Write(BitConverter.GetBytes(2 * channels * entry.SampleRate));
@@ -94,7 +90,7 @@ namespace OpenRA.FileSystem
 				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("WAVE"));
 				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fmt "));
 				waveHeaderMemoryStream.Write(BitConverter.GetBytes(20));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)WavLoader.WaveType.ImaAdpcm));
+				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)17));
 				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)channels));
 				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.SampleRate));
 				waveHeaderMemoryStream.Write(BitConverter.GetBytes(bytesPerSec));
@@ -118,65 +114,9 @@ namespace OpenRA.FileSystem
 			return mergedStream;
 		}
 
-		uint? FindMatchingHash(string filename)
+		public bool Contains(string filename)
 		{
-			var hash = IdxEntry.HashFilename(filename, PackageHashType.CRC32);
-			if (index.ContainsKey(hash))
-				return hash;
-
-			// Maybe we were given a raw hash?
-			uint raw;
-			if (!uint.TryParse(filename, NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture, out raw))
-				return null;
-
-			if ("{0:X}".F(raw) == filename && index.ContainsKey(raw))
-				return raw;
-
-			return null;
-		}
-
-		public Stream GetContent(string filename)
-		{
-			var hash = FindMatchingHash(filename);
-			return hash.HasValue ? GetContent(hash.Value) : null;
-		}
-
-		public bool Exists(string filename)
-		{
-			return FindMatchingHash(filename).HasValue;
-		}
-
-		public IEnumerable<uint> ClassicHashes()
-		{
-			return Nothing;
-		}
-
-		public IEnumerable<uint> CrcHashes()
-		{
-			return index.Keys;
-		}
-
-		public IEnumerable<string> AllFileNames()
-		{
-			var lookup = new Dictionary<uint, string>();
-			if (GlobalFileSystem.Exists("global mix database.dat"))
-			{
-				var db = new XccGlobalDatabase(GlobalFileSystem.Open("global mix database.dat"));
-				foreach (var e in db.Entries)
-				{
-					var hash = IdxEntry.HashFilename(e, PackageHashType.CRC32);
-					if (!lookup.ContainsKey(hash))
-						lookup.Add(hash, e);
-				}
-			}
-
-			return index.Keys.Select(k => lookup.ContainsKey(k) ? lookup[k] : "{0:X}".F(k));
-		}
-
-		public void Write(Dictionary<string, byte[]> contents)
-		{
-			GlobalFileSystem.Unmount(this);
-			throw new NotImplementedException("Updating bag files unsupported");
+			return index.ContainsKey(filename);
 		}
 
 		public void Dispose()

OpenRA.Game/FileSystem/BigFile.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -15,19 +16,19 @@ using System.Linq;
 
 namespace OpenRA.FileSystem
 {
-	public sealed class BigFile : IFolder
+	public sealed class BigFile : IReadOnlyPackage
 	{
 		public string Name { get; private set; }
-		public int Priority { get; private set; }
-		readonly Dictionary<string, Entry> entries = new Dictionary<string, Entry>();
+		public IEnumerable<string> Contents { get { return index.Keys; } }
+
+		readonly Dictionary<string, Entry> index = new Dictionary<string, Entry>();
 		readonly Stream s;
 
-		public BigFile(string filename, int priority)
+		public BigFile(FileSystem context, string filename)
 		{
 			Name = filename;
-			Priority = priority;
 
-			s = GlobalFileSystem.Open(filename);
+			s = context.Open(filename);
 			try
 			{
 				if (s.ReadASCII(4) != "BIGF")
@@ -47,7 +48,7 @@ namespace OpenRA.FileSystem
 				for (var i = 0; i < entryCount; i++)
 				{
 					var entry = new Entry(s);
-					entries.Add(entry.Path, entry);
+					index.Add(entry.Path, entry);
 				}
 			}
 			catch
@@ -86,34 +87,14 @@ namespace OpenRA.FileSystem
 			}
 		}
 
-		public Stream GetContent(string filename)
+		public Stream GetStream(string filename)
 		{
-			return entries[filename].GetData();
+			return index[filename].GetData();
 		}
 
-		public bool Exists(string filename)
+		public bool Contains(string filename)
 		{
-			return entries.ContainsKey(filename);
-		}
-
-		public IEnumerable<uint> ClassicHashes()
-		{
-			return entries.Keys.Select(filename => PackageEntry.HashFilename(filename, PackageHashType.Classic));
-		}
-
-		public IEnumerable<uint> CrcHashes()
-		{
-			return Enumerable.Empty<uint>();
-		}
-
-		public IEnumerable<string> AllFileNames()
-		{
-			return entries.Keys;
-		}
-
-		public void Write(Dictionary<string, byte[]> contents)
-		{
-			throw new NotImplementedException();
+			return index.ContainsKey(filename);
 		}
 
 		public void Dispose()

OpenRA.Game/FileSystem/D2kSoundResources.cs

@@ -1,51 +1,54 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.IO;
+using OpenRA.Primitives;
 
 namespace OpenRA.FileSystem
 {
-	public sealed class D2kSoundResources : IFolder
+	public sealed class D2kSoundResources : IReadOnlyPackage
 	{
-		readonly Stream s;
-
-		readonly string filename;
-		readonly List<string> filenames;
-		readonly int priority;
-
-		readonly Dictionary<uint, PackageEntry> index = new Dictionary<uint, PackageEntry>();
-
-		public D2kSoundResources(string filename, int priority)
+		struct Entry
 		{
-			this.filename = filename;
-			this.priority = priority;
+			public readonly uint Offset;
+			public readonly uint Length;
 
-			s = GlobalFileSystem.Open(filename);
+			public Entry(uint offset, uint length)
+			{
+				Offset = offset;
+				Length = length;
+			}
+		}
+
+		public string Name { get; private set; }
+		public IEnumerable<string> Contents { get { return index.Keys; } }
+
+		readonly Stream s;
+		readonly Dictionary<string, Entry> index = new Dictionary<string, Entry>();
+
+		public D2kSoundResources(FileSystem context, string filename)
+		{
+			Name = filename;
+
+			s = context.Open(filename);
 			try
 			{
-				filenames = new List<string>();
-
 				var headerLength = s.ReadUInt32();
 				while (s.Position < headerLength + 4)
 				{
 					var name = s.ReadASCIIZ();
 					var offset = s.ReadUInt32();
 					var length = s.ReadUInt32();
-
-					var hash = PackageEntry.HashFilename(name, PackageHashType.Classic);
-					if (!index.ContainsKey(hash))
-						index.Add(hash, new PackageEntry(hash, offset, length));
-
-					filenames.Add(name);
+					index.Add(name, new Entry(offset, length));
 				}
 			}
 			catch
@@ -55,48 +58,19 @@ namespace OpenRA.FileSystem
 			}
 		}
 
-		public Stream GetContent(uint hash)
+		public Stream GetStream(string filename)
 		{
-			PackageEntry e;
-			if (!index.TryGetValue(hash, out e))
+			Entry e;
+			if (!index.TryGetValue(filename, out e))
 				return null;
 
 			s.Seek(e.Offset, SeekOrigin.Begin);
 			return new MemoryStream(s.ReadBytes((int)e.Length));
 		}
 
-		public Stream GetContent(string filename)
+		public bool Contains(string filename)
 		{
-			return GetContent(PackageEntry.HashFilename(filename, PackageHashType.Classic));
-		}
-
-		public bool Exists(string filename)
-		{
-			return index.ContainsKey(PackageEntry.HashFilename(filename, PackageHashType.Classic));
-		}
-
-		public IEnumerable<string> AllFileNames()
-		{
-			return filenames;
-		}
-
-		public string Name { get { return filename; } }
-
-		public int Priority { get { return 1000 + priority; } }
-
-		public IEnumerable<uint> ClassicHashes()
-		{
-			return index.Keys;
-		}
-
-		public IEnumerable<uint> CrcHashes()
-		{
-			yield break;
-		}
-
-		public void Write(Dictionary<string, byte[]> contents)
-		{
-			throw new NotImplementedException("Cannot save Dune 2000 Sound Resources.");
+			return index.ContainsKey(filename);
 		}
 
 		public void Dispose()

OpenRA.Game/FileSystem/FileSystem.cs

@@ -0,0 +1,293 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using OpenRA.Primitives;
+
+namespace OpenRA.FileSystem
+{
+	public interface IReadOnlyFileSystem
+	{
+		Stream Open(string filename);
+		bool TryGetPackageContaining(string path, out IReadOnlyPackage package, out string filename);
+		bool TryOpen(string filename, out Stream s);
+		bool Exists(string filename);
+	}
+
+	public class FileSystem : IReadOnlyFileSystem
+	{
+		public IEnumerable<IReadOnlyPackage> MountedPackages { get { return mountedPackages.Keys; } }
+		readonly Dictionary<IReadOnlyPackage, int> mountedPackages = new Dictionary<IReadOnlyPackage, int>();
+		readonly Dictionary<string, IReadOnlyPackage> explicitMounts = new Dictionary<string, IReadOnlyPackage>();
+
+		// Mod packages that should not be disposed
+		readonly List<IReadOnlyPackage> modPackages = new List<IReadOnlyPackage>();
+		readonly IReadOnlyDictionary<string, Manifest> installedMods;
+
+		Cache<string, List<IReadOnlyPackage>> fileIndex = new Cache<string, List<IReadOnlyPackage>>(_ => new List<IReadOnlyPackage>());
+
+		public FileSystem(IReadOnlyDictionary<string, Manifest> installedMods)
+		{
+			this.installedMods = installedMods;
+		}
+
+		public IReadOnlyPackage OpenPackage(string filename)
+		{
+			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
+				return new MixFile(this, filename);
+			if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
+				return new ZipFile(this, filename);
+			if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
+				return new ZipFile(this, filename);
+			if (filename.EndsWith(".oramod", StringComparison.InvariantCultureIgnoreCase))
+				return new ZipFile(this, filename);
+			if (filename.EndsWith(".RS", StringComparison.InvariantCultureIgnoreCase))
+				return new D2kSoundResources(this, filename);
+			if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
+				return new InstallShieldPackage(this, filename);
+			if (filename.EndsWith(".PAK", StringComparison.InvariantCultureIgnoreCase))
+				return new PakFile(this, filename);
+			if (filename.EndsWith(".big", StringComparison.InvariantCultureIgnoreCase))
+				return new BigFile(this, filename);
+			if (filename.EndsWith(".bag", StringComparison.InvariantCultureIgnoreCase))
+				return new BagFile(this, filename);
+
+			IReadOnlyPackage parent;
+			string subPath = null;
+			if (TryGetPackageContaining(filename, out parent, out subPath))
+				return OpenPackage(subPath, parent);
+
+			return new Folder(Platform.ResolvePath(filename));
+		}
+
+		public IReadOnlyPackage OpenPackage(string filename, IReadOnlyPackage parent)
+		{
+			// HACK: limit support to zip and folder until we generalize the PackageLoader support
+			if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase) ||
+				filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
+			{
+				using (var s = parent.GetStream(filename))
+					return new ZipFile(s, filename, parent);
+			}
+
+			if (parent is ZipFile)
+				return new ZipFolder(this, (ZipFile)parent, filename, filename);
+
+			if (parent is ZipFolder)
+			{
+				var folder = (ZipFolder)parent;
+				return new ZipFolder(this, folder.Parent, folder.Name + "/" + filename, filename);
+			}
+
+			if (parent is Folder)
+			{
+				var subFolder = Platform.ResolvePath(Path.Combine(parent.Name, filename));
+				if (Directory.Exists(subFolder))
+					return new Folder(subFolder);
+			}
+
+			return null;
+		}
+
+		public void Mount(string name, string explicitName = null)
+		{
+			var optional = name.StartsWith("~");
+			if (optional)
+				name = name.Substring(1);
+
+			try
+			{
+				IReadOnlyPackage package;
+				if (name.StartsWith("$"))
+				{
+					name = name.Substring(1);
+
+					Manifest mod;
+					if (!installedMods.TryGetValue(name, out mod))
+						throw new InvalidOperationException("Could not load mod '{0}'. Available mods: {1}".F(name, installedMods.Keys.JoinWith(", ")));
+
+					package = mod.Package;
+					modPackages.Add(package);
+				}
+				else
+					package = OpenPackage(name);
+
+				Mount(package, explicitName);
+			}
+			catch
+			{
+				if (!optional)
+					throw;
+			}
+		}
+
+		public void Mount(IReadOnlyPackage package, string explicitName = null)
+		{
+			var mountCount = 0;
+			if (mountedPackages.TryGetValue(package, out mountCount))
+			{
+				// Package is already mounted
+				// Increment the mount count and bump up the file loading priority
+				mountedPackages[package] = mountCount + 1;
+				foreach (var filename in package.Contents)
+				{
+					fileIndex[filename].Remove(package);
+					fileIndex[filename].Add(package);
+				}
+			}
+			else
+			{
+				// Mounting the package for the first time
+				mountedPackages.Add(package, 1);
+
+				if (explicitName != null)
+					explicitMounts.Add(explicitName, package);
+
+				foreach (var filename in package.Contents)
+					fileIndex[filename].Add(package);
+			}
+		}
+
+		public bool Unmount(IReadOnlyPackage package)
+		{
+			var mountCount = 0;
+			if (!mountedPackages.TryGetValue(package, out mountCount))
+				return false;
+
+			if (--mountCount <= 0)
+			{
+				foreach (var packagesForFile in fileIndex.Values)
+					packagesForFile.RemoveAll(p => p == package);
+
+				mountedPackages.Remove(package);
+				var explicitKeys = explicitMounts.Where(kv => kv.Value == package)
+					.Select(kv => kv.Key)
+					.ToList();
+
+				foreach (var key in explicitKeys)
+					explicitMounts.Remove(key);
+
+				// Mod packages aren't owned by us, so we shouldn't dispose them
+				if (modPackages.Contains(package))
+					modPackages.Remove(package);
+				else
+					package.Dispose();
+			}
+			else
+				mountedPackages[package] = mountCount;
+
+			return true;
+		}
+
+		public void UnmountAll()
+		{
+			foreach (var package in mountedPackages.Keys)
+				if (!modPackages.Contains(package))
+					package.Dispose();
+
+			mountedPackages.Clear();
+			explicitMounts.Clear();
+			modPackages.Clear();
+
+			fileIndex = new Cache<string, List<IReadOnlyPackage>>(_ => new List<IReadOnlyPackage>());
+		}
+
+		public void LoadFromManifest(Manifest manifest)
+		{
+			UnmountAll();
+			foreach (var kv in manifest.Packages)
+				Mount(kv.Key, kv.Value);
+		}
+
+		Stream GetFromCache(string filename)
+		{
+			var package = fileIndex[filename]
+				.LastOrDefault(x => x.Contains(filename));
+
+			if (package != null)
+				return package.GetStream(filename);
+
+			return null;
+		}
+
+		public Stream Open(string filename)
+		{
+			Stream s;
+			if (!TryOpen(filename, out s))
+				throw new FileNotFoundException("File not found: {0}".F(filename), filename);
+
+			return s;
+		}
+
+		public bool TryGetPackageContaining(string path, out IReadOnlyPackage package, out string filename)
+		{
+			var explicitSplit = path.IndexOf('|');
+			if (explicitSplit > 0 && explicitMounts.TryGetValue(path.Substring(0, explicitSplit), out package))
+			{
+				filename = path.Substring(explicitSplit + 1);
+				return true;
+			}
+
+			package = fileIndex[path].LastOrDefault(x => x.Contains(path));
+			filename = path;
+
+			return package != null;
+		}
+
+		public bool TryOpen(string filename, out Stream s)
+		{
+			var explicitSplit = filename.IndexOf('|');
+			if (explicitSplit > 0)
+			{
+				IReadOnlyPackage explicitPackage;
+				if (explicitMounts.TryGetValue(filename.Substring(0, explicitSplit), out explicitPackage))
+				{
+					s = explicitPackage.GetStream(filename.Substring(explicitSplit + 1));
+					if (s != null)
+						return true;
+				}
+			}
+
+			s = GetFromCache(filename);
+			if (s != null)
+				return true;
+
+			// Ask each package individually
+			// TODO: This fallback can be removed once the filesystem cleanups are complete
+			var	package = mountedPackages.Keys.LastOrDefault(x => x.Contains(filename));
+			if (package != null)
+			{
+				s = package.GetStream(filename);
+				return s != null;
+			}
+
+			s = null;
+			return false;
+		}
+
+		public bool Exists(string filename)
+		{
+			var explicitSplit = filename.IndexOf('|');
+			if (explicitSplit > 0)
+			{
+				IReadOnlyPackage explicitPackage;
+				if (explicitMounts.TryGetValue(filename.Substring(0, explicitSplit), out explicitPackage))
+					if (explicitPackage.Contains(filename.Substring(explicitSplit + 1)))
+						return true;
+			}
+
+			return fileIndex.ContainsKey(filename);
+		}
+	}
+}

OpenRA.Game/FileSystem/Folder.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -13,70 +14,68 @@ using System.IO;
 
 namespace OpenRA.FileSystem
 {
-	public sealed class Folder : IFolder
+	public sealed class Folder : IReadWritePackage
 	{
 		readonly string path;
-		readonly int priority;
 
-		// Create a new folder package
-		public Folder(string path, int priority, Dictionary<string, byte[]> contents)
+		public Folder(string path)
 		{
 			this.path = path;
-			this.priority = priority;
-			if (Directory.Exists(path))
-				Directory.Delete(path, true);
-
-			Write(contents);
-		}
-
-		public Folder(string path, int priority)
-		{
-			this.path = path;
-			this.priority = priority;
 			if (!Directory.Exists(path))
 				Directory.CreateDirectory(path);
 		}
 
-		public Stream GetContent(string filename)
+		public string Name { get { return path; } }
+
+		public IEnumerable<string> Contents
+		{
+			get
+			{
+				foreach (var filename in Directory.GetFiles(path, "*", SearchOption.TopDirectoryOnly))
+					yield return Path.GetFileName(filename);
+				foreach (var filename in Directory.GetDirectories(path))
+					yield return Path.GetFileName(filename);
+			}
+		}
+
+		public Stream GetStream(string filename)
 		{
 			try { return File.OpenRead(Path.Combine(path, filename)); }
 			catch { return null; }
 		}
 
-		public IEnumerable<uint> ClassicHashes()
+		public bool Contains(string filename)
 		{
-			foreach (var filename in Directory.GetFiles(path, "*", SearchOption.TopDirectoryOnly))
-				yield return PackageEntry.HashFilename(Path.GetFileName(filename), PackageHashType.Classic);
+			var combined = Path.Combine(path, filename);
+			return combined.StartsWith(path) && File.Exists(combined);
 		}
 
-		public IEnumerable<uint> CrcHashes()
+		public void Update(string filename, byte[] contents)
 		{
-			yield break;
+			// HACK: ZipFiles can't be loaded as read-write from a stream, so we are
+			// forced to bypass the parent package and load them with their full path
+			// in FileSystem.OpenPackage.  Their internal name therefore contains the
+			// full parent path too.  We need to be careful to not add a second path
+			// prefix to these hacked packages.
+			var filePath = filename.StartsWith(path) ? filename : Path.Combine(path, filename);
+
+			Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+			using (var s = File.Create(filePath))
+				s.Write(contents, 0, contents.Length);
 		}
 
-		public IEnumerable<string> AllFileNames()
+		public void Delete(string filename)
 		{
-			foreach (var filename in Directory.GetFiles(path, "*", SearchOption.TopDirectoryOnly))
-				yield return Path.GetFileName(filename);
-		}
-
-		public bool Exists(string filename)
-		{
-			return File.Exists(Path.Combine(path, filename));
-		}
-
-		public int Priority { get { return priority; } }
-		public string Name { get { return path; } }
-
-		public void Write(Dictionary<string, byte[]> contents)
-		{
-			if (!Directory.Exists(path))
-				Directory.CreateDirectory(path);
-
-			foreach (var file in contents)
-				using (var dataStream = File.Create(Path.Combine(path, file.Key)))
-				using (var writer = new BinaryWriter(dataStream))
-					writer.Write(file.Value);
+			// HACK: ZipFiles can't be loaded as read-write from a stream, so we are
+			// forced to bypass the parent package and load them with their full path
+			// in FileSystem.OpenPackage.  Their internal name therefore contains the
+			// full parent path too.  We need to be careful to not add a second path
+			// prefix to these hacked packages.
+			var filePath = filename.StartsWith(path) ? filename : Path.Combine(path, filename);
+			if (Directory.Exists(filePath))
+				Directory.Delete(filePath, true);
+			else if (File.Exists(filePath))
+				File.Delete(filePath);
 		}
 
 		public void Dispose() { }

OpenRA.Game/FileSystem/GlobalFileSystem.cs

@@ -1,273 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using OpenRA.Primitives;
-
-namespace OpenRA.FileSystem
-{
-	public interface IFolder : IDisposable
-	{
-		Stream GetContent(string filename);
-		bool Exists(string filename);
-		IEnumerable<uint> ClassicHashes();
-		IEnumerable<uint> CrcHashes();
-		IEnumerable<string> AllFileNames();
-		void Write(Dictionary<string, byte[]> contents);
-		int Priority { get; }
-		string Name { get; }
-	}
-
-	public static class GlobalFileSystem
-	{
-		public static List<IFolder> MountedFolders = new List<IFolder>();
-		static Cache<uint, List<IFolder>> classicHashIndex = new Cache<uint, List<IFolder>>(_ => new List<IFolder>());
-		static Cache<uint, List<IFolder>> crcHashIndex = new Cache<uint, List<IFolder>>(_ => new List<IFolder>());
-
-		public static List<string> FolderPaths = new List<string>();
-
-		static void MountInner(IFolder folder)
-		{
-			MountedFolders.Add(folder);
-
-			foreach (var hash in folder.ClassicHashes())
-			{
-				var l = classicHashIndex[hash];
-				if (!l.Contains(folder))
-					l.Add(folder);
-			}
-
-			foreach (var hash in folder.CrcHashes())
-			{
-				var l = crcHashIndex[hash];
-				if (!l.Contains(folder))
-					l.Add(folder);
-			}
-		}
-
-		static int order = 0;
-
-		public static IFolder CreatePackage(string filename, int order, Dictionary<string, byte[]> content)
-		{
-			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
-				return new MixFile(filename, order, content);
-			if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(filename, order, content);
-			if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(filename, order, content);
-			if (filename.EndsWith(".RS", StringComparison.InvariantCultureIgnoreCase))
-				throw new NotImplementedException("The creation of .RS archives is unimplemented");
-			if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
-				throw new NotImplementedException("The creation of .Z archives is unimplemented");
-			if (filename.EndsWith(".PAK", StringComparison.InvariantCultureIgnoreCase))
-				throw new NotImplementedException("The creation of .PAK archives is unimplemented");
-			if (filename.EndsWith(".big", StringComparison.InvariantCultureIgnoreCase))
-				throw new NotImplementedException("The creation of .big archives is unimplemented");
-			if (filename.EndsWith(".cab", StringComparison.InvariantCultureIgnoreCase))
-				throw new NotImplementedException("The creation of .cab archives is unimplemented");
-
-			return new Folder(filename, order, content);
-		}
-
-		public static IFolder OpenPackage(string filename, string annotation, int order)
-		{
-			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
-			{
-				var type = string.IsNullOrEmpty(annotation)
-					? PackageHashType.Classic
-					: FieldLoader.GetValue<PackageHashType>("(value)", annotation);
-
-				return new MixFile(filename, type, order);
-			}
-
-			if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(filename, order);
-			if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(filename, order);
-			if (filename.EndsWith(".RS", StringComparison.InvariantCultureIgnoreCase))
-				return new D2kSoundResources(filename, order);
-			if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
-				return new InstallShieldPackage(filename, order);
-			if (filename.EndsWith(".PAK", StringComparison.InvariantCultureIgnoreCase))
-				return new PakFile(filename, order);
-			if (filename.EndsWith(".big", StringComparison.InvariantCultureIgnoreCase))
-				return new BigFile(filename, order);
-			if (filename.EndsWith(".bag", StringComparison.InvariantCultureIgnoreCase))
-				return new BagFile(filename, order);
-			if (filename.EndsWith(".hdr", StringComparison.InvariantCultureIgnoreCase))
-				return new InstallShieldCABExtractor(filename, order);
-
-			return new Folder(filename, order);
-		}
-
-		public static void Mount(string name, string annotation = null)
-		{
-			var optional = name.StartsWith("~");
-			if (optional)
-				name = name.Substring(1);
-
-			name = Platform.ResolvePath(name);
-
-			FolderPaths.Add(name);
-			Action a = () => MountInner(OpenPackage(name, annotation, order++));
-
-			if (optional)
-				try { a(); }
-				catch { }
-			else
-				a();
-		}
-
-		public static void UnmountAll()
-		{
-			foreach (var folder in MountedFolders)
-				folder.Dispose();
-
-			MountedFolders.Clear();
-			FolderPaths.Clear();
-			classicHashIndex = new Cache<uint, List<IFolder>>(_ => new List<IFolder>());
-			crcHashIndex = new Cache<uint, List<IFolder>>(_ => new List<IFolder>());
-		}
-
-		public static bool Unmount(IFolder mount)
-		{
-			if (MountedFolders.Contains(mount))
-				mount.Dispose();
-
-			return MountedFolders.RemoveAll(f => f == mount) > 0;
-		}
-
-		public static void Mount(IFolder mount)
-		{
-			if (!MountedFolders.Contains(mount)) MountedFolders.Add(mount);
-		}
-
-		public static void LoadFromManifest(Manifest manifest)
-		{
-			UnmountAll();
-			foreach (var dir in manifest.Folders)
-				Mount(dir);
-
-			foreach (var pkg in manifest.Packages)
-				Mount(pkg.Key, pkg.Value);
-		}
-
-		static Stream GetFromCache(PackageHashType type, string filename)
-		{
-			var index = type == PackageHashType.CRC32 ? crcHashIndex : classicHashIndex;
-			var folder = index[PackageEntry.HashFilename(filename, type)]
-				.Where(x => x.Exists(filename))
-				.MinByOrDefault(x => x.Priority);
-
-			if (folder != null)
-				return folder.GetContent(filename);
-
-			return null;
-		}
-
-		public static Stream Open(string filename)
-		{
-			Stream s;
-			if (!TryOpen(filename, out s))
-				throw new FileNotFoundException("File not found: {0}".F(filename), filename);
-
-			return s;
-		}
-
-		public static bool TryOpen(string name, out Stream s)
-		{
-			var filename = name;
-			var foldername = string.Empty;
-
-			// Used for faction specific packages; rule out false positive on Windows C:\ drive notation
-			var explicitFolder = name.Contains(':') && !Directory.Exists(Path.GetDirectoryName(name));
-			if (explicitFolder)
-			{
-				var divide = name.Split(':');
-				foldername = divide.First();
-				filename = divide.Last();
-			}
-
-			// Check the cache for a quick lookup if the folder name is unknown
-			// TODO: This disables caching for explicit folder requests
-			if (filename.IndexOfAny(new char[] { '/', '\\' }) == -1 && !explicitFolder)
-			{
-				s = GetFromCache(PackageHashType.Classic, filename);
-				if (s != null)
-					return true;
-
-				s = GetFromCache(PackageHashType.CRC32, filename);
-				if (s != null)
-					return true;
-			}
-
-			// Ask each package individually
-			IFolder folder;
-			if (explicitFolder && !string.IsNullOrEmpty(foldername))
-				folder = MountedFolders.Where(x => x.Name == foldername).MaxByOrDefault(x => x.Priority);
-			else
-				folder = MountedFolders.Where(x => x.Exists(filename)).MaxByOrDefault(x => x.Priority);
-
-			if (folder != null)
-			{
-				s = folder.GetContent(filename);
-				return true;
-			}
-
-			s = null;
-			return false;
-		}
-
-		public static bool Exists(string name)
-		{
-			var explicitFolder = name.Contains(':') && !Directory.Exists(Path.GetDirectoryName(name));
-			if (explicitFolder)
-			{
-				var divide = name.Split(':');
-				var foldername = divide.First();
-				var filename = divide.Last();
-				return MountedFolders.Where(n => n.Name == foldername).Any(f => f.Exists(filename));
-			}
-			else
-				return MountedFolders.Any(f => f.Exists(name));
-		}
-
-		static Dictionary<string, Assembly> assemblyCache = new Dictionary<string, Assembly>();
-
-		public static Assembly ResolveAssembly(object sender, ResolveEventArgs e)
-		{
-			foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
-				if (assembly.FullName == e.Name)
-					return assembly;
-
-			var frags = e.Name.Split(',');
-			var filename = frags[0] + ".dll";
-
-			Assembly a;
-			if (assemblyCache.TryGetValue(filename, out a))
-				return a;
-
-			if (Exists(filename))
-				using (var s = Open(filename))
-				{
-					var buf = s.ReadBytes((int)s.Length);
-					a = Assembly.Load(buf);
-					assemblyCache.Add(filename, a);
-					return a;
-				}
-
-			return null;
-		}
-	}
-}

OpenRA.Game/FileSystem/IPackage.cs

@@ -0,0 +1,31 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace OpenRA.FileSystem
+{
+	public interface IReadOnlyPackage : IDisposable
+	{
+		string Name { get; }
+		IEnumerable<string> Contents { get; }
+		Stream GetStream(string filename);
+		bool Contains(string filename);
+	}
+
+	public interface IReadWritePackage : IReadOnlyPackage
+	{
+		void Update(string filename, byte[] contents);
+		void Delete(string filename);
+	}
+}

OpenRA.Game/FileSystem/IdxEntry.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -15,80 +16,31 @@ namespace OpenRA.FileSystem
 {
 	public class IdxEntry
 	{
-		public const string DefaultExtension = "wav";
-
-		public readonly uint Hash;
-		public readonly string Name;
-		public readonly string Extension;
+		public readonly string Filename;
 		public readonly uint Offset;
 		public readonly uint Length;
 		public readonly uint SampleRate;
 		public readonly uint Flags;
 		public readonly uint ChunkSize;
 
-		public IdxEntry(uint hash, uint offset, uint length, uint sampleRate, uint flags, uint chuckSize)
-		{
-			Hash = hash;
-			Offset = offset;
-			Length = length;
-			SampleRate = sampleRate;
-			Flags = flags;
-			ChunkSize = chuckSize;
-		}
-
 		public IdxEntry(Stream s)
 		{
-			var asciiname = s.ReadASCII(16);
-
-			var pos = asciiname.IndexOf('\0');
+			var name = s.ReadASCII(16);
+			var pos = name.IndexOf('\0');
 			if (pos != 0)
-				asciiname = asciiname.Substring(0, pos);
+				name = name.Substring(0, pos);
 
-			Name = asciiname;
-			Extension = DefaultExtension;
+			Filename = string.Concat(name, ".wav");
 			Offset = s.ReadUInt32();
 			Length = s.ReadUInt32();
 			SampleRate = s.ReadUInt32();
 			Flags = s.ReadUInt32();
 			ChunkSize = s.ReadUInt32();
-			Hash = HashFilename(string.Concat(Name, ".", Extension), PackageHashType.CRC32);
-		}
-
-		public void Write(BinaryWriter w)
-		{
-			w.Write(Name.PadRight(16, '\0'));
-			w.Write(Offset);
-			w.Write(Length);
-			w.Write(SampleRate);
-			w.Write(Flags);
-			w.Write(ChunkSize);
 		}
 
 		public override string ToString()
 		{
-			string filename;
-			if (names.TryGetValue(Hash, out filename))
-				return "{0} - offset 0x{1:x8} - length 0x{2:x8}".F(filename, Offset, Length);
-			else
-				return "0x{0:x8} - offset 0x{1:x8} - length 0x{2:x8}".F(Hash, Offset, Length);
-		}
-
-		public static uint HashFilename(string name, PackageHashType type)
-		{
-			return PackageEntry.HashFilename(name, type);
-		}
-
-		static Dictionary<uint, string> names = new Dictionary<uint, string>();
-
-		public static void AddStandardName(string s)
-		{
-			// RA1 and TD
-			var hash = HashFilename(s, PackageHashType.Classic);
-			names.Add(hash, s);
-
-			// TS
-			var crcHash = HashFilename(s, PackageHashType.CRC32);
-			names.Add(crcHash, s);
+			return "{0} - offset 0x{1:x8} - length 0x{2:x8}".F(Filename, Offset, Length);
 		}
 	}
 }

OpenRA.Game/FileSystem/InstallShieldCABExtractor.cs

@@ -1,527 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using ICSharpCode.SharpZipLib.Zip.Compression;
-using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
-
-namespace OpenRA.FileSystem
-{
-	public class InstallShieldCABExtractor : IDisposable, IFolder
-	{
-		const uint FileSplit = 0x1;
-		const uint FileObfuscated = 0x2;
-		const uint FileCompressed = 0x4;
-		const uint FileInvalid = 0x8;
-
-		const uint LinkPrev = 0x1;
-		const uint LinkNext = 0x2;
-		const uint MaxFileGroupCount = 71;
-
-#region Nested Structs
-
-		struct FileGroup
-		{
-			public readonly string Name;
-			public readonly uint FirstFile;
-			public readonly uint LastFile;
-
-			public FileGroup(Stream reader, long offset)
-			{
-				var nameOffset = reader.ReadUInt32();
-				/*   unknown  */ reader.ReadBytes(18);
-				FirstFile = reader.ReadUInt32();
-				LastFile = reader.ReadUInt32();
-
-				reader.Seek(offset + (long)nameOffset, SeekOrigin.Begin);
-				Name = reader.ReadASCIIZ();
-			}
-		}
-
-		struct VolumeHeader
-		{
-			public readonly uint DataOffset;
-			public readonly uint DataOffsetHigh;
-			public readonly uint FirstFileIndex;
-			public readonly uint LastFileIndex;
-
-			public readonly uint FirstFileOffset;
-			public readonly uint FirstFileOffsetHigh;
-			public readonly uint FirstFileSizeExpanded;
-			public readonly uint FirstFileSizeExpandedHigh;
-
-			public readonly uint FirstFileSizeCompressed;
-			public readonly uint FirstFileSizeCompressedHigh;
-			public readonly uint LastFileOffset;
-			public readonly uint LastFileOffsetHigh;
-
-			public readonly uint LastFileSizeExpanded;
-			public readonly uint LastFileSizeExpandedHigh;
-			public readonly uint LastFileSizeCompressed;
-			public readonly uint LastFileSizeCompressedHigh;
-
-			public VolumeHeader(Stream reader)
-			{
-				DataOffset = reader.ReadUInt32();
-				DataOffsetHigh = reader.ReadUInt32();
-
-				FirstFileIndex = reader.ReadUInt32();
-				LastFileIndex = reader.ReadUInt32();
-				FirstFileOffset = reader.ReadUInt32();
-				FirstFileOffsetHigh = reader.ReadUInt32();
-
-				FirstFileSizeExpanded = reader.ReadUInt32();
-				FirstFileSizeExpandedHigh = reader.ReadUInt32();
-				FirstFileSizeCompressed = reader.ReadUInt32();
-				FirstFileSizeCompressedHigh = reader.ReadUInt32();
-
-				LastFileOffset = reader.ReadUInt32();
-				LastFileOffsetHigh = reader.ReadUInt32();
-				LastFileSizeExpanded = reader.ReadUInt32();
-				LastFileSizeExpandedHigh = reader.ReadUInt32();
-
-				LastFileSizeCompressed = reader.ReadUInt32();
-				LastFileSizeCompressedHigh = reader.ReadUInt32();
-			}
-		}
-
-		struct CommonHeader
-		{
-			public const long Size = 16;
-			public readonly uint Version;
-			public readonly uint VolumeInfo;
-			public readonly long CabDescriptorOffset;
-			public readonly uint CabDescriptorSize;
-
-			public CommonHeader(Stream reader)
-			{
-				Version = reader.ReadUInt32();
-				VolumeInfo = reader.ReadUInt32();
-				CabDescriptorOffset = (long)reader.ReadUInt32();
-				CabDescriptorSize = reader.ReadUInt32();
-			}
-		}
-
-		struct CabDescriptor
-		{
-			public readonly long FileTableOffset;
-			public readonly uint FileTableSize;
-			public readonly uint FileTableSize2;
-			public readonly uint DirectoryCount;
-
-			public readonly uint FileCount;
-			public readonly long FileTableOffset2;
-
-			public CabDescriptor(Stream reader, CommonHeader commonHeader)
-			{
-				reader.Seek(commonHeader.CabDescriptorOffset + 12, SeekOrigin.Begin);
-				FileTableOffset = (long)reader.ReadUInt32();
-				/*    unknown  */ reader.ReadUInt32();
-				FileTableSize = reader.ReadUInt32();
-
-				FileTableSize2 = reader.ReadUInt32();
-				DirectoryCount = reader.ReadUInt32();
-				/*   unknown  */ reader.ReadBytes(8);
-				FileCount = reader.ReadUInt32();
-
-				FileTableOffset2 = (long)reader.ReadUInt32();
-			}
-		}
-
-		struct FileDescriptor
-		{
-			public readonly ushort	Flags;
-			public readonly uint	ExpandedSize;
-			public readonly uint	CompressedSize;
-			public readonly uint	DataOffset;
-
-			public readonly byte[]	MD5;
-			public readonly uint	NameOffset;
-			public readonly ushort	DirectoryIndex;
-			public readonly uint	LinkToPrevious;
-
-			public readonly uint	LinkToNext;
-			public readonly byte	LinkFlags;
-			public readonly ushort	Volume;
-			public readonly string	Filename;
-
-			public FileDescriptor(Stream reader, long tableOffset)
-			{
-				Flags = reader.ReadUInt16();
-				ExpandedSize = reader.ReadUInt32();
-				/*    unknown   */ reader.ReadUInt32();
-				CompressedSize = reader.ReadUInt32();
-
-				/*  unknown */ reader.ReadUInt32();
-				DataOffset   = reader.ReadUInt32();
-				/*  unknown */ reader.ReadUInt32();
-				MD5          = reader.ReadBytes(16);
-
-				/*   unknown  */ reader.ReadBytes(16);
-				NameOffset     = reader.ReadUInt32();
-				DirectoryIndex = reader.ReadUInt16();
-				/*   unknown  */ reader.ReadBytes(12);
-				LinkToPrevious = reader.ReadUInt32();
-				LinkToNext = reader.ReadUInt32();
-
-				LinkFlags = reader.ReadBytes(1)[0];
-				Volume = reader.ReadUInt16();
-				var posSave = reader.Position;
-
-				reader.Seek(tableOffset + NameOffset, SeekOrigin.Begin);
-				Filename = reader.ReadASCIIZ();
-				reader.Seek(posSave, SeekOrigin.Begin);
-			}
-		}
-
-		class CabReader : IDisposable
-		{
-			readonly FileDescriptor fileDes;
-			public uint RemainingArchiveStream;
-			public uint RemainingFileStream;
-			readonly uint index;
-			readonly string commonName;
-			ushort volumeNumber;
-			Stream cabFile;
-
-			public CabReader(FileDescriptor fileDes, uint index, string commonName)
-			{
-				this.fileDes = fileDes;
-				this.index = index;
-				this.commonName = commonName;
-				volumeNumber = (ushort)((uint)fileDes.Volume - 1u);
-				RemainingArchiveStream = 0;
-				if ((fileDes.Flags & FileCompressed) > 0)
-					RemainingFileStream = fileDes.CompressedSize;
-				else
-					RemainingFileStream = fileDes.ExpandedSize;
-
-				cabFile = null;
-				NextFile();
-			}
-
-			public void CopyTo(Stream dest)
-			{
-				if ((fileDes.Flags & FileCompressed) != 0)
-				{
-					var inf = new Inflater(true);
-					var buffer = new byte[165535];
-					do
-					{
-						var bytesToExtract = cabFile.ReadUInt16();
-						RemainingArchiveStream -= 2u;
-						RemainingFileStream -= 2u;
-						inf.SetInput(GetBytes(bytesToExtract));
-						RemainingFileStream -= bytesToExtract;
-						while (!inf.IsNeedingInput)
-						{
-							var inflated = inf.Inflate(buffer);
-							dest.Write(buffer, 0, inflated);
-						}
-
-						inf.Reset();
-					}
-					while (RemainingFileStream > 0);
-				}
-				else
-				{
-					do
-					{
-						RemainingFileStream -= RemainingArchiveStream;
-						dest.Write(GetBytes(RemainingArchiveStream), 0, (int)RemainingArchiveStream);
-					}
-					while (RemainingFileStream > 0);
-				}
-			}
-
-			public byte[] GetBytes(uint count)
-			{
-				if (count < RemainingArchiveStream)
-				{
-					RemainingArchiveStream -= count;
-					return cabFile.ReadBytes((int)count);
-				}
-				else
-				{
-					var outArray = new byte[count];
-					var read = cabFile.Read(outArray, 0, (int)RemainingArchiveStream);
-					if (RemainingFileStream > RemainingArchiveStream)
-					{
-						NextFile();
-						RemainingArchiveStream -= (uint)cabFile.Read(outArray, read, (int)count - read);
-					}
-
-					return outArray;
-				}
-			}
-
-			public void Dispose()
-			{
-				cabFile.Dispose();
-			}
-
-			public void NextFile()
-			{
-				if (cabFile != null)
-					cabFile.Dispose();
-
-				++volumeNumber;
-				cabFile = GlobalFileSystem.Open("{0}{1}.cab".F(commonName, volumeNumber));
-				if (cabFile.ReadUInt32() != 0x28635349)
-					throw new InvalidDataException("Not an Installshield CAB package");
-
-				uint fileOffset;
-				if ((fileDes.Flags & FileSplit) != 0)
-				{
-					cabFile.Seek(CommonHeader.Size, SeekOrigin.Current);
-					var head = new VolumeHeader(cabFile);
-					if (index == head.LastFileIndex)
-					{
-						if ((fileDes.Flags & FileCompressed) != 0)
-							RemainingArchiveStream = head.LastFileSizeCompressed;
-						else
-							RemainingArchiveStream = head.LastFileSizeExpanded;
-
-						fileOffset = head.LastFileOffset;
-					}
-					else if (index == head.FirstFileIndex)
-					{
-						if ((fileDes.Flags & FileCompressed) != 0)
-							RemainingArchiveStream = head.FirstFileSizeCompressed;
-						else
-							RemainingArchiveStream = head.FirstFileSizeExpanded;
-
-						fileOffset = head.FirstFileOffset;
-					}
-					else
-						throw new Exception("Cannot Resolve Remaining Stream");
-				}
-				else
-				{
-					if ((fileDes.Flags & FileCompressed) != 0)
-						RemainingArchiveStream = fileDes.CompressedSize;
-					else
-						RemainingArchiveStream = fileDes.ExpandedSize;
-
-					fileOffset = fileDes.DataOffset;
-				}
-
-				cabFile.Seek(fileOffset, SeekOrigin.Begin);
-			}
-		}
-#endregion
-
-		readonly Stream hdrFile;
-		readonly CommonHeader commonHeader;
-		readonly CabDescriptor cabDescriptor;
-		readonly List<uint> directoryTable;
-		readonly Dictionary<uint, string> directoryNames = new Dictionary<uint, string>();
-		readonly Dictionary<uint, FileDescriptor> fileDescriptors = new Dictionary<uint, FileDescriptor>();
-		readonly Dictionary<string, uint> fileLookup = new Dictionary<string, uint>();
-		int priority;
-		string commonName;
-		public int Priority { get { return priority; } }
-
-		public string Name { get { return commonName; } }
-
-		public InstallShieldCABExtractor(string hdrFilename, int priority = -1)
-		{
-			var fileGroups = new List<FileGroup>();
-			var fileGroupOffsets = new List<uint>();
-
-			this.priority = priority;
-			hdrFile = GlobalFileSystem.Open(hdrFilename);
-
-			// Strips archive number AND file extension
-			commonName = Regex.Replace(hdrFilename, @"\d*\.[^\.]*$", "");
-			var signature = hdrFile.ReadUInt32();
-
-			if (signature != 0x28635349)
-				throw new InvalidDataException("Not an Installshield CAB package");
-
-			commonHeader = new CommonHeader(hdrFile);
-			cabDescriptor = new CabDescriptor(hdrFile, commonHeader);
-			/*    unknown   */ hdrFile.ReadBytes(14);
-
-			for (var i = 0U; i < MaxFileGroupCount; ++i)
-				fileGroupOffsets.Add(hdrFile.ReadUInt32());
-
-			hdrFile.Seek(commonHeader.CabDescriptorOffset + cabDescriptor.FileTableOffset, SeekOrigin.Begin);
-			directoryTable = new List<uint>();
-
-			for (var i = 0U; i < cabDescriptor.DirectoryCount; ++i)
-				directoryTable.Add(hdrFile.ReadUInt32());
-
-			foreach (var offset in fileGroupOffsets)
-			{
-				var nextOffset = offset;
-				while (nextOffset != 0)
-				{
-					hdrFile.Seek((long)nextOffset + 4 + commonHeader.CabDescriptorOffset, SeekOrigin.Begin);
-					var descriptorOffset = hdrFile.ReadUInt32();
-					nextOffset = hdrFile.ReadUInt32();
-					hdrFile.Seek((long)descriptorOffset + commonHeader.CabDescriptorOffset, SeekOrigin.Begin);
-
-					fileGroups.Add(new FileGroup(hdrFile, commonHeader.CabDescriptorOffset));
-				}
-			}
-
-			hdrFile.Seek(commonHeader.CabDescriptorOffset + cabDescriptor.FileTableOffset + cabDescriptor.FileTableOffset2, SeekOrigin.Begin);
-			foreach (var fileGroup in fileGroups)
-			{
-				for (var index = fileGroup.FirstFile; index <= fileGroup.LastFile; ++index)
-				{
-					AddFileDescriptorToList(index);
-					var fileDescriptor = fileDescriptors[index];
-					var fullFilePath   = "{0}\\{1}\\{2}".F(fileGroup.Name, DirectoryName((uint)fileDescriptor.DirectoryIndex), fileDescriptor.Filename);
-					fileLookup.Add(fullFilePath, index);
-				}
-			}
-		}
-
-		public string DirectoryName(uint index)
-		{
-			if (directoryNames.ContainsKey(index))
-				return directoryNames[index];
-
-			hdrFile.Seek(commonHeader.CabDescriptorOffset +
-					cabDescriptor.FileTableOffset +
-					directoryTable[(int)index],
-					SeekOrigin.Begin);
-
-			var test = hdrFile.ReadASCIIZ();
-			return test;
-		}
-
-		public bool Exists(string filename)
-		{
-			return fileLookup.ContainsKey(filename);
-		}
-
-		public uint DirectoryCount()
-		{
-			return cabDescriptor.DirectoryCount;
-		}
-
-		public string FileName(uint index)
-		{
-			if (!fileDescriptors.ContainsKey(index))
-				AddFileDescriptorToList(index);
-
-			return fileDescriptors[index].Filename;
-		}
-
-		void AddFileDescriptorToList(uint index)
-		{
-			hdrFile.Seek(commonHeader.CabDescriptorOffset +
-					cabDescriptor.FileTableOffset +
-					cabDescriptor.FileTableOffset2 +
-					index * 0x57,
-					SeekOrigin.Begin);
-
-			var fd = new FileDescriptor(hdrFile,
-				commonHeader.CabDescriptorOffset + cabDescriptor.FileTableOffset);
-
-			fileDescriptors.Add(index, fd);
-		}
-
-		public uint FileCount()
-		{
-			return cabDescriptor.FileCount;
-		}
-
-		public void ExtractFile(uint index, string fileName)
-		{
-			Directory.CreateDirectory(Path.GetDirectoryName(fileName));
-			using (var destfile = File.Open(fileName, FileMode.Create))
-				GetContentById(index, destfile);
-		}
-
-		public void Write(Dictionary<string, byte[]> input)
-		{
-			throw new NotImplementedException("Cannot Add Files To Cab");
-		}
-
-		public IEnumerable<uint> ClassicHashes()
-		{
-			return fileLookup.Keys.Select(k => PackageEntry.HashFilename(k, PackageHashType.Classic));
-		}
-
-		public Stream GetContentById(uint index)
-		{
-			var fileDes = fileDescriptors[index];
-			if ((fileDes.Flags & FileInvalid) != 0)
-				throw new Exception("File Invalid");
-
-			if ((fileDes.LinkFlags & LinkPrev) != 0)
-				return GetContentById(fileDes.LinkToPrevious);
-
-			if ((fileDes.Flags & FileObfuscated) != 0)
-				throw new NotImplementedException("Haven't implemented obfustcated files");
-
-			var output = new MemoryStream((int)fileDes.ExpandedSize);
-
-			using (var reader = new CabReader(fileDes, index, commonName))
-				reader.CopyTo(output);
-
-			if (output.Length != fileDes.ExpandedSize)
-				throw new Exception("Did not fully extract Expected = {0}, Got = {1}".F(fileDes.ExpandedSize, output.Length));
-
-			output.Position = 0;
-			return output;
-		}
-
-		public void GetContentById(uint index, Stream output)
-		{
-			var fileDes = fileDescriptors[index];
-			if ((fileDes.Flags & FileInvalid) != 0)
-				throw new Exception("File Invalid");
-
-			if ((fileDes.LinkFlags & LinkPrev) != 0)
-			{
-				GetContentById(fileDes.LinkToPrevious, output);
-				return;
-			}
-
-			if ((fileDes.Flags & FileObfuscated) != 0)
-				throw new NotImplementedException("Haven't implemented obfustcated files");
-
-			using (var reader = new CabReader(fileDes, index, commonName))
-				reader.CopyTo(output);
-
-			if (output.Length != fileDes.ExpandedSize)
-				throw new Exception("Did not fully extract Expected = {0}, Got = {1}".F(fileDes.ExpandedSize, output.Length));
-		}
-
-		public Stream GetContent(string fileName)
-		{
-			return GetContentById(fileLookup[fileName]);
-		}
-
-		public IEnumerable<uint> CrcHashes()
-		{
-			yield break;
-		}
-
-		public IEnumerable<string> AllFileNames()
-		{
-			return fileLookup.Keys;
-		}
-
-		public void Dispose()
-		{
-			hdrFile.Dispose();
-		}
-	}
-}

OpenRA.Game/FileSystem/InstallShieldPackage.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -15,54 +16,70 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.FileSystem
 {
-	public sealed class InstallShieldPackage : IFolder
+	public sealed class InstallShieldPackage : IReadOnlyPackage
 	{
-		readonly Dictionary<uint, PackageEntry> index = new Dictionary<uint, PackageEntry>();
-		readonly List<string> filenames;
+		public struct Entry
+		{
+			public readonly uint Offset;
+			public readonly uint Length;
+
+			public Entry(uint offset, uint length)
+			{
+				Offset = offset;
+				Length = length;
+			}
+		}
+
+		public string Name { get; private set; }
+		public IEnumerable<string> Contents { get { return index.Keys; } }
+
+		readonly Dictionary<string, Entry> index = new Dictionary<string, Entry>();
 		readonly Stream s;
 		readonly long dataStart = 255;
-		readonly int priority;
-		readonly string filename;
 
-		public InstallShieldPackage(string filename, int priority)
+		public InstallShieldPackage(FileSystem context, string filename)
 		{
-			this.filename = filename;
-			this.priority = priority;
+			Name = filename;
 
-			filenames = new List<string>();
-
-			s = GlobalFileSystem.Open(filename);
+			s = context.Open(filename);
 			try
 			{
 				// Parse package header
-				var reader = new BinaryReader(s);
-				var signature = reader.ReadUInt32();
+				var signature = s.ReadUInt32();
 				if (signature != 0x8C655D13)
 					throw new InvalidDataException("Not an Installshield package");
 
-				reader.ReadBytes(8);
-				/*var FileCount = */reader.ReadUInt16();
-				reader.ReadBytes(4);
-				/*var ArchiveSize = */reader.ReadUInt32();
-				reader.ReadBytes(19);
-				var tocAddress = reader.ReadInt32();
-				reader.ReadBytes(4);
-				var dirCount = reader.ReadUInt16();
+				s.Position += 8;
+				/*var FileCount = */s.ReadUInt16();
+				s.Position += 4;
+				/*var ArchiveSize = */s.ReadUInt32();
+				s.Position += 19;
+				var tocAddress = s.ReadInt32();
+				s.Position += 4;
+				var dirCount = s.ReadUInt16();
 
 				// Parse the directory list
-				s.Seek(tocAddress, SeekOrigin.Begin);
-				var tocReader = new BinaryReader(s);
-
-				var fileCountInDirs = new List<uint>();
+				s.Position = tocAddress;
 
 				// Parse directories
+				var directories = new Dictionary<string, uint>();
 				for (var i = 0; i < dirCount; i++)
-					fileCountInDirs.Add(ParseDirectory(tocReader));
+				{
+					// Parse directory header
+					var fileCount = s.ReadUInt16();
+					var chunkSize = s.ReadUInt16();
+					var nameLength = s.ReadUInt16();
+					var dirName = s.ReadASCII(nameLength);
+
+					// Skip to the end of the chunk
+					s.ReadBytes(chunkSize - nameLength - 6);
+					directories.Add(dirName, fileCount);
+				}
 
 				// Parse files
-				foreach (var fileCount in fileCountInDirs)
-					for (var i = 0; i < fileCount; i++)
-						ParseFile(reader);
+				foreach (var dir in directories)
+					for (var i = 0; i < dir.Value; i++)
+						ParseFile(s, dir.Key);
 			}
 			catch
 			{
@@ -71,84 +88,46 @@ namespace OpenRA.FileSystem
 			}
 		}
 
-		static uint ParseDirectory(BinaryReader reader)
-		{
-			// Parse directory header
-			var fileCount = reader.ReadUInt16();
-			var chunkSize = reader.ReadUInt16();
-			var nameLength = reader.ReadUInt16();
-			reader.ReadChars(nameLength); // var DirName = new String(reader.ReadChars(NameLength));
-
-			// Skip to the end of the chunk
-			reader.ReadBytes(chunkSize - nameLength - 6);
-			return fileCount;
-		}
-
 		uint accumulatedData = 0;
-		void ParseFile(BinaryReader reader)
+		void ParseFile(Stream s, string dirName)
 		{
-			reader.ReadBytes(7);
-			var compressedSize = reader.ReadUInt32();
-			reader.ReadBytes(12);
-			var chunkSize = reader.ReadUInt16();
-			reader.ReadBytes(4);
-			var nameLength = reader.ReadByte();
-			var fileName = new string(reader.ReadChars(nameLength));
+			s.Position += 7;
+			var compressedSize = s.ReadUInt32();
+			s.Position += 12;
+			var chunkSize = s.ReadUInt16();
+			s.Position += 4;
+			var nameLength = s.ReadByte();
+			var fileName = dirName + "\\" + s.ReadASCII(nameLength);
 
-			var hash = PackageEntry.HashFilename(fileName, PackageHashType.Classic);
-			if (!index.ContainsKey(hash))
-				index.Add(hash, new PackageEntry(hash, accumulatedData, compressedSize));
-			filenames.Add(fileName);
+			// Use index syntax to overwrite any duplicate entries with the last value
+			index[fileName] = new Entry(accumulatedData, compressedSize);
 			accumulatedData += compressedSize;
 
 			// Skip to the end of the chunk
-			reader.ReadBytes(chunkSize - nameLength - 30);
+			s.Position += chunkSize - nameLength - 30;
 		}
 
-		public Stream GetContent(uint hash)
+		public Stream GetStream(string filename)
 		{
-			PackageEntry e;
-			if (!index.TryGetValue(hash, out e))
+			Entry e;
+			if (!index.TryGetValue(filename, out e))
 				return null;
 
 			s.Seek(dataStart + e.Offset, SeekOrigin.Begin);
-			var data = s.ReadBytes((int)e.Length);
 
-			return new MemoryStream(Blast.Decompress(data));
+			var ret = new MemoryStream();
+			Blast.Decompress(s, ret);
+			ret.Seek(0, SeekOrigin.Begin);
+
+			return ret;
 		}
 
-		public Stream GetContent(string filename)
+		public bool Contains(string filename)
 		{
-			return GetContent(PackageEntry.HashFilename(filename, PackageHashType.Classic));
+			return index.ContainsKey(filename);
 		}
 
-		public IEnumerable<uint> ClassicHashes()
-		{
-			return index.Keys;
-		}
-
-		public IEnumerable<uint> CrcHashes()
-		{
-			yield break;
-		}
-
-		public IEnumerable<string> AllFileNames()
-		{
-			return filenames;
-		}
-
-		public bool Exists(string filename)
-		{
-			return index.ContainsKey(PackageEntry.HashFilename(filename, PackageHashType.Classic));
-		}
-
-		public int Priority { get { return 2000 + priority; } }
-		public string Name { get { return filename; } }
-
-		public void Write(Dictionary<string, byte[]> contents)
-		{
-			throw new NotImplementedException("Cannot save InstallShieldPackages.");
-		}
+		public IReadOnlyDictionary<string, Entry> Index { get { return new ReadOnlyDictionary<string, Entry>(index); } }
 
 		public void Dispose()
 		{

OpenRA.Game/FileSystem/MixFile.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -14,49 +15,26 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using OpenRA.FileFormats;
+using OpenRA.Primitives;
 
 namespace OpenRA.FileSystem
 {
-	public sealed class MixFile : IFolder
+	public sealed class MixFile : IReadOnlyPackage
 	{
-		readonly Dictionary<uint, PackageEntry> index;
+		public string Name { get; private set; }
+		public IEnumerable<string> Contents { get { return index.Keys; } }
+
+		readonly Dictionary<string, PackageEntry> index;
 		readonly long dataStart;
 		readonly Stream s;
-		readonly int priority;
-		readonly string filename;
-		readonly PackageHashType type;
+		readonly FileSystem context;
 
-		// Save a mix to disk with the given contents
-		public MixFile(string filename, int priority, Dictionary<string, byte[]> contents)
+		public MixFile(FileSystem context, string filename)
 		{
-			this.filename = filename;
-			this.priority = priority;
-			this.type = PackageHashType.Classic;
+			Name = filename;
+			this.context = context;
 
-			if (File.Exists(filename))
-				File.Delete(filename);
-
-			s = File.Create(filename);
-			try
-			{
-				index = new Dictionary<uint, PackageEntry>();
-				contents.Add("local mix database.dat", new XccLocalDatabase(contents.Keys.Append("local mix database.dat")).Data());
-				Write(contents);
-			}
-			catch
-			{
-				Dispose();
-				throw;
-			}
-		}
-
-		public MixFile(string filename, PackageHashType type, int priority)
-		{
-			this.filename = filename;
-			this.priority = priority;
-			this.type = type;
-
-			s = GlobalFileSystem.Open(filename);
+			s = context.Open(filename);
 			try
 			{
 				// Detect format type
@@ -76,9 +54,9 @@ namespace OpenRA.FileSystem
 				else
 					entries = ParseHeader(s, isCncMix ? 0 : 4, out dataStart);
 
-				index = entries.ToDictionaryWithConflictLog(x => x.Hash,
+				index = ParseIndex(entries.ToDictionaryWithConflictLog(x => x.Hash,
 					"{0} ({1} format, Encrypted: {2}, DataStart: {3})".F(filename, isCncMix ? "C&C" : "RA/TS/RA2", isEncrypted, dataStart),
-					null, x => "(offs={0}, len={1})".F(x.Offset, x.Length));
+					null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)));
 			}
 			catch (Exception)
 			{
@@ -87,6 +65,60 @@ namespace OpenRA.FileSystem
 			}
 		}
 
+		Dictionary<string, PackageEntry> ParseIndex(Dictionary<uint, PackageEntry> entries)
+		{
+			var classicIndex = new Dictionary<string, PackageEntry>();
+			var crcIndex = new Dictionary<string, PackageEntry>();
+			var allPossibleFilenames = new HashSet<string>();
+
+			// Try and find a local mix database
+			var dbNameClassic = PackageEntry.HashFilename("local mix database.dat", PackageHashType.Classic);
+			var dbNameCRC = PackageEntry.HashFilename("local mix database.dat", PackageHashType.CRC32);
+			foreach (var kv in entries)
+			{
+				if (kv.Key == dbNameClassic || kv.Key == dbNameCRC)
+				{
+					var db = new XccLocalDatabase(GetContent(kv.Value));
+					foreach (var e in db.Entries)
+						allPossibleFilenames.Add(e);
+
+					break;
+				}
+			}
+
+			// Load the global mix database
+			// TODO: This should be passed to the mix file ctor
+			if (context.Exists("global mix database.dat"))
+			{
+				using (var db = new XccGlobalDatabase(context.Open("global mix database.dat")))
+				{
+					foreach (var e in db.Entries)
+						allPossibleFilenames.Add(e);
+				}
+			}
+
+			foreach (var filename in allPossibleFilenames)
+			{
+				var classicHash = PackageEntry.HashFilename(filename, PackageHashType.Classic);
+				var crcHash = PackageEntry.HashFilename(filename, PackageHashType.CRC32);
+				PackageEntry e;
+
+				if (entries.TryGetValue(classicHash, out e))
+					classicIndex.Add(filename, e);
+
+				if (entries.TryGetValue(crcHash, out e))
+					crcIndex.Add(filename, e);
+			}
+
+			var bestIndex = crcIndex.Count > classicIndex.Count ? crcIndex : classicIndex;
+
+			var unknown = entries.Count - bestIndex.Count;
+			if (unknown > 0)
+				Log.Write("debug", "{0}: failed to resolve filenames for {1} unknown hashes".F(Name, unknown));
+
+			return bestIndex;
+		}
+
 		static List<PackageEntry> ParseHeader(Stream s, long offset, out long headerEnd)
 		{
 			s.Seek(offset, SeekOrigin.Begin);
@@ -156,130 +188,35 @@ namespace OpenRA.FileSystem
 			return ret;
 		}
 
-		uint? FindMatchingHash(string filename)
+		public Stream GetContent(PackageEntry entry)
 		{
-			var hash = PackageEntry.HashFilename(filename, type);
-			if (index.ContainsKey(hash))
-				return hash;
-
-			// Maybe we were given a raw hash?
-			uint raw;
-			if (!uint.TryParse(filename, NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture, out raw))
-				return null;
-
-			if ("{0:X}".F(raw) == filename && index.ContainsKey(raw))
-				return raw;
-
-			return null;
+			Stream parentStream;
+			var offset = dataStart + entry.Offset + SegmentStream.GetOverallNestedOffset(s, out parentStream);
+			var path = ((FileStream)parentStream).Name;
+			return new SegmentStream(File.OpenRead(path), offset, entry.Length);
 		}
 
-		public Stream GetContent(uint hash)
+		public Stream GetStream(string filename)
 		{
 			PackageEntry e;
-			if (!index.TryGetValue(hash, out e))
+			if (!index.TryGetValue(filename, out e))
 				return null;
 
-			s.Seek(dataStart + e.Offset, SeekOrigin.Begin);
-			var data = s.ReadBytes((int)e.Length);
-			return new MemoryStream(data);
+			return GetContent(e);
 		}
 
-		public Stream GetContent(string filename)
+		public IReadOnlyDictionary<string, PackageEntry> Index
 		{
-			var hash = FindMatchingHash(filename);
-			return hash.HasValue ? GetContent(hash.Value) : null;
-		}
-
-		static readonly uint[] Nothing = { };
-		public IEnumerable<uint> ClassicHashes()
-		{
-			if (type == PackageHashType.Classic)
-				return index.Keys;
-
-			return Nothing;
-		}
-
-		public IEnumerable<uint> CrcHashes()
-		{
-			if (type == PackageHashType.CRC32)
-				return index.Keys;
-
-			return Nothing;
-		}
-
-		public IEnumerable<string> AllFileNames()
-		{
-			var lookup = new Dictionary<uint, string>();
-			if (Exists("local mix database.dat"))
+			get
 			{
-				var db = new XccLocalDatabase(GetContent("local mix database.dat"));
-				foreach (var e in db.Entries)
-				{
-					var hash = PackageEntry.HashFilename(e, type);
-					if (!lookup.ContainsKey(hash))
-						lookup.Add(hash, e);
-				}
+				var absoluteIndex = index.ToDictionary(e => e.Key, e => new PackageEntry(e.Value.Hash, (uint)(e.Value.Offset + dataStart), e.Value.Length));
+				return new ReadOnlyDictionary<string, PackageEntry>(absoluteIndex);
 			}
-
-			if (GlobalFileSystem.Exists("global mix database.dat"))
-			{
-				var db = new XccGlobalDatabase(GlobalFileSystem.Open("global mix database.dat"));
-				foreach (var e in db.Entries)
-				{
-					var hash = PackageEntry.HashFilename(e, type);
-					if (!lookup.ContainsKey(hash))
-						lookup.Add(hash, e);
-				}
-			}
-
-			return index.Keys.Select(k => lookup.ContainsKey(k) ? lookup[k] : "{0:X}".F(k));
 		}
 
-		public bool Exists(string filename)
+		public bool Contains(string filename)
 		{
-			return FindMatchingHash(filename).HasValue;
-		}
-
-		public int Priority { get { return 1000 + priority; } }
-		public string Name { get { return filename; } }
-
-		public void Write(Dictionary<string, byte[]> contents)
-		{
-			// Cannot modify existing mixfile - rename existing file and
-			// create a new one with original content plus modifications
-			GlobalFileSystem.Unmount(this);
-
-			// TODO: Add existing data to the contents list
-			if (index.Count > 0)
-				throw new NotImplementedException("Updating mix files unfinished");
-
-			// Construct a list of entries for the file header
-			uint dataSize = 0;
-			var items = new List<PackageEntry>();
-			foreach (var kv in contents)
-			{
-				var length = (uint)kv.Value.Length;
-				var hash = PackageEntry.HashFilename(Path.GetFileName(kv.Key), type);
-				items.Add(new PackageEntry(hash, dataSize, length));
-				dataSize += length;
-			}
-
-			// Write the new file
-			s.Seek(0, SeekOrigin.Begin);
-			using (var writer = new BinaryWriter(s))
-			{
-				// Write file header
-				writer.Write((ushort)items.Count);
-				writer.Write(dataSize);
-				foreach (var item in items)
-					item.Write(writer);
-
-				writer.Flush();
-
-				// Copy file data
-				foreach (var file in contents)
-					s.Write(file.Value);
-			}
+			return index.ContainsKey(filename);
 		}
 
 		public void Dispose()

OpenRA.Game/FileSystem/PackageEntry.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/FileSystem/Pak.cs

@@ -1,14 +1,14 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.IO;
 
@@ -21,20 +21,20 @@ namespace OpenRA.FileSystem
 		public string Filename;
 	}
 
-	public sealed class PakFile : IFolder
+	public sealed class PakFile : IReadOnlyPackage
 	{
-		readonly string filename;
-		readonly int priority;
+		public string Name { get; private set; }
+		public IEnumerable<string> Contents { get { return index.Keys; } }
+
 		readonly Dictionary<string, Entry> index;
 		readonly Stream stream;
 
-		public PakFile(string filename, int priority)
+		public PakFile(FileSystem context, string filename)
 		{
-			this.filename = filename;
-			this.priority = priority;
+			Name = filename;
 			index = new Dictionary<string, Entry>();
 
-			stream = GlobalFileSystem.Open(filename);
+			stream = context.Open(filename);
 			try
 			{
 				index = new Dictionary<string, Entry>();
@@ -60,7 +60,7 @@ namespace OpenRA.FileSystem
 			}
 		}
 
-		public Stream GetContent(string filename)
+		public Stream GetStream(string filename)
 		{
 			Entry entry;
 			if (!index.TryGetValue(filename, out entry))
@@ -71,36 +71,11 @@ namespace OpenRA.FileSystem
 			return new MemoryStream(data);
 		}
 
-		public IEnumerable<uint> ClassicHashes()
-		{
-			foreach (var filename in index.Keys)
-				yield return PackageEntry.HashFilename(filename, PackageHashType.Classic);
-		}
-
-		public IEnumerable<uint> CrcHashes()
-		{
-			yield break;
-		}
-
-		public IEnumerable<string> AllFileNames()
-		{
-			foreach (var filename in index.Keys)
-				yield return filename;
-		}
-
-		public bool Exists(string filename)
+		public bool Contains(string filename)
 		{
 			return index.ContainsKey(filename);
 		}
 
-		public void Write(Dictionary<string, byte[]> contents)
-		{
-			throw new NotImplementedException("Cannot save Pak archives.");
-		}
-
-		public int Priority { get { return 1000 + priority; } }
-		public string Name { get { return filename; } }
-
 		public void Dispose()
 		{
 			stream.Dispose();

OpenRA.Game/FileSystem/ZipFile.cs

@@ -1,62 +1,84 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
-using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using ICSharpCode.SharpZipLib.Zip;
 using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;
 
 namespace OpenRA.FileSystem
 {
-	public sealed class ZipFile : IFolder
+	public sealed class ZipFile : IReadWritePackage
 	{
-		readonly string filename;
-		readonly int priority;
-		SZipFile pkg;
+		public IReadWritePackage Parent { get; private set; }
+		public string Name { get; private set; }
+		readonly Stream pkgStream;
+		readonly SZipFile pkg;
 
 		static ZipFile()
 		{
-			ZipConstants.DefaultCodePage = Encoding.Default.CodePage;
+			ZipConstants.DefaultCodePage = Encoding.UTF8.CodePage;
 		}
 
-		public ZipFile(string filename, int priority)
+		public ZipFile(Stream stream, string name, IReadOnlyPackage parent = null)
 		{
-			this.filename = filename;
-			this.priority = priority;
-			try
-			{
-				// pull the file into memory, dont keep it open.
-				pkg = new SZipFile(new MemoryStream(File.ReadAllBytes(filename)));
-			}
-			catch (ZipException e)
-			{
-				Log.Write("debug", "Couldn't load zip file: {0}", e.Message);
-			}
+			// SharpZipLib breaks when asked to update archives loaded from outside streams or files
+			// We can work around this by creating a clean in-memory-only file, cutting all outside references
+			pkgStream = new MemoryStream();
+			stream.CopyTo(pkgStream);
+			pkgStream.Position = 0;
+
+			Name = name;
+			Parent = parent as IReadWritePackage;
+			pkg = new SZipFile(pkgStream);
 		}
 
-		// Create a new zip with the specified contents
-		public ZipFile(string filename, int priority, Dictionary<string, byte[]> contents)
+		public ZipFile(IReadOnlyFileSystem context, string filename)
 		{
-			this.priority = priority;
-			this.filename = filename;
+			string name;
+			IReadOnlyPackage p;
+			if (!context.TryGetPackageContaining(filename, out p, out name))
+				throw new FileNotFoundException("Unable to find parent package for " + filename);
 
-			if (File.Exists(filename))
-				File.Delete(filename);
+			Name = name;
+			Parent = p as IReadWritePackage;
 
-			pkg = SZipFile.Create(filename);
-			Write(contents);
+			// SharpZipLib breaks when asked to update archives loaded from outside streams or files
+			// We can work around this by creating a clean in-memory-only file, cutting all outside references
+			pkgStream = new MemoryStream();
+			using (var sourceStream = p.GetStream(name))
+				sourceStream.CopyTo(pkgStream);
+			pkgStream.Position = 0;
+
+			pkg = new SZipFile(pkgStream);
 		}
 
-		public Stream GetContent(string filename)
+		ZipFile(string filename, IReadWritePackage parent)
+		{
+			pkgStream = new MemoryStream();
+
+			Name = filename;
+			Parent = parent;
+			pkg = SZipFile.Create(pkgStream);
+		}
+
+		public static ZipFile Create(string filename, IReadWritePackage parent)
+		{
+			return new ZipFile(filename, parent);
+		}
+
+		public Stream GetStream(string filename)
 		{
 			var entry = pkg.GetEntry(filename);
 			if (entry == null)
@@ -71,64 +93,68 @@ namespace OpenRA.FileSystem
 			}
 		}
 
-		public IEnumerable<uint> ClassicHashes()
+		public IEnumerable<string> Contents
 		{
-			foreach (ZipEntry entry in pkg)
-				yield return PackageEntry.HashFilename(entry.Name, PackageHashType.Classic);
+			get
+			{
+				foreach (ZipEntry entry in pkg)
+					yield return entry.Name;
+			}
 		}
 
-		public IEnumerable<uint> CrcHashes()
-		{
-			yield break;
-		}
-
-		public IEnumerable<string> AllFileNames()
-		{
-			foreach (ZipEntry entry in pkg)
-				yield return entry.Name;
-		}
-
-		public bool Exists(string filename)
+		public bool Contains(string filename)
 		{
 			return pkg.GetEntry(filename) != null;
 		}
 
-		public int Priority { get { return 500 + priority; } }
-		public string Name { get { return filename; } }
-
-		public void Write(Dictionary<string, byte[]> contents)
+		void Commit()
+		{
+			if (Parent == null)
+				throw new InvalidDataException("Cannot update ZipFile without writable parent");
+
+			var pos = pkgStream.Position;
+			pkgStream.Position = 0;
+			Parent.Update(Name, pkgStream.ReadBytes((int)pkgStream.Length));
+			pkgStream.Position = pos;
+		}
+
+		public void Update(string filename, byte[] contents)
 		{
-			// TODO: Clear existing content?
-			pkg.Close();
-			pkg = SZipFile.Create(filename);
 			pkg.BeginUpdate();
-
-			foreach (var kvp in contents)
-				pkg.Add(new StaticMemoryDataSource(kvp.Value), kvp.Key);
-
+			pkg.Add(new StaticStreamDataSource(new MemoryStream(contents)), filename);
 			pkg.CommitUpdate();
-			pkg.Close();
-			pkg = new SZipFile(new MemoryStream(File.ReadAllBytes(filename)));
+			Commit();
+		}
+
+		public void Delete(string filename)
+		{
+			pkg.BeginUpdate();
+			pkg.Delete(filename);
+			pkg.CommitUpdate();
+			Commit();
 		}
 
 		public void Dispose()
 		{
 			if (pkg != null)
 				pkg.Close();
+
+			if (pkgStream != null)
+				pkgStream.Dispose();
 		}
 	}
 
-	class StaticMemoryDataSource : IStaticDataSource
+	class StaticStreamDataSource : IStaticDataSource
 	{
-		byte[] data;
-		public StaticMemoryDataSource(byte[] data)
+		readonly Stream s;
+		public StaticStreamDataSource(Stream s)
 		{
-			this.data = data;
+			this.s = s;
 		}
 
 		public Stream GetSource()
 		{
-			return new MemoryStream(data);
+			return s;
 		}
 	}
 }

OpenRA.Game/FileSystem/ZipFolder.cs

@@ -0,0 +1,76 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using ICSharpCode.SharpZipLib.Zip;
+using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;
+
+namespace OpenRA.FileSystem
+{
+	public sealed class ZipFolder : IReadOnlyPackage
+	{
+		public string Name { get; private set; }
+		public ZipFile Parent { get; private set; }
+		readonly string path;
+
+		static ZipFolder()
+		{
+			ZipConstants.DefaultCodePage = Encoding.UTF8.CodePage;
+		}
+
+		public ZipFolder(FileSystem context, ZipFile parent, string path, string filename)
+		{
+			if (filename.EndsWith("/"))
+				filename = filename.Substring(0, filename.Length - 1);
+
+			Name = filename;
+			Parent = parent;
+			if (path.EndsWith("/"))
+				path = path.Substring(0, path.Length - 1);
+
+			this.path = path;
+		}
+
+		public Stream GetStream(string filename)
+		{
+			// Zip files use '/' as a path separator
+			return Parent.GetStream(path + '/' + filename);
+		}
+
+		public IEnumerable<string> Contents
+		{
+			get
+			{
+				foreach (var entry in Parent.Contents)
+				{
+					if (entry.StartsWith(path) && entry != path)
+					{
+						var filename = entry.Substring(path.Length + 1);
+						var dirLevels = filename.Split('/').Count(c => !string.IsNullOrEmpty(c));
+						if (dirLevels == 1)
+							yield return filename;
+					}
+				}
+			}
+		}
+
+		public bool Contains(string filename)
+		{
+			return Parent.Contains(path + '/' + filename);
+		}
+
+		public void Dispose() { /* nothing to do */ }
+	}
+}

OpenRA.Game/Game.cs

@@ -1,21 +1,26 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Imaging;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Reflection;
 using System.Threading;
+using System.Threading.Tasks;
 using OpenRA.Chat;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
@@ -32,6 +37,8 @@ namespace OpenRA
 		public const int Timestep = 40;
 		public const int TimestepJankThreshold = 250; // Don't catch up for delays larger than 250ms
 
+		public static InstalledMods Mods { get; private set; }
+
 		public static ModData ModData;
 		public static Settings Settings;
 		public static ICursor Cursor;
@@ -46,22 +53,27 @@ namespace OpenRA
 		public static Sound Sound;
 		public static bool HasInputFocus = false;
 
+		public static bool BenchmarkMode = false;
+
 		public static GlobalChat GlobalChat;
 
+		static Task discoverNat;
+
 		public static OrderManager JoinServer(string host, int port, string password, bool recordReplay = true)
 		{
-			IConnection connection = new NetworkConnection(host, port);
+			var connection = new NetworkConnection(host, port);
 			if (recordReplay)
-				connection = new ReplayRecorderConnection(connection, TimestampedFilename);
+				connection.StartRecording(() => { return TimestampedFilename(); });
 
 			var om = new OrderManager(host, port, password, connection);
 			JoinInner(om);
 			return om;
 		}
 
-		static string TimestampedFilename()
+		static string TimestampedFilename(bool includemilliseconds = false)
 		{
-			return DateTime.UtcNow.ToString("OpenRA-yyyy-MM-ddTHHmmssZ");
+			var format = includemilliseconds ? "yyyy-MM-ddTHHmmssfffZ" : "yyyy-MM-ddTHHmmssZ";
+			return "OpenRA-" + DateTime.UtcNow.ToString(format, CultureInfo.InvariantCulture);
 		}
 
 		static void JoinInner(OrderManager om)
@@ -84,7 +96,7 @@ namespace OpenRA
 
 		// More accurate replacement for Environment.TickCount
 		static Stopwatch stopwatch = Stopwatch.StartNew();
-		public static int RunTime { get { return (int)Game.stopwatch.ElapsedMilliseconds; } }
+		public static long RunTime { get { return stopwatch.ElapsedMilliseconds; } }
 
 		public static int RenderFrame = 0;
 		public static int NetFrameNumber { get { return OrderManager.NetFrameNumber; } }
@@ -153,7 +165,7 @@ namespace OpenRA
 			using (new PerfTimer("NewWorld"))
 				OrderManager.World = new World(map, OrderManager, type);
 
-			worldRenderer = new WorldRenderer(OrderManager.World);
+			worldRenderer = new WorldRenderer(ModData, OrderManager.World);
 
 			using (new PerfTimer("LoadComplete"))
 				OrderManager.World.LoadComplete(worldRenderer);
@@ -173,6 +185,44 @@ namespace OpenRA
 			GC.Collect();
 		}
 
+		public static void RestartGame()
+		{
+			var replay = OrderManager.Connection as ReplayConnection;
+			var replayName = replay != null ? replay.Filename : null;
+			var lobbyInfo = OrderManager.LobbyInfo;
+			var orders = new[] {
+					Order.Command("sync_lobby {0}".F(lobbyInfo.Serialize())),
+					Order.Command("startgame")
+			};
+
+			// Disconnect from the current game
+			Disconnect();
+			Ui.ResetAll();
+
+			// Restart the game with the same replay/mission
+			if (replay != null)
+				JoinReplay(replayName);
+			else
+				CreateAndStartLocalServer(lobbyInfo.GlobalSettings.Map, orders);
+		}
+
+		public static void CreateAndStartLocalServer(string mapUID, IEnumerable<Order> setupOrders)
+		{
+			OrderManager om = null;
+
+			Action lobbyReady = null;
+			lobbyReady = () =>
+			{
+				LobbyInfoChanged -= lobbyReady;
+				foreach (var o in setupOrders)
+					om.IssueOrder(o);
+			};
+
+			LobbyInfoChanged += lobbyReady;
+
+			om = JoinServer(IPAddress.Loopback.ToString(), CreateLocalServer(mapUID), "");
+		}
+
 		public static bool IsHost
 		{
 			get
@@ -189,68 +239,99 @@ namespace OpenRA
 
 		public static void InitializeSettings(Arguments args)
 		{
-			Settings = new Settings(Platform.ResolvePath("^", "settings.yaml"), args);
+			Settings = new Settings(Platform.ResolvePath(Path.Combine("^", "settings.yaml")), args);
 		}
 
 		internal static void Initialize(Arguments args)
 		{
 			Console.WriteLine("Platform is {0}", Platform.CurrentPlatform);
 
-			AppDomain.CurrentDomain.AssemblyResolve += GlobalFileSystem.ResolveAssembly;
+			// Special case handling of Game.Mod argument: if it matches a real filesystem path
+			// then we use this to override the mod search path, and replace it with the mod id
+			var modArgument = args.GetValue("Game.Mod", null);
+			string customModPath = null;
+			if (modArgument != null && (File.Exists(modArgument) || Directory.Exists(modArgument)))
+			{
+				customModPath = modArgument;
+				args.ReplaceValue("Game.Mod", Path.GetFileNameWithoutExtension(modArgument));
+			}
 
 			InitializeSettings(args);
 
 			Log.AddChannel("perf", "perf.log");
 			Log.AddChannel("debug", "debug.log");
-			Log.AddChannel("sync", "syncreport.log");
 			Log.AddChannel("server", "server.log");
 			Log.AddChannel("sound", "sound.log");
 			Log.AddChannel("graphics", "graphics.log");
 			Log.AddChannel("geoip", "geoip.log");
 			Log.AddChannel("irc", "irc.log");
+			Log.AddChannel("nat", "nat.log");
 
-			if (Settings.Server.DiscoverNatDevices)
-				UPnP.TryNatDiscovery();
-			else
+			var platforms = new[] { Settings.Game.Platform, "Default", null };
+			foreach (var p in platforms)
 			{
-				Settings.Server.NatDeviceAvailable = false;
-				Settings.Server.AllowPortForward = false;
-			}
+				if (p == null)
+					throw new InvalidOperationException("Failed to initialize platform-integration library. Check graphics.log for details.");
 
-			GeoIP.Initialize();
-
-			GlobalFileSystem.Mount(Platform.GameDir); // Needed to access shaders
-			var renderers = new[] { Settings.Graphics.Renderer, "Default", null };
-			foreach (var r in renderers)
-			{
-				if (r == null)
-					throw new InvalidOperationException("No suitable renderers were found. Check graphics.log for details.");
-
-				Settings.Graphics.Renderer = r;
+				Settings.Game.Platform = p;
 				try
 				{
-					Renderer = new Renderer(Settings.Graphics, Settings.Server);
+					var rendererPath = Platform.ResolvePath(Path.Combine(".", "OpenRA.Platforms." + p + ".dll"));
+					var assembly = Assembly.LoadFile(rendererPath);
+
+					var platformType = assembly.GetTypes().SingleOrDefault(t => typeof(IPlatform).IsAssignableFrom(t));
+					if (platformType == null)
+						throw new InvalidOperationException("Platform dll must include exactly one IPlatform implementation.");
+
+					var platform = (IPlatform)platformType.GetConstructor(Type.EmptyTypes).Invoke(null);
+					Renderer = new Renderer(platform, Settings.Graphics);
+					Sound = new Sound(platform, Settings.Sound);
+
 					break;
 				}
 				catch (Exception e)
 				{
 					Log.Write("graphics", "{0}", e);
-					Console.WriteLine("Renderer initialization failed. Fallback in place. Check graphics.log for details.");
+					Console.WriteLine("Renderer initialization failed. Check graphics.log for details.");
+
+					if (Renderer != null)
+						Renderer.Dispose();
+
+					if (Sound != null)
+						Sound.Dispose();
 				}
 			}
 
-			Sound = new Sound(Settings.Server.Dedicated ? "Null" : Settings.Sound.Engine);
+			GeoIP.Initialize();
+
+			if (!Game.Settings.Server.DiscoverNatDevices)
+				Game.Settings.Server.AllowPortForward = false;
+			else
+			{
+				discoverNat = UPnP.DiscoverNatDevices(Settings.Server.NatDiscoveryTimeout);
+				Game.Settings.Server.AllowPortForward = true;
+			}
 
 			GlobalChat = new GlobalChat();
 
+			Mods = new InstalledMods(customModPath);
 			Console.WriteLine("Available mods:");
-			foreach (var mod in ModMetadata.AllMods)
-				Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version);
+			foreach (var mod in Mods)
+				Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Metadata.Title, mod.Value.Metadata.Version);
 
 			InitializeMod(Settings.Game.Mod, args);
+		}
 
-			if (Settings.Server.DiscoverNatDevices)
-				RunAfterDelay(Settings.Server.NatDiscoveryTimeout, UPnP.StoppingNatDiscovery);
+		public static bool IsModInstalled(string modId)
+		{
+			return Mods.ContainsKey(modId) && Mods[modId].RequiresMods.All(IsModInstalled);
+		}
+
+		public static bool IsModInstalled(KeyValuePair<string, string> mod)
+		{
+			return Mods.ContainsKey(mod.Key)
+				&& Mods[mod.Key].Metadata.Version == mod.Value
+				&& IsModInstalled(mod.Key);
 		}
 
 		public static void InitializeMod(string mod, Arguments args)
@@ -273,43 +354,39 @@ namespace OpenRA
 				OrderManager.Dispose();
 
 			if (ModData != null)
+			{
+				ModData.ModFiles.UnmountAll();
 				ModData.Dispose();
+			}
+
 			ModData = null;
 
-			// Fall back to default if the mod doesn't exist
-			if (!ModMetadata.AllMods.ContainsKey(mod))
+			// Fall back to default if the mod doesn't exist or has missing prerequisites.
+			if (!IsModInstalled(mod))
 				mod = new GameSettings().Mod;
 
 			Console.WriteLine("Loading mod: {0}", mod);
 			Settings.Game.Mod = mod;
 
 			Sound.StopVideo();
-			Sound.Initialize();
 
-			ModData = new ModData(mod, !Settings.Server.Dedicated);
+			ModData = new ModData(Mods[mod], Mods, true);
 
 			using (new PerfTimer("LoadMaps"))
 				ModData.MapCache.LoadMaps();
 
-			if (Settings.Server.Dedicated)
-			{
-				RunDedicatedServer();
-				Environment.Exit(0);
-			}
-
-			var installData = ModData.Manifest.Get<ContentInstaller>();
-			var isModContentInstalled = installData.TestFiles.All(f => File.Exists(Platform.ResolvePath(f)));
-
 			// Mod assets are missing!
-			if (!isModContentInstalled)
+			if (!ModData.LoadScreen.RequiredContentIsInstalled())
 			{
 				InitializeMod("modchooser", new Arguments());
 				return;
 			}
 
-			ModData.MountFiles();
-			ModData.InitializeLoaders();
-			Renderer.InitializeFonts(ModData.Manifest);
+			ModData.InitializeLoaders(ModData.DefaultFileSystem);
+			Renderer.InitializeFonts(ModData);
+
+			var grid = ModData.Manifest.Contains<MapGrid>() ? ModData.Manifest.Get<MapGrid>() : null;
+			Renderer.InitializeDepthBuffer(grid);
 
 			if (Cursor != null)
 				Cursor.Dispose();
@@ -329,7 +406,6 @@ namespace OpenRA
 					Console.WriteLine("Error was: " + e.Message);
 
 					Cursor = new SoftwareCursor(ModData.CursorProvider);
-					Settings.Graphics.HardwareCursors = false;
 				}
 			}
 			else
@@ -342,38 +418,19 @@ namespace OpenRA
 
 			JoinLocal();
 
-			ModData.LoadScreen.StartGame(args);
-		}
-
-		public static void RunDedicatedServer()
-		{
-			while (true)
+			try
 			{
-				Settings.Server.Map = WidgetUtils.ChooseInitialMap(Settings.Server.Map);
-				Settings.Save();
-				CreateServer(new ServerSettings(Settings.Server));
-
-				while (true)
-				{
-					Thread.Sleep(100);
-
-					if (server.State == Server.ServerState.GameStarted && server.Conns.Count < 1)
-					{
-						Console.WriteLine("No one is playing, shutting down...");
-						server.Shutdown();
-						break;
-					}
-				}
-
-				if (Settings.Server.DedicatedLoop)
-				{
-					Console.WriteLine("Starting a new server instance...");
-					ModData.MapCache.LoadMaps();
-					continue;
-				}
-
-				break;
+				if (discoverNat != null)
+					discoverNat.Wait();
 			}
+			catch (Exception e)
+			{
+				Console.WriteLine("NAT discovery failed: {0}", e.Message);
+				Log.Write("nat", e.ToString());
+				Game.Settings.Server.AllowPortForward = false;
+			}
+
+			ModData.LoadScreen.StartGame(args);
 		}
 
 		public static void LoadEditor(string mapUid)
@@ -392,7 +449,7 @@ namespace OpenRA
 		static string ChooseShellmap()
 		{
 			var shellmaps = ModData.MapCache
-				.Where(m => m.Status == MapStatus.Available && m.Map.Visibility.HasFlag(MapVisibility.Shellmap))
+				.Where(m => m.Status == MapStatus.Available && m.Visibility.HasFlag(MapVisibility.Shellmap))
 				.Select(m => m.Uid);
 
 			if (!shellmaps.Any())
@@ -405,10 +462,10 @@ namespace OpenRA
 		public static event Action OnQuit = () => { };
 
 		// Note: These delayed actions should only be used by widgets or disposing objects
-		// - things that depend on a particular world should be queuing them on the worldactor.
+		// - things that depend on a particular world should be queuing them on the world actor.
 		static volatile ActionQueue delayedActions = new ActionQueue();
-		public static void RunAfterTick(Action a) { delayedActions.Add(a, Game.RunTime); }
-		public static void RunAfterDelay(int delayMilliseconds, Action a) { delayedActions.Add(a, Game.RunTime + delayMilliseconds); }
+		public static void RunAfterTick(Action a) { delayedActions.Add(a, RunTime); }
+		public static void RunAfterDelay(int delayMilliseconds, Action a) { delayedActions.Add(a, RunTime + delayMilliseconds); }
 
 		static void TakeScreenshotInner()
 		{
@@ -420,11 +477,11 @@ namespace OpenRA
 
 			ThreadPool.QueueUserWorkItem(_ =>
 			{
-				var mod = ModData.Manifest.Mod;
-				var directory = Platform.ResolvePath("^", "Screenshots", mod.Id, mod.Version);
+				var mod = ModData.Manifest.Metadata;
+				var directory = Platform.ResolvePath("^", "Screenshots", ModData.Manifest.Id, mod.Version);
 				Directory.CreateDirectory(directory);
 
-				var filename = TimestampedFilename();
+				var filename = TimestampedFilename(true);
 				var format = Settings.Graphics.ScreenshotFormat;
 				var extension = ImageCodecInfo.GetImageEncoders().FirstOrDefault(x => x.FormatID == format.Guid)
 					.FilenameExtension.Split(';').First().ToLowerInvariant().Substring(1);
@@ -435,7 +492,7 @@ namespace OpenRA
 
 				bitmap.Dispose();
 
-				Game.RunAfterTick(() => Debug("Saved screenshot " + filename));
+				RunAfterTick(() => Debug("Saved screenshot " + filename));
 			});
 		}
 
@@ -474,7 +531,11 @@ namespace OpenRA
 					Sound.Tick();
 					Sync.CheckSyncUnchanged(world, orderManager.TickImmediate);
 
-					if (world != null)
+					if (world == null)
+						return;
+
+					// Don't tick when the shellmap is disabled
+					if (world.ShouldTick)
 					{
 						var isNetTick = LocalTick % NetTickScale == 0;
 
@@ -484,6 +545,9 @@ namespace OpenRA
 
 							Log.Write("debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local");
 
+							if (BenchmarkMode)
+								Log.Write("cpu", "{0};{1}".F(LocalTick, PerfHistory.Items["tick_time"].LastValue));
+
 							if (isNetTick)
 								orderManager.Tick();
 
@@ -497,19 +561,20 @@ namespace OpenRA
 
 							PerfHistory.Tick();
 						}
-						else
-							if (orderManager.NetFrameNumber == 0)
-								orderManager.LastTickTime = RunTime;
-
-						Sync.CheckSyncUnchanged(world, () => world.TickRender(worldRenderer));
+						else if (orderManager.NetFrameNumber == 0)
+							orderManager.LastTickTime = RunTime;
 					}
+					else
+						PerfHistory.Tick();
+
+					Sync.CheckSyncUnchanged(world, () => world.TickRender(worldRenderer));
 				}
 			}
 		}
 
 		static void LogicTick()
 		{
-			delayedActions.PerformActions(Game.RunTime);
+			delayedActions.PerformActions(RunTime);
 
 			if (OrderManager.Connection.ConnectionState != lastConnectionState)
 			{
@@ -542,9 +607,9 @@ namespace OpenRA
 
 				using (new PerfSample("render_widgets"))
 				{
-					Game.Renderer.WorldVoxelRenderer.BeginFrame();
+					Renderer.WorldVoxelRenderer.BeginFrame();
 					Ui.PrepareRenderables();
-					Game.Renderer.WorldVoxelRenderer.EndFrame();
+					Renderer.WorldVoxelRenderer.EndFrame();
 
 					Ui.Draw();
 
@@ -569,6 +634,9 @@ namespace OpenRA
 			PerfHistory.Items["batches"].Tick();
 			PerfHistory.Items["render_widgets"].Tick();
 			PerfHistory.Items["render_flip"].Tick();
+
+			if (BenchmarkMode)
+				Log.Write("render", "{0};{1}".F(RenderFrame, PerfHistory.Items["render"].LastValue));
 		}
 
 		static void Loop()
@@ -619,7 +687,7 @@ namespace OpenRA
 			{
 				// Ideal time between logic updates. Timestep = 0 means the game is paused
 				// but we still call LogicTick() because it handles pausing internally.
-				var logicInterval = worldRenderer != null && worldRenderer.World.Timestep != 0 ? worldRenderer.World.Timestep : Game.Timestep;
+				var logicInterval = worldRenderer != null && worldRenderer.World.Timestep != 0 ? worldRenderer.World.Timestep : Timestep;
 
 				// Ideal time between screen updates
 				var maxFramerate = Settings.Graphics.CapFramerate ? Settings.Graphics.MaxFramerate.Clamp(1, 1000) : 1000;
@@ -667,7 +735,7 @@ namespace OpenRA
 					}
 				}
 				else
-					Thread.Sleep(nextUpdate - now);
+					Thread.Sleep((int)(nextUpdate - now));
 			}
 		}
 
@@ -747,7 +815,7 @@ namespace OpenRA
 
 		public static void CreateServer(ServerSettings settings)
 		{
-			server = new Server.Server(new IPEndPoint(IPAddress.Any, settings.ListenPort), settings, ModData);
+			server = new Server.Server(new IPEndPoint(IPAddress.Any, settings.ListenPort), settings, ModData, false);
 		}
 
 		public static int CreateLocalServer(string map)
@@ -760,7 +828,7 @@ namespace OpenRA
 				AllowPortForward = false
 			};
 
-			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0), settings, ModData);
+			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0), settings, ModData, false);
 
 			return server.Port;
 		}

OpenRA.Game/GameInformation.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/GameRules/ActorInfo.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -25,40 +26,30 @@ namespace OpenRA
 		/// The actor name can be anything, but the sprites used in the Render*: traits default to this one.
 		/// If you add an ^ in front of the name, the engine will recognize this as a collection of traits
 		/// that can be inherited by others (using Inherits:) and not a real unit.
-		/// You can remove inherited traits by adding a - infront of them as in -TraitName: to inherit everything, but this trait.
+		/// You can remove inherited traits by adding a - in front of them as in -TraitName: to inherit everything, but this trait.
 		/// </summary>
 		public readonly string Name;
 		readonly TypeDictionary traits = new TypeDictionary();
 		List<ITraitInfo> constructOrderCache = null;
 
-		public ActorInfo(string name, MiniYaml node, Dictionary<string, MiniYaml> allUnits)
+		public ActorInfo(ObjectCreator creator, string name, MiniYaml node)
 		{
 			try
 			{
-				var allParents = new HashSet<string>();
-				var abstractActorType = name.StartsWith("^");
-
-				// Guard against circular inheritance
-				allParents.Add(name);
-				var mergedNode = MergeWithParents(node, allUnits, allParents).ToDictionary();
-
 				Name = name;
 
-				foreach (var t in mergedNode)
+				var abstractActorType = name.StartsWith("^");
+				foreach (var t in node.Nodes)
 				{
-					if (t.Key[0] == '-')
-						throw new YamlException("Bogus trait removal: " + t.Key);
-
-					if (t.Key != "Inherits" && !t.Key.StartsWith("Inherits@"))
-						try
-						{
-							traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value));
-						}
-						catch (FieldLoader.MissingFieldsException e)
-						{
-							if (!abstractActorType)
-								throw new YamlException(e.Message);
-						}
+					try
+					{
+						traits.Add(LoadTraitInfo(creator, t.Key.Split('@')[0], t.Value));
+					}
+					catch (FieldLoader.MissingFieldsException e)
+					{
+						if (!abstractActorType)
+							throw new YamlException(e.Message);
+					}
 				}
 			}
 			catch (YamlException e)
@@ -74,42 +65,12 @@ namespace OpenRA
 				traits.Add(t);
 		}
 
-		static Dictionary<string, MiniYaml> GetParents(MiniYaml node, Dictionary<string, MiniYaml> allUnits)
-		{
-			return node.Nodes.Where(n => n.Key == "Inherits" || n.Key.StartsWith("Inherits@"))
-				.ToDictionary(n => n.Value.Value, n =>
-			{
-				MiniYaml i;
-					if (!allUnits.TryGetValue(n.Value.Value, out i))
-						throw new YamlException(
-							"Bogus inheritance -- parent type {0} does not exist".F(n.Value.Value));
-
-				return i;
-			});
-		}
-
-		static MiniYaml MergeWithParents(MiniYaml node, Dictionary<string, MiniYaml> allUnits, HashSet<string> allParents)
-		{
-			var parents = GetParents(node, allUnits);
-
-			foreach (var kv in parents)
-			{
-				if (!allParents.Add(kv.Key))
-					throw new YamlException(
-						"Bogus inheritance -- duplicate inheritance of {0}.".F(kv.Key));
-
-				node = MiniYaml.MergeStrict(node, MergeWithParents(kv.Value, allUnits, allParents));
-			}
-
-			return node;
-		}
-
-		static ITraitInfo LoadTraitInfo(string traitName, MiniYaml my)
+		static ITraitInfo LoadTraitInfo(ObjectCreator creator, string traitName, MiniYaml my)
 		{
 			if (!string.IsNullOrEmpty(my.Value))
 				throw new YamlException("Junk value `{0}` on trait node {1}"
 				.F(my.Value, traitName));
-			var info = Game.CreateObject<ITraitInfo>(traitName + "Info");
+			var info = creator.CreateObject<ITraitInfo>(traitName + "Info");
 			try
 			{
 				FieldLoader.Load(info, my);
@@ -139,9 +100,15 @@ namespace OpenRA
 			var unresolved = source.Except(resolved);
 
 			var testResolve = new Func<Type, Type, bool>((a, b) => a == b || a.IsAssignableFrom(b));
-			var more = unresolved.Where(u => u.Dependencies.All(d => resolved.Exists(r => testResolve(d, r.Type))));
 
-			// Re-evaluate the vars above until sorted
+			// This query detects which unresolved traits can be immediately resolved as all their direct dependencies are met.
+			var more = unresolved.Where(u =>
+				u.Dependencies.All(d => // To be resolvable, all dependencies must be satisfied according to the following conditions:
+					resolved.Exists(r => testResolve(d, r.Type)) && // There must exist a resolved trait that meets the dependency.
+					!unresolved.Any(u1 => testResolve(d, u1.Type)))); // All matching traits that meet this dependency must be resolved first.
+
+			// Continue resolving traits as long as possible.
+			// Each time we resolve some traits, this means dependencies for other traits may then be possible to satisfy in the next pass.
 			while (more.Any())
 				resolved.AddRange(more);
 
@@ -161,14 +128,14 @@ namespace OpenRA
 					exceptionString += u.Type + ": { " + string.Join(", ", deps) + " }\r\n";
 				}
 
-				throw new Exception(exceptionString);
+				throw new YamlException(exceptionString);
 			}
 
 			constructOrderCache = resolved.Select(r => r.Trait).ToList();
 			return constructOrderCache;
 		}
 
-		static IEnumerable<Type> PrerequisitesOf(ITraitInfo info)
+		public static IEnumerable<Type> PrerequisitesOf(ITraitInfo info)
 		{
 			return info
 				.GetType()
@@ -191,9 +158,9 @@ namespace OpenRA
 					i.Name.Replace("Init", ""), i));
 		}
 
-		public bool HasTraitInfo<T>() where T : ITraitInfo { return traits.Contains<T>(); }
-		public T TraitInfo<T>() where T : ITraitInfo { return traits.Get<T>(); }
-		public T TraitInfoOrDefault<T>() where T : ITraitInfo { return traits.GetOrDefault<T>(); }
-		public IEnumerable<T> TraitInfos<T>() where T : ITraitInfo { return traits.WithInterface<T>(); }
+		public bool HasTraitInfo<T>() where T : ITraitInfoInterface { return traits.Contains<T>(); }
+		public T TraitInfo<T>() where T : ITraitInfoInterface { return traits.Get<T>(); }
+		public T TraitInfoOrDefault<T>() where T : ITraitInfoInterface { return traits.GetOrDefault<T>(); }
+		public IEnumerable<T> TraitInfos<T>() where T : ITraitInfoInterface { return traits.WithInterface<T>(); }
 	}
 }

OpenRA.Game/GameRules/MusicInfo.cs

@@ -1,13 +1,15 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
+using System.IO;
 using OpenRA.FileFormats;
 using OpenRA.FileSystem;
 
@@ -34,19 +36,24 @@ namespace OpenRA.GameRules
 			Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key) + "." + ext;
 		}
 
-		public void Load()
+		public void Load(IReadOnlyFileSystem fileSystem)
 		{
-			if (!GlobalFileSystem.Exists(Filename))
+			Stream stream;
+			if (!fileSystem.TryOpen(Filename, out stream))
 				return;
 
 			Exists = true;
-			using (var s = GlobalFileSystem.Open(Filename))
+			ISoundFormat soundFormat;
+			foreach (var loader in Game.ModData.SoundLoaders)
 			{
-				if (Filename.ToLowerInvariant().EndsWith("wav"))
-					Length = (int)WavLoader.WaveLength(s);
-				else
-					Length = (int)AudLoader.SoundLength(s);
+				if (loader.TryParseSound(stream, out soundFormat))
+				{
+					Length = (int)soundFormat.LengthInSeconds;
+					break;
+				}
 			}
+
+			stream.Dispose();
 		}
 	}
 }

OpenRA.Game/GameRules/Ruleset.cs

@@ -1,15 +1,19 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
+using OpenRA.FileSystem;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
 using OpenRA.Traits;
@@ -23,25 +27,25 @@ namespace OpenRA
 		public readonly IReadOnlyDictionary<string, SoundInfo> Voices;
 		public readonly IReadOnlyDictionary<string, SoundInfo> Notifications;
 		public readonly IReadOnlyDictionary<string, MusicInfo> Music;
-		public readonly IReadOnlyDictionary<string, TileSet> TileSets;
-		public readonly IReadOnlyDictionary<string, SequenceProvider> Sequences;
+		public readonly TileSet TileSet;
+		public readonly SequenceProvider Sequences;
 
 		public Ruleset(
-			IDictionary<string, ActorInfo> actors,
-			IDictionary<string, WeaponInfo> weapons,
-			IDictionary<string, SoundInfo> voices,
-			IDictionary<string, SoundInfo> notifications,
-			IDictionary<string, MusicInfo> music,
-			IDictionary<string, TileSet> tileSets,
-			IDictionary<string, SequenceProvider> sequences)
+			IReadOnlyDictionary<string, ActorInfo> actors,
+			IReadOnlyDictionary<string, WeaponInfo> weapons,
+			IReadOnlyDictionary<string, SoundInfo> voices,
+			IReadOnlyDictionary<string, SoundInfo> notifications,
+			IReadOnlyDictionary<string, MusicInfo> music,
+			TileSet tileSet,
+			SequenceProvider sequences)
 		{
-			Actors = new ReadOnlyDictionary<string, ActorInfo>(actors);
-			Weapons = new ReadOnlyDictionary<string, WeaponInfo>(weapons);
-			Voices = new ReadOnlyDictionary<string, SoundInfo>(voices);
-			Notifications = new ReadOnlyDictionary<string, SoundInfo>(notifications);
-			Music = new ReadOnlyDictionary<string, MusicInfo>(music);
-			TileSets = new ReadOnlyDictionary<string, TileSet>(tileSets);
-			Sequences = new ReadOnlyDictionary<string, SequenceProvider>(sequences);
+			Actors = actors;
+			Weapons = weapons;
+			Voices = voices;
+			Notifications = notifications;
+			Music = music;
+			TileSet = tileSet;
+			Sequences = sequences;
 
 			foreach (var a in Actors.Values)
 			{
@@ -79,5 +83,172 @@ namespace OpenRA
 		}
 
 		public IEnumerable<KeyValuePair<string, MusicInfo>> InstalledMusic { get { return Music.Where(m => m.Value.Exists); } }
+
+		static IReadOnlyDictionary<string, T> MergeOrDefault<T>(string name, IReadOnlyFileSystem fileSystem, IEnumerable<string> files, MiniYaml additional,
+			IReadOnlyDictionary<string, T> defaults, Func<MiniYamlNode, T> makeObject)
+		{
+			if (additional == null && defaults != null)
+				return defaults;
+
+			var result = MiniYaml.Load(fileSystem, files, additional)
+				.ToDictionaryWithConflictLog(k => k.Key.ToLowerInvariant(), makeObject, "LoadFromManifest<" + name + ">");
+
+			return new ReadOnlyDictionary<string, T>(result);
+		}
+
+		public static Ruleset LoadDefaults(ModData modData)
+		{
+			var m = modData.Manifest;
+			var fs = modData.DefaultFileSystem;
+
+			Ruleset ruleset = null;
+			Action f = () =>
+			{
+				var actors = MergeOrDefault("Manifest,Rules", fs, m.Rules, null, null,
+					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value));
+
+				var weapons = MergeOrDefault("Manifest,Weapons", fs, m.Weapons, null, null,
+					k => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
+
+				var voices = MergeOrDefault("Manifest,Voices", fs, m.Voices, null, null,
+					k => new SoundInfo(k.Value));
+
+				var notifications = MergeOrDefault("Manifest,Notifications", fs, m.Notifications, null, null,
+					k => new SoundInfo(k.Value));
+
+				var music = MergeOrDefault("Manifest,Music", fs, m.Music, null, null,
+					k => new MusicInfo(k.Key, k.Value));
+
+				// The default ruleset does not include a preferred tileset or sequence set
+				ruleset = new Ruleset(actors, weapons, voices, notifications, music, null, null);
+			};
+
+			if (modData.IsOnMainThread)
+			{
+				modData.HandleLoadingProgress();
+
+				var loader = new Task(f);
+				loader.Start();
+
+				// Animate the loadscreen while we wait
+				while (!loader.Wait(40))
+					modData.HandleLoadingProgress();
+			}
+			else
+				f();
+
+			return ruleset;
+		}
+
+		public static Ruleset LoadDefaultsForTileSet(ModData modData, string tileSet)
+		{
+			var dr = modData.DefaultRules;
+			var ts = modData.DefaultTileSets[tileSet];
+			var sequences = modData.DefaultSequences[tileSet];
+			return new Ruleset(dr.Actors, dr.Weapons, dr.Voices, dr.Notifications, dr.Music, ts, sequences);
+		}
+
+		public static Ruleset Load(ModData modData, IReadOnlyFileSystem fileSystem, string tileSet,
+			MiniYaml mapRules, MiniYaml mapWeapons, MiniYaml mapVoices, MiniYaml mapNotifications,
+			MiniYaml mapMusic, MiniYaml mapSequences)
+		{
+			var m = modData.Manifest;
+			var dr = modData.DefaultRules;
+
+			Ruleset ruleset = null;
+			Action f = () =>
+			{
+				var actors = MergeOrDefault("Rules", fileSystem, m.Rules, mapRules, dr.Actors,
+					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value));
+
+				var weapons = MergeOrDefault("Weapons", fileSystem, m.Weapons, mapWeapons, dr.Weapons,
+					k => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
+
+				var voices = MergeOrDefault("Voices", fileSystem, m.Voices, mapVoices, dr.Voices,
+					k => new SoundInfo(k.Value));
+
+				var notifications = MergeOrDefault("Notifications", fileSystem, m.Notifications, mapNotifications, dr.Notifications,
+					k => new SoundInfo(k.Value));
+
+				var music = MergeOrDefault("Music", fileSystem, m.Music, mapMusic, dr.Music,
+					k => new MusicInfo(k.Key, k.Value));
+
+				// TODO: Add support for merging custom tileset modifications
+				var ts = modData.DefaultTileSets[tileSet];
+
+				// TODO: Top-level dictionary should be moved into the Ruleset instead of in its own object
+				var sequences = mapSequences == null ? modData.DefaultSequences[tileSet] :
+					new SequenceProvider(fileSystem, modData, ts, mapSequences);
+
+				// TODO: Add support for custom voxel sequences
+				ruleset = new Ruleset(actors, weapons, voices, notifications, music, ts, sequences);
+			};
+
+			if (modData.IsOnMainThread)
+			{
+				modData.HandleLoadingProgress();
+
+				var loader = new Task(f);
+				loader.Start();
+
+				// Animate the loadscreen while we wait
+				while (!loader.Wait(40))
+					modData.HandleLoadingProgress();
+			}
+			else
+				f();
+
+			return ruleset;
+		}
+
+		static bool AnyCustomYaml(MiniYaml yaml)
+		{
+			return yaml != null && (yaml.Value != null || yaml.Nodes.Any());
+		}
+
+		static bool AnyFlaggedTraits(ModData modData, List<MiniYamlNode> actors)
+		{
+			foreach (var actorNode in actors)
+			{
+				foreach (var traitNode in actorNode.Value.Nodes)
+				{
+					try
+					{
+						var traitName = traitNode.Key.Split('@')[0];
+						var traitType = modData.ObjectCreator.FindType(traitName + "Info");
+						if (traitType.GetInterface("ILobbyCustomRulesIgnore") == null)
+							return true;
+					}
+					catch { }
+				}
+			}
+
+			return false;
+		}
+
+		public static bool DefinesUnsafeCustomRules(ModData modData, IReadOnlyFileSystem fileSystem,
+			MiniYaml mapRules, MiniYaml mapWeapons, MiniYaml mapVoices, MiniYaml mapNotifications, MiniYaml mapSequences)
+		{
+			// Maps that define any weapon, voice, notification, or sequence overrides are always flagged
+			if (AnyCustomYaml(mapWeapons) || AnyCustomYaml(mapVoices) || AnyCustomYaml(mapNotifications) ||	AnyCustomYaml(mapSequences))
+				return true;
+
+			// Any trait overrides that aren't explicitly whitelisted are flagged
+			if (mapRules != null)
+			{
+				if (AnyFlaggedTraits(modData, mapRules.Nodes))
+					return true;
+
+				if (mapRules.Value != null)
+				{
+					var mapFiles = FieldLoader.GetValue<string[]>("value", mapRules.Value);
+					foreach (var f in mapFiles)
+						if (AnyFlaggedTraits(modData, MiniYaml.FromStream(fileSystem.Open(f), f)))
+							return true;
+				}
+			}
+
+			return false;
+		}
 	}
 }

OpenRA.Game/GameRules/RulesetCache.cs

@@ -1,159 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenRA.GameRules;
-using OpenRA.Graphics;
-using OpenRA.Support;
-
-namespace OpenRA
-{
-	public sealed class RulesetCache : IDisposable
-	{
-		static readonly List<MiniYamlNode> NoMapRules = new List<MiniYamlNode>();
-
-		readonly ModData modData;
-
-		readonly Dictionary<string, ActorInfo> actorCache = new Dictionary<string, ActorInfo>();
-		readonly Dictionary<string, WeaponInfo> weaponCache = new Dictionary<string, WeaponInfo>();
-		readonly Dictionary<string, SoundInfo> voiceCache = new Dictionary<string, SoundInfo>();
-		readonly Dictionary<string, SoundInfo> notificationCache = new Dictionary<string, SoundInfo>();
-		readonly Dictionary<string, MusicInfo> musicCache = new Dictionary<string, MusicInfo>();
-		readonly Dictionary<string, TileSet> tileSetCache = new Dictionary<string, TileSet>();
-		readonly Dictionary<string, SequenceCache> sequenceCaches = new Dictionary<string, SequenceCache>();
-
-		public event EventHandler LoadingProgress;
-		void RaiseProgress()
-		{
-			if (LoadingProgress != null)
-				LoadingProgress(this, new EventArgs());
-		}
-
-		public RulesetCache(ModData modData)
-		{
-			this.modData = modData;
-		}
-
-		/// <summary>
-		/// Cache and return the Ruleset for a given map.
-		/// If a map isn't specified then return the default mod Ruleset.
-		/// </summary>
-		public Ruleset Load(Map map = null)
-		{
-			var m = modData.Manifest;
-
-			Dictionary<string, ActorInfo> actors;
-			Dictionary<string, WeaponInfo> weapons;
-			Dictionary<string, SoundInfo> voices;
-			Dictionary<string, SoundInfo> notifications;
-			Dictionary<string, MusicInfo> music;
-			Dictionary<string, TileSet> tileSets;
-
-			using (new PerfTimer("Actors"))
-				actors = LoadYamlRules(actorCache, m.Rules,
-					map != null ? map.RuleDefinitions : NoMapRules,
-					(k, y) => new ActorInfo(k.Key.ToLowerInvariant(), k.Value, y));
-
-			using (new PerfTimer("Weapons"))
-				weapons = LoadYamlRules(weaponCache, m.Weapons,
-					map != null ? map.WeaponDefinitions : NoMapRules,
-					(k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
-
-			using (new PerfTimer("Voices"))
-				voices = LoadYamlRules(voiceCache, m.Voices,
-					map != null ? map.VoiceDefinitions : NoMapRules,
-					(k, _) => new SoundInfo(k.Value));
-
-			using (new PerfTimer("Notifications"))
-				notifications = LoadYamlRules(notificationCache, m.Notifications,
-					map != null ? map.NotificationDefinitions : NoMapRules,
-					(k, _) => new SoundInfo(k.Value));
-
-			using (new PerfTimer("Music"))
-				music = LoadYamlRules(musicCache, m.Music,
-					map != null ? map.MusicDefinitions : NoMapRules,
-					(k, _) => new MusicInfo(k.Key, k.Value));
-
-			using (new PerfTimer("TileSets"))
-				tileSets = LoadTileSets(tileSetCache, sequenceCaches, m.TileSets);
-
-			var sequences = sequenceCaches.ToDictionary(kvp => kvp.Key, kvp => new SequenceProvider(kvp.Value, map));
-			return new Ruleset(actors, weapons, voices, notifications, music, tileSets, sequences);
-		}
-
-		Dictionary<string, T> LoadYamlRules<T>(
-			Dictionary<string, T> itemCache,
-			string[] files, List<MiniYamlNode> nodes,
-			Func<MiniYamlNode, Dictionary<string, MiniYaml>, T> f)
-		{
-			RaiseProgress();
-
-			var inputKey = string.Concat(string.Join("|", files), "|", nodes.WriteToString());
-
-			var mergedNodes = files
-				.Select(s => MiniYaml.FromFile(s))
-				.Aggregate(nodes, MiniYaml.MergeLiberal);
-
-			Func<MiniYamlNode, Dictionary<string, MiniYaml>, T> wrap = (wkv, wyy) =>
-			{
-				var key = inputKey + wkv.Value.ToLines(wkv.Key).JoinWith("|");
-				T t;
-				if (itemCache.TryGetValue(key, out t))
-					return t;
-
-				t = f(wkv, wyy);
-				itemCache.Add(key, t);
-
-				RaiseProgress();
-				return t;
-			};
-
-			var yy = mergedNodes.ToDictionary(x => x.Key, x => x.Value);
-			var itemSet = mergedNodes.ToDictionaryWithConflictLog(kv => kv.Key.ToLowerInvariant(), kv => wrap(kv, yy), "LoadYamlRules", null, null);
-
-			RaiseProgress();
-			return itemSet;
-		}
-
-		Dictionary<string, TileSet> LoadTileSets(Dictionary<string, TileSet> itemCache, Dictionary<string, SequenceCache> sequenceCaches, string[] files)
-		{
-			var items = new Dictionary<string, TileSet>();
-
-			foreach (var file in files)
-			{
-				TileSet t;
-				if (itemCache.TryGetValue(file, out t))
-					items.Add(t.Id, t);
-				else
-				{
-					t = new TileSet(modData, file);
-					itemCache.Add(file, t);
-
-					// every time we load a tile set, we create a sequence cache for it
-					var sc = new SequenceCache(modData, t);
-					sequenceCaches.Add(t.Id, sc);
-
-					items.Add(t.Id, t);
-				}
-			}
-
-			return items;
-		}
-
-		public void Dispose()
-		{
-			foreach (var cache in sequenceCaches.Values)
-				cache.Dispose();
-			sequenceCaches.Clear();
-		}
-	}
-}

OpenRA.Game/GameRules/SoundInfo.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/GameRules/WeaponInfo.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -24,12 +25,14 @@ namespace OpenRA.GameRules
 		public int[] RangeModifiers;
 		public int Facing;
 		public WPos Source;
+		public Func<WPos> CurrentSource;
 		public Actor SourceActor;
 		public WPos PassiveTarget;
 		public Target GuidedTarget;
 	}
 
-	public interface IProjectileInfo { IEffect Create(ProjectileArgs args); }
+	public interface IProjectile : IEffect { }
+	public interface IProjectileInfo { IProjectile Create(ProjectileArgs args); }
 
 	public sealed class WeaponInfo
 	{
@@ -45,8 +48,6 @@ namespace OpenRA.GameRules
 		[Desc("Number of shots in a single ammo magazine.")]
 		public readonly int Burst = 1;
 
-		public readonly bool Charges = false;
-
 		[Desc("What types of targets are affected.")]
 		public readonly HashSet<string> ValidTargets = new HashSet<string> { "Ground", "Water" };
 
@@ -126,14 +127,17 @@ namespace OpenRA.GameRules
 		/// <summary>Checks if the weapon is valid against (can target) the actor.</summary>
 		public bool IsValidAgainst(Actor victim, Actor firedBy)
 		{
-			var targetable = victim.TraitsImplementing<ITargetable>().Where(Exts.IsTraitEnabled);
-			if (!IsValidTarget(targetable.SelectMany(t => t.TargetTypes)))
+			var targetTypes = victim.GetEnabledTargetTypes();
+
+			if (!IsValidTarget(targetTypes))
 				return false;
 
-			if (!Warheads.Any(w => w.IsValidAgainst(victim, firedBy)))
-				return false;
+			// PERF: Avoid LINQ.
+			foreach (var warhead in Warheads)
+				if (warhead.IsValidAgainst(victim, firedBy))
+					return true;
 
-			return true;
+			return false;
 		}
 
 		/// <summary>Checks if the weapon is valid against (can target) the frozen actor.</summary>

OpenRA.Game/GameSpeed.cs

@@ -1,17 +1,15 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using OpenRA.Graphics;
 
 namespace OpenRA
 {

OpenRA.Game/GlobalChat.cs

@@ -1,20 +1,19 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Meebey.SmartIrc4net;
-using OpenRA;
 using OpenRA.Primitives;
 
 namespace OpenRA.Chat
@@ -66,7 +65,7 @@ namespace OpenRA.Chat
 		}
 	}
 
-	public class GlobalChat : IDisposable
+	public sealed class GlobalChat : IDisposable
 	{
 		readonly IrcClient client = new IrcClient();
 		volatile Channel channel;
@@ -107,6 +106,8 @@ namespace OpenRA.Chat
 			client.OnDevoice += (_, e) => SetUserVoiced(e.Whom, false);
 			client.OnPart += OnPart;
 			client.OnQuit += OnQuit;
+
+			TrySetNickname(Game.Settings.Player.Name);
 		}
 
 		void SetUserOp(string whom, bool isOp)
@@ -150,7 +151,7 @@ namespace OpenRA.Chat
 				}
 
 				client.Listen();
-			}) { Name = "IrcListenThread" }.Start();
+			}) { Name = "IrcListenThread", IsBackground = true }.Start();
 		}
 
 		void AddNotification(string text)
@@ -225,14 +226,22 @@ namespace OpenRA.Chat
 
 		void OnKick(object sender, KickEventArgs e)
 		{
-			Disconnect();
-			connectionStatus = ChatConnectionStatus.Error;
-			AddNotification("Error: You were kicked from the chat by {0}".F(e.Who));
+			if (e.Whom == client.Nickname)
+			{
+				Disconnect();
+				connectionStatus = ChatConnectionStatus.Error;
+				AddNotification("You were kicked from the chat by {0}. ({1})".F(e.Who, e.KickReason));
+			}
+			else
+			{
+				Users.Remove(e.Whom);
+				AddNotification("{0} was kicked from the chat by {1}. ({2})".F(e.Whom, e.Who, e.KickReason));
+			}
 		}
 
 		void OnJoin(object sender, JoinEventArgs e)
 		{
-			if (e.Who == client.Nickname || e.Channel != channel.Name)
+			if (e.Who == client.Nickname || channel == null || e.Channel != channel.Name)
 				return;
 
 			AddNotification("{0} joined the chat.".F(e.Who));
@@ -275,7 +284,7 @@ namespace OpenRA.Chat
 
 		void OnPart(object sender, PartEventArgs e)
 		{
-			if (e.Data.Channel != channel.Name)
+			if (channel == null || e.Data.Channel != channel.Name)
 				return;
 
 			AddNotification("{0} left the chat.".F(e.Who));
@@ -364,8 +373,19 @@ namespace OpenRA.Chat
 
 		public void Dispose()
 		{
-			if (client.IsConnected)
-				client.Disconnect();
+			// HACK: The IRC library we are using has terrible thread-handling code that relies on Thread.Abort.
+			// There is a thread reading from the network socket which is aborted, however on Windows this is inside
+			// native code so this abort call hangs until the network socket reads something and returns to managed
+			// code where it can then be aborted.
+			//
+			// This means we may hang for several seconds during shutdown (until we receive something over IRC!) before
+			// closing.
+			//
+			// Since our IRC client currently lives forever, the only time we call this Dispose method is during the
+			// shutdown of our process. Therefore, we can work around the problem by just not bothering to disconnect
+			// properly. Since our process is about to die anyway, it's not like anyone will care.
+			////if (client.IsConnected)
+			////	client.Disconnect();
 		}
 	}
 }

OpenRA.Game/Graphics/Animation.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -17,36 +18,35 @@ namespace OpenRA.Graphics
 {
 	public class Animation
 	{
-		readonly int defaultTick = 40; // 25 fps == 40 ms
 		public ISpriteSequence CurrentSequence { get; private set; }
-		public bool IsDecoration = false;
-		public Func<bool> Paused;
-
-		readonly Func<int> facingFunc;
-
-		int frame = 0;
-		bool backwards = false;
-
-		string name;
-
-		bool tickAlways;
-
-		public string Name { get { return name; } }
+		public string Name { get; private set; }
+		public bool IsDecoration { get; set; }
 
 		readonly SequenceProvider sequenceProvider;
+		readonly Func<int> facingFunc;
+		readonly Func<bool> paused;
+
+		int frame;
+		bool backwards;
+		bool tickAlways;
+		int timeUntilNextFrame;
+		Action tickFunc = () => { };
 
 		public Animation(World world, string name)
 			: this(world, name, () => 0) { }
 
 		public Animation(World world, string name, Func<int> facingFunc)
-			: this(world.Map.SequenceProvider, name, facingFunc) { }
+			: this(world, name, facingFunc, null) { }
 
-		public Animation(SequenceProvider sequenceProvider, string name, Func<int> facingFunc)
+		public Animation(World world, string name, Func<bool> paused)
+			: this(world, name, () => 0, paused) { }
+
+		public Animation(World world, string name, Func<int> facingFunc, Func<bool> paused)
 		{
-			this.sequenceProvider = sequenceProvider;
-			this.name = name.ToLowerInvariant();
-			this.tickFunc = () => { };
+			sequenceProvider = world.Map.Rules.Sequences;
+			Name = name.ToLowerInvariant();
 			this.facingFunc = facingFunc;
+			this.paused = paused;
 		}
 
 		public int CurrentFrame { get { return backwards ? CurrentSequence.Start + CurrentSequence.Length - frame - 1 : frame; } }
@@ -76,12 +76,23 @@ namespace OpenRA.Graphics
 			PlayThen(sequenceName, null);
 		}
 
+		int CurrentSequenceTickOrDefault()
+		{
+			const int DefaultTick = 40; // 25 fps == 40 ms
+			return CurrentSequence != null ? CurrentSequence.Tick : DefaultTick;
+		}
+
+		void PlaySequence(string sequenceName)
+		{
+			CurrentSequence = GetSequence(sequenceName);
+			timeUntilNextFrame = CurrentSequenceTickOrDefault();
+		}
+
 		public void PlayRepeating(string sequenceName)
 		{
 			backwards = false;
 			tickAlways = false;
-			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
-			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+			PlaySequence(sequenceName);
 
 			frame = 0;
 			tickFunc = () =>
@@ -97,9 +108,8 @@ namespace OpenRA.Graphics
 			if (!HasSequence(sequenceName))
 				return false;
 
-			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
-			var tick = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
-			timeUntilNextFrame = Math.Min(tick, timeUntilNextFrame);
+			CurrentSequence = GetSequence(sequenceName);
+			timeUntilNextFrame = Math.Min(CurrentSequenceTickOrDefault(), timeUntilNextFrame);
 			frame %= CurrentSequence.Length;
 			return true;
 		}
@@ -108,8 +118,7 @@ namespace OpenRA.Graphics
 		{
 			backwards = false;
 			tickAlways = false;
-			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
-			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+			PlaySequence(sequenceName);
 
 			frame = 0;
 			tickFunc = () =>
@@ -134,8 +143,7 @@ namespace OpenRA.Graphics
 		{
 			backwards = false;
 			tickAlways = true;
-			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
-			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+			PlaySequence(sequenceName);
 
 			frame = func();
 			tickFunc = () => frame = func();
@@ -144,8 +152,7 @@ namespace OpenRA.Graphics
 		public void PlayFetchDirection(string sequenceName, Func<int> direction)
 		{
 			tickAlways = false;
-			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
-			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+			PlaySequence(sequenceName);
 
 			frame = 0;
 			tickFunc = () =>
@@ -159,17 +166,12 @@ namespace OpenRA.Graphics
 			};
 		}
 
-		int timeUntilNextFrame;
-		Action tickFunc;
-
 		public void Tick()
 		{
-			if (Paused == null || !Paused())
+			if (paused == null || !paused())
 				Tick(40); // tick one frame
 		}
 
-		public bool HasSequence(string seq) { return sequenceProvider.HasSequence(name, seq); }
-
 		public void Tick(int t)
 		{
 			if (tickAlways)
@@ -180,7 +182,7 @@ namespace OpenRA.Graphics
 				while (timeUntilNextFrame <= 0)
 				{
 					tickFunc();
-					timeUntilNextFrame += CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+					timeUntilNextFrame += CurrentSequenceTickOrDefault();
 				}
 			}
 		}
@@ -189,17 +191,19 @@ namespace OpenRA.Graphics
 		{
 			newImage = newImage.ToLowerInvariant();
 
-			if (name != newImage)
+			if (Name != newImage)
 			{
-				name = newImage.ToLowerInvariant();
+				Name = newImage;
 				if (!ReplaceAnim(CurrentSequence.Name))
 					ReplaceAnim(newAnimIfMissing);
 			}
 		}
 
+		public bool HasSequence(string seq) { return sequenceProvider.HasSequence(Name, seq); }
+
 		public ISpriteSequence GetSequence(string sequenceName)
 		{
-			return sequenceProvider.GetSequence(name, sequenceName);
+			return sequenceProvider.GetSequence(Name, sequenceName);
 		}
 
 		public string GetRandomExistingSequence(string[] sequences, MersenneTwister random)

OpenRA.Game/Graphics/AnimationWithOffset.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -18,22 +19,20 @@ namespace OpenRA.Graphics
 		public readonly Animation Animation;
 		public readonly Func<WVec> OffsetFunc;
 		public readonly Func<bool> DisableFunc;
-		public readonly Func<bool> Paused;
 		public readonly Func<WPos, int> ZOffset;
 
 		public AnimationWithOffset(Animation a, Func<WVec> offset, Func<bool> disable)
-			: this(a, offset, disable, () => false, null) { }
+			: this(a, offset, disable, null) { }
 
 		public AnimationWithOffset(Animation a, Func<WVec> offset, Func<bool> disable, int zOffset)
-			: this(a, offset, disable, () => false, _ => zOffset) { }
+			: this(a, offset, disable, _ => zOffset) { }
 
-		public AnimationWithOffset(Animation a, Func<WVec> offset, Func<bool> disable, Func<bool> pause, Func<WPos, int> zOffset)
+		public AnimationWithOffset(Animation a, Func<WVec> offset, Func<bool> disable, Func<WPos, int> zOffset)
 		{
-			this.Animation = a;
-			this.Animation.Paused = pause;
-			this.OffsetFunc = offset;
-			this.DisableFunc = disable;
-			this.ZOffset = zOffset;
+			Animation = a;
+			OffsetFunc = offset;
+			DisableFunc = disable;
+			ZOffset = zOffset;
 		}
 
 		public IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr, PaletteReference pal, float scale)
@@ -47,7 +46,7 @@ namespace OpenRA.Graphics
 
 		public static implicit operator AnimationWithOffset(Animation a)
 		{
-			return new AnimationWithOffset(a, null, null, null, null);
+			return new AnimationWithOffset(a, null, null, null);
 		}
 	}
 }

OpenRA.Game/Graphics/ChromeProvider.cs

@@ -1,15 +1,17 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.FileSystem;
 
 namespace OpenRA.Graphics
 {
@@ -24,16 +26,19 @@ namespace OpenRA.Graphics
 		static Dictionary<string, Collection> collections;
 		static Dictionary<string, Sheet> cachedSheets;
 		static Dictionary<string, Dictionary<string, Sprite>> cachedSprites;
+		static IReadOnlyFileSystem fileSystem;
 
-		public static void Initialize(IEnumerable<string> chromeFiles)
+		public static void Initialize(ModData modData)
 		{
 			Deinitialize();
 
+			fileSystem = modData.DefaultFileSystem;
 			collections = new Dictionary<string, Collection>();
 			cachedSheets = new Dictionary<string, Sheet>();
 			cachedSprites = new Dictionary<string, Dictionary<string, Sprite>>();
 
-			var chrome = chromeFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergeLiberal);
+			var chrome = MiniYaml.Merge(modData.Manifest.Chrome
+				.Select(s => MiniYaml.FromStream(fileSystem.Open(s), s)));
 
 			foreach (var c in chrome)
 				LoadCollection(c.Key, c.Value);
@@ -83,6 +88,9 @@ namespace OpenRA.Graphics
 
 		public static Sprite GetImage(string collectionName, string imageName)
 		{
+			if (string.IsNullOrEmpty(collectionName))
+				return null;
+
 			// Cached sprite
 			Dictionary<string, Sprite> cachedCollection;
 			Sprite sprite;
@@ -106,7 +114,9 @@ namespace OpenRA.Graphics
 				sheet = cachedSheets[mi.Src];
 			else
 			{
-				sheet = new Sheet(SheetType.BGRA, mi.Src);
+				using (var stream = fileSystem.Open(mi.Src))
+					sheet = new Sheet(SheetType.BGRA, stream);
+
 				cachedSheets.Add(mi.Src, sheet);
 			}
 

OpenRA.Game/Graphics/CursorProvider.cs

@@ -1,19 +1,17 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
-using OpenRA.FileSystem;
-using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -24,11 +22,13 @@ namespace OpenRA.Graphics
 
 		public CursorProvider(ModData modData)
 		{
-			var sequenceFiles = modData.Manifest.Cursors;
-			var sequences = new MiniYaml(null, sequenceFiles.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergeLiberal));
+			var fileSystem = modData.DefaultFileSystem;
+			var sequenceYaml = MiniYaml.Merge(modData.Manifest.Cursors.Select(
+				s => MiniYaml.FromStream(fileSystem.Open(s), s)));
+
 			var shadowIndex = new int[] { };
 
-			var nodesDict = sequences.ToDictionary();
+			var nodesDict = new MiniYaml(null, sequenceYaml).ToDictionary();
 			if (nodesDict.ContainsKey("ShadowIndex"))
 			{
 				Array.Resize(ref shadowIndex, shadowIndex.Length + 1);
@@ -38,11 +38,11 @@ namespace OpenRA.Graphics
 
 			var palettes = new Dictionary<string, ImmutablePalette>();
 			foreach (var p in nodesDict["Palettes"].Nodes)
-				palettes.Add(p.Key, new ImmutablePalette(GlobalFileSystem.Open(p.Value.Value), shadowIndex));
+				palettes.Add(p.Key, new ImmutablePalette(fileSystem.Open(p.Value.Value), shadowIndex));
 
 			Palettes = palettes.AsReadOnly();
 
-			var frameCache = new FrameCache(modData.SpriteLoaders);
+			var frameCache = new FrameCache(fileSystem, modData.SpriteLoaders);
 			var cursors = new Dictionary<string, CursorSequence>();
 			foreach (var s in nodesDict["Cursors"].Nodes)
 				foreach (var sequence in s.Value.Nodes)

OpenRA.Game/Graphics/CursorSequence.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/Graphics/HSLColor.cs

@@ -1,14 +1,16 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
 using System.Drawing;
+using System.Globalization;
 using OpenRA.Scripting;
 
 namespace OpenRA.Graphics
@@ -27,13 +29,17 @@ namespace OpenRA.Graphics
 			return new HSLColor((byte)(255 * h), (byte)(255 * ss), (byte)(255 * ll));
 		}
 
+		public HSLColor(Color color)
+		{
+			RGB = color;
+			H = (byte)((color.GetHue() / 360.0f) * 255);
+			S = (byte)(color.GetSaturation() * 255);
+			L = (byte)(color.GetBrightness() * 255);
+		}
+
 		public static HSLColor FromRGB(int r, int g, int b)
 		{
-			var c = Color.FromArgb(r, g, b);
-			var h = (byte)((c.GetHue() / 360.0f) * 255);
-			var s = (byte)(c.GetSaturation() * 255);
-			var l = (byte)(c.GetBrightness() * 255);
-			return new HSLColor(h, s, l);
+			return new HSLColor(Color.FromArgb(r, g, b));
 		}
 
 		public static Color RGBFromHSL(float h, float s, float l)
@@ -66,6 +72,27 @@ namespace OpenRA.Graphics
 			return Color.FromArgb((int)(rgb[0] * 255), (int)(rgb[1] * 255), (int)(rgb[2] * 255));
 		}
 
+		public static bool TryParseRGB(string value, out Color color)
+		{
+			color = new Color();
+			value = value.Trim();
+			if (value.Length != 6 && value.Length != 8)
+				return false;
+
+			byte red, green, blue, alpha = 255;
+			if (!byte.TryParse(value.Substring(0, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out red)
+				|| !byte.TryParse(value.Substring(2, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out green)
+				|| !byte.TryParse(value.Substring(4, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out blue))
+				return false;
+
+			if (value.Length == 8
+				&& !byte.TryParse(value.Substring(6, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out alpha))
+				return false;
+
+			color = Color.FromArgb(alpha, red, green, blue);
+			return true;
+		}
+
 		public static bool operator ==(HSLColor me, HSLColor other)
 		{
 			return me.H == other.H && me.S == other.S && me.L == other.L;
@@ -96,6 +123,18 @@ namespace OpenRA.Graphics
 			return "{0},{1},{2}".F(H, S, L);
 		}
 
+		public static string ToHexString(Color color)
+		{
+			if (color.A == 255)
+				return color.R.ToString("X2") + color.G.ToString("X2") + color.B.ToString("X2");
+			return color.R.ToString("X2") + color.G.ToString("X2") + color.B.ToString("X2") + color.A.ToString("X2");
+		}
+
+		public string ToHexString()
+		{
+			return ToHexString(RGB);
+		}
+
 		public override int GetHashCode() { return H.GetHashCode() ^ S.GetHashCode() ^ L.GetHashCode(); }
 
 		public override bool Equals(object obj)

OpenRA.Game/Graphics/HardwareCursor.cs

@@ -1,23 +1,22 @@
 #region Copyright & License Information
 /*
-* Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
-* This file is part of OpenRA, which is free software. It is made
-* available to you under the terms of the GNU General Public License
-* as published by the Free Software Foundation. For more information,
-* see COPYING.
-*/
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
 #endregion
 
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Graphics;
-using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
-	public class HardwareCursor : ICursor
+	public sealed class HardwareCursor : ICursor
 	{
 		readonly Dictionary<string, IHardwareCursor[]> hardwareCursors = new Dictionary<string, IHardwareCursor[]>();
 		readonly CursorProvider cursorProvider;

OpenRA.Game/Graphics/HardwarePalette.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/Graphics/LineRenderer.cs

@@ -1,174 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-
-namespace OpenRA.Graphics
-{
-	public class LineRenderer : Renderer.IBatchRenderer
-	{
-		static readonly float2 Offset = new float2(0.5f, 0.5f);
-
-		readonly Renderer renderer;
-		readonly IShader shader;
-		readonly Action renderAction;
-
-		readonly Vertex[] vertices;
-		int nv = 0;
-
-		float lineWidth = 1f;
-
-		public LineRenderer(Renderer renderer, IShader shader)
-		{
-			this.renderer = renderer;
-			this.shader = shader;
-			vertices = new Vertex[renderer.TempBufferSize];
-			renderAction = () =>
-			{
-				renderer.SetLineWidth(LineWidth);
-				renderer.DrawBatch(vertices, nv, PrimitiveType.LineList);
-			};
-		}
-
-		public float LineWidth
-		{
-			get
-			{
-				return lineWidth;
-			}
-
-			set
-			{
-				if (LineWidth != value)
-					Flush();
-
-				lineWidth = value;
-			}
-		}
-
-		public void Flush()
-		{
-			if (nv > 0)
-			{
-				renderer.Device.SetBlendMode(BlendMode.Alpha);
-				shader.Render(renderAction);
-				renderer.Device.SetBlendMode(BlendMode.None);
-
-				nv = 0;
-			}
-		}
-
-		public void DrawRect(float2 tl, float2 br, Color c)
-		{
-			var tr = new float2(br.X, tl.Y);
-			var bl = new float2(tl.X, br.Y);
-			DrawLine(tl, tr, c);
-			DrawLine(tl, bl, c);
-			DrawLine(tr, br, c);
-			DrawLine(bl, br, c);
-		}
-
-		public void DrawLine(float2 start, float2 end, Color color)
-		{
-			renderer.CurrentBatchRenderer = this;
-
-			if (nv + 2 > renderer.TempBufferSize)
-				Flush();
-
-			color = Util.PremultiplyAlpha(color);
-			var r = color.R / 255.0f;
-			var g = color.G / 255.0f;
-			var b = color.B / 255.0f;
-			var a = color.A / 255.0f;
-			vertices[nv++] = new Vertex(start + Offset, r, g, b, a);
-			vertices[nv++] = new Vertex(end + Offset, r, g, b, a);
-		}
-
-		public void DrawLine(float2 start, float2 end, Color startColor, Color endColor)
-		{
-			renderer.CurrentBatchRenderer = this;
-
-			if (nv + 2 > renderer.TempBufferSize)
-				Flush();
-
-			startColor = Util.PremultiplyAlpha(startColor);
-			var r = startColor.R / 255.0f;
-			var g = startColor.G / 255.0f;
-			var b = startColor.B / 255.0f;
-			var a = startColor.A / 255.0f;
-			vertices[nv++] = new Vertex(start + Offset, r, g, b, a);
-
-			endColor = Util.PremultiplyAlpha(endColor);
-			r = endColor.R / 255.0f;
-			g = endColor.G / 255.0f;
-			b = endColor.B / 255.0f;
-			a = endColor.A / 255.0f;
-			vertices[nv++] = new Vertex(end + Offset, r, g, b, a);
-		}
-
-		public void DrawLineStrip(IEnumerable<float2> points, Color color)
-		{
-			renderer.CurrentBatchRenderer = this;
-
-			color = Util.PremultiplyAlpha(color);
-			var r = color.R / 255.0f;
-			var g = color.G / 255.0f;
-			var b = color.B / 255.0f;
-			var a = color.A / 255.0f;
-
-			var first = true;
-			var prev = new Vertex();
-			foreach (var point in points)
-			{
-				if (first)
-				{
-					first = false;
-					prev = new Vertex(point + Offset, r, g, b, a);
-					continue;
-				}
-
-				if (nv + 2 > renderer.TempBufferSize)
-					Flush();
-
-				vertices[nv++] = prev;
-				prev = new Vertex(point + Offset, r, g, b, a);
-				vertices[nv++] = prev;
-			}
-		}
-
-		public void FillRect(RectangleF r, Color color)
-		{
-			for (var y = r.Top; y < r.Bottom; y++)
-				DrawLine(new float2(r.Left, y), new float2(r.Right, y), color);
-		}
-
-		public void FillEllipse(RectangleF r, Color color)
-		{
-			var a = (r.Right - r.Left) / 2;
-			var b = (r.Bottom - r.Top) / 2;
-			var xc = (r.Right + r.Left) / 2;
-			var yc = (r.Bottom + r.Top) / 2;
-			for (var y = r.Top; y <= r.Bottom; y++)
-			{
-				var dx = a * (float)Math.Sqrt(1 - (y - yc) * (y - yc) / b / b);
-				DrawLine(new float2(xc - dx, y), new float2(xc + dx, y), color);
-			}
-		}
-
-		public void SetViewportParams(Size screen, float zoom, int2 scroll)
-		{
-			shader.SetVec("Scroll", scroll.X, scroll.Y);
-			shader.SetVec("r1", zoom * 2f / screen.Width, -zoom * 2f / screen.Height);
-			shader.SetVec("r2", -1, 1);
-		}
-	}
-}

OpenRA.Game/Graphics/MappedImage.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -37,7 +38,7 @@ namespace OpenRA.Graphics
 			if (defaultSrc != Src)
 				root.Add(new MiniYamlNode("Src", Src));
 
-			return new MiniYaml(FieldSaver.FormatValue(this, this.GetType().GetField("rect")), root);
+			return new MiniYaml(FieldSaver.FormatValue(this, GetType().GetField("rect")), root);
 		}
 	}
 }

OpenRA.Game/Graphics/Minimap.cs

@@ -1,148 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Linq;
-using OpenRA.Traits;
-
-namespace OpenRA.Graphics
-{
-	public static class Minimap
-	{
-		public static Bitmap TerrainBitmap(TileSet tileset, Map map, bool actualSize = false)
-		{
-			var isRectangularIsometric = map.Grid.Type == MapGridType.RectangularIsometric;
-			var b = map.Bounds;
-
-			// Fudge the heightmap offset by adding as much extra as we need / can.
-			// This tries to correct for our incorrect assumption that MPos == PPos
-			var heightOffset = Math.Min(map.Grid.MaximumTerrainHeight, map.MapSize.Y - b.Bottom);
-			var width = b.Width;
-			var height = b.Height + heightOffset;
-
-			var bitmapWidth = width;
-			if (isRectangularIsometric)
-				bitmapWidth = 2 * bitmapWidth - 1;
-
-			if (!actualSize)
-				bitmapWidth = height = Exts.NextPowerOf2(Math.Max(bitmapWidth, height));
-
-			var terrain = new Bitmap(bitmapWidth, height);
-
-			var bitmapData = terrain.LockBits(terrain.Bounds(),
-				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-
-			var mapTiles = map.MapTiles.Value;
-
-			unsafe
-			{
-				var colors = (int*)bitmapData.Scan0;
-				var stride = bitmapData.Stride / 4;
-				for (var y = 0; y < height; y++)
-				{
-					for (var x = 0; x < width; x++)
-					{
-						var uv = new MPos(x + b.Left, y + b.Top);
-						var type = tileset.GetTileInfo(mapTiles[uv]);
-						var leftColor = type != null ? type.LeftColor : Color.Black;
-
-						if (isRectangularIsometric)
-						{
-							// Odd rows are shifted right by 1px
-							var dx = uv.V & 1;
-							var rightColor = type != null ? type.RightColor : Color.Black;
-							if (x + dx > 0)
-								colors[y * stride + 2 * x + dx - 1] = leftColor.ToArgb();
-
-							if (2 * x + dx < stride)
-								colors[y * stride + 2 * x + dx] = rightColor.ToArgb();
-						}
-						else
-							colors[y * stride + x] = leftColor.ToArgb();
-					}
-				}
-			}
-
-			terrain.UnlockBits(bitmapData);
-			return terrain;
-		}
-
-		// Add the static resources defined in the map; if the map lives
-		// in a world use AddCustomTerrain instead
-		static Bitmap AddStaticResources(TileSet tileset, Map map, Ruleset resourceRules, Bitmap terrainBitmap)
-		{
-			var terrain = new Bitmap(terrainBitmap);
-			var isRectangularIsometric = map.Grid.Type == MapGridType.RectangularIsometric;
-			var b = map.Bounds;
-
-			// Fudge the heightmap offset by adding as much extra as we need / can
-			// This tries to correct for our incorrect assumption that MPos == PPos
-			var heightOffset = Math.Min(map.Grid.MaximumTerrainHeight, map.MapSize.Y - b.Bottom);
-			var width = b.Width;
-			var height = b.Height + heightOffset;
-
-			var resources = resourceRules.Actors["world"].TraitInfos<ResourceTypeInfo>()
-				.ToDictionary(r => r.ResourceType, r => r.TerrainType);
-
-			var bitmapData = terrain.LockBits(terrain.Bounds(),
-				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-
-			unsafe
-			{
-				var colors = (int*)bitmapData.Scan0;
-				var stride = bitmapData.Stride / 4;
-				for (var y = 0; y < height; y++)
-				{
-					for (var x = 0; x < width; x++)
-					{
-						var uv = new MPos(x + b.Left, y + b.Top);
-						if (map.MapResources.Value[uv].Type == 0)
-							continue;
-
-						string res;
-						if (!resources.TryGetValue(map.MapResources.Value[uv].Type, out res))
-							continue;
-
-						var color = tileset[tileset.GetTerrainIndex(res)].Color.ToArgb();
-						if (isRectangularIsometric)
-						{
-							// Odd rows are shifted right by 1px
-							var dx = uv.V & 1;
-							if (x + dx > 0)
-								colors[y * stride + 2 * x + dx - 1] = color;
-
-							if (2 * x + dx < stride)
-								colors[y * stride + 2 * x + dx] = color;
-						}
-						else
-							colors[y * stride + x] = color;
-					}
-				}
-			}
-
-			terrain.UnlockBits(bitmapData);
-
-			return terrain;
-		}
-
-		public static Bitmap RenderMapPreview(TileSet tileset, Map map, bool actualSize)
-		{
-			return RenderMapPreview(tileset, map, map.Rules, actualSize);
-		}
-
-		public static Bitmap RenderMapPreview(TileSet tileset, Map map, Ruleset resourceRules, bool actualSize)
-		{
-			using (var terrain = TerrainBitmap(tileset, map, actualSize))
-				return AddStaticResources(tileset, map, resourceRules, terrain);
-		}
-	}
-}

OpenRA.Game/Graphics/Palette.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -57,7 +58,7 @@ namespace OpenRA.Graphics
 			var b = new Bitmap(Size, 1, PixelFormat.Format32bppArgb);
 			var data = b.LockBits(new Rectangle(0, 0, b.Width, b.Height),
 								  ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-			var temp = new uint[Palette.Size];
+			var temp = new uint[Size];
 			palette.CopyToArray(temp, 0);
 			Marshal.Copy((int[])(object)temp, 0, data.Scan0, Size);
 			b.UnlockBits(data);

OpenRA.Game/Graphics/PaletteReference.cs

@@ -1,19 +1,14 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using OpenRA.Traits;
-
 namespace OpenRA.Graphics
 {
 	public sealed class PaletteReference

OpenRA.Game/Graphics/PlatformInterfaces.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -14,23 +15,10 @@ using OpenRA.Graphics;
 
 namespace OpenRA
 {
-	[AttributeUsage(AttributeTargets.Assembly)]
-	public sealed class PlatformAttribute : Attribute
-	{
-		public readonly Type Type;
-
-		public PlatformAttribute(Type graphicsDeviceType)
-		{
-			if (!typeof(IDeviceFactory).IsAssignableFrom(graphicsDeviceType))
-				throw new InvalidOperationException("Incorrect type in RendererAttribute");
-			Type = graphicsDeviceType;
-		}
-	}
-
-	public interface IDeviceFactory
+	public interface IPlatform
 	{
 		IGraphicsDevice CreateGraphics(Size size, WindowMode windowMode);
-		ISoundEngine CreateSound();
+		ISoundEngine CreateSound(string device);
 	}
 
 	public interface IHardwareCursor : IDisposable { }
@@ -61,14 +49,15 @@ namespace OpenRA
 		Bitmap TakeScreenshot();
 		void PumpInput(IInputHandler inputHandler);
 		string GetClipboardText();
+		bool SetClipboardText(string text);
 		void DrawPrimitives(PrimitiveType type, int firstVertex, int numVertices);
 
-		void SetLineWidth(float width);
 		void EnableScissor(int left, int top, int width, int height);
 		void DisableScissor();
 
 		void EnableDepthBuffer();
 		void DisableDepthBuffer();
+		void ClearDepthBuffer();
 
 		void SetBlendMode(BlendMode mode);
 
@@ -77,6 +66,8 @@ namespace OpenRA
 
 		IHardwareCursor CreateHardwareCursor(string name, Size size, byte[] data, int2 hotspot);
 		void SetHardwareCursor(IHardwareCursor cursor);
+
+		string GLVersion { get; }
 	}
 
 	public interface IVertexBuffer<T> : IDisposable
@@ -92,6 +83,7 @@ namespace OpenRA
 		void SetBool(string name, bool value);
 		void SetVec(string name, float x);
 		void SetVec(string name, float x, float y);
+		void SetVec(string name, float x, float y, float z);
 		void SetVec(string name, float[] vec, int length);
 		void SetTexture(string param, ITexture texture);
 		void SetMatrix(string param, float[] mtx);
@@ -122,7 +114,6 @@ namespace OpenRA
 		PointList,
 		LineList,
 		TriangleList,
-		QuadList,
 	}
 
 	public struct Range<T>

OpenRA.Game/Graphics/PlayerColorRemap.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -29,7 +30,7 @@ namespace OpenRA.Graphics
 		{
 			// Increase luminosity if required to represent the full ramp
 			var rampRange = (byte)((1 - rampFraction) * c.L);
-			var c1 = new HSLColor(c.H, c.S, (byte)Math.Max(rampRange, c.L)).RGB;
+			var c1 = new HSLColor(c.H, c.S, Math.Max(rampRange, c.L)).RGB;
 			var c2 = new HSLColor(c.H, c.S, (byte)Math.Max(0, c.L - rampRange)).RGB;
 			var baseIndex = ramp[0];
 			var remapRamp = ramp.Select(r => r - ramp[0]);

OpenRA.Game/Graphics/QuadRenderer.cs

@@ -1,72 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Drawing;
-
-namespace OpenRA.Graphics
-{
-	public class QuadRenderer : Renderer.IBatchRenderer
-	{
-		readonly Renderer renderer;
-		readonly IShader shader;
-		readonly Action renderAction;
-
-		readonly Vertex[] vertices;
-		int nv = 0;
-
-		public QuadRenderer(Renderer renderer, IShader shader)
-		{
-			this.renderer = renderer;
-			this.shader = shader;
-			vertices = new Vertex[renderer.TempBufferSize];
-			renderAction = () => renderer.DrawBatch(vertices, nv, PrimitiveType.QuadList);
-		}
-
-		public void Flush()
-		{
-			if (nv > 0)
-			{
-				renderer.Device.SetBlendMode(BlendMode.Alpha);
-				shader.Render(renderAction);
-				renderer.Device.SetBlendMode(BlendMode.None);
-
-				nv = 0;
-			}
-		}
-
-		public void FillRect(RectangleF rect, Color color)
-		{
-			renderer.CurrentBatchRenderer = this;
-
-			if (nv + 4 > renderer.TempBufferSize)
-				Flush();
-
-			color = Util.PremultiplyAlpha(color);
-			var r = color.R / 255.0f;
-			var g = color.G / 255.0f;
-			var b = color.B / 255.0f;
-			var a = color.A / 255.0f;
-			vertices[nv] = new Vertex(new float2(rect.Left, rect.Top), r, g, b, a);
-			vertices[nv + 1] = new Vertex(new float2(rect.Right, rect.Top), r, g, b, a);
-			vertices[nv + 2] = new Vertex(new float2(rect.Right, rect.Bottom), r, g, b, a);
-			vertices[nv + 3] = new Vertex(new float2(rect.Left, rect.Bottom), r, g, b, a);
-
-			nv += 4;
-		}
-
-		public void SetViewportParams(Size screen, float zoom, int2 scroll)
-		{
-			shader.SetVec("Scroll", scroll.X, scroll.Y);
-			shader.SetVec("r1", zoom * 2f / screen.Width, -zoom * 2f / screen.Height);
-			shader.SetVec("r2", -1, 1);
-		}
-	}
-}

OpenRA.Game/Graphics/Renderable.cs

@@ -1,16 +1,15 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
 
 namespace OpenRA.Graphics
 {

OpenRA.Game/Graphics/RgbaColorRenderer.cs

@@ -0,0 +1,295 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+
+namespace OpenRA.Graphics
+{
+	public class RgbaColorRenderer : Renderer.IBatchRenderer
+	{
+		static readonly float2 Offset = new float2(0.5f, 0.5f);
+
+		readonly Renderer renderer;
+		readonly IShader shader;
+		readonly Action renderAction;
+
+		readonly Vertex[] vertices;
+		int nv = 0;
+
+		public RgbaColorRenderer(Renderer renderer, IShader shader)
+		{
+			this.renderer = renderer;
+			this.shader = shader;
+			vertices = new Vertex[renderer.TempBufferSize];
+			renderAction = () => renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList);
+		}
+
+		public void Flush()
+		{
+			if (nv > 0)
+			{
+				renderer.Device.SetBlendMode(BlendMode.Alpha);
+				shader.Render(renderAction);
+				renderer.Device.SetBlendMode(BlendMode.None);
+
+				nv = 0;
+			}
+		}
+
+		public void DrawLine(float3 start, float3 end, float width, Color startColor, Color endColor)
+		{
+			renderer.CurrentBatchRenderer = this;
+
+			if (nv + 6 > renderer.TempBufferSize)
+				Flush();
+
+			var delta = (end - start) / (end - start).XY.Length;
+			var corner = width / 2 * new float3(-delta.Y, delta.X, delta.Z);
+
+			startColor = Util.PremultiplyAlpha(startColor);
+			var sr = startColor.R / 255.0f;
+			var sg = startColor.G / 255.0f;
+			var sb = startColor.B / 255.0f;
+			var sa = startColor.A / 255.0f;
+
+			endColor = Util.PremultiplyAlpha(endColor);
+			var er = endColor.R / 255.0f;
+			var eg = endColor.G / 255.0f;
+			var eb = endColor.B / 255.0f;
+			var ea = endColor.A / 255.0f;
+
+			vertices[nv++] = new Vertex(start - corner + Offset, sr, sg, sb, sa, 0, 0);
+			vertices[nv++] = new Vertex(start + corner + Offset, sr, sg, sb, sa, 0, 0);
+			vertices[nv++] = new Vertex(end + corner + Offset, er, eg, eb, ea, 0, 0);
+			vertices[nv++] = new Vertex(end + corner + Offset, er, eg, eb, ea, 0, 0);
+			vertices[nv++] = new Vertex(end - corner + Offset, er, eg, eb, ea, 0, 0);
+			vertices[nv++] = new Vertex(start - corner + Offset, sr, sg, sb, sa, 0, 0);
+		}
+
+		public void DrawLine(float3 start, float3 end, float width, Color color)
+		{
+			renderer.CurrentBatchRenderer = this;
+
+			if (nv + 6 > renderer.TempBufferSize)
+				Flush();
+
+			var delta = (end - start) / (end - start).XY.Length;
+			var corner = width / 2 * new float2(-delta.Y, delta.X);
+
+			color = Util.PremultiplyAlpha(color);
+			var r = color.R / 255.0f;
+			var g = color.G / 255.0f;
+			var b = color.B / 255.0f;
+			var a = color.A / 255.0f;
+
+			vertices[nv++] = new Vertex(start - corner + Offset, r, g, b, a, 0, 0);
+			vertices[nv++] = new Vertex(start + corner + Offset, r, g, b, a, 0, 0);
+			vertices[nv++] = new Vertex(end + corner + Offset, r, g, b, a, 0, 0);
+			vertices[nv++] = new Vertex(end + corner + Offset, r, g, b, a, 0, 0);
+			vertices[nv++] = new Vertex(end - corner + Offset, r, g, b, a, 0, 0);
+			vertices[nv++] = new Vertex(start - corner + Offset, r, g, b, a, 0, 0);
+		}
+
+		/// <summary>
+		/// Calculate the 2D intersection of two lines.
+		/// Will behave badly if the lines are parallel.
+		/// Z position is the average of a and b (ignores actual intersection point if it exists)
+		/// </summary>
+		float3 IntersectionOf(float3 a, float3 da, float3 b, float3 db)
+		{
+			var crossA = a.X * (a.Y + da.Y) - a.Y * (a.X + da.X);
+			var crossB = b.X * (b.Y + db.Y) - b.Y * (b.X + db.X);
+			var x = da.X * crossB - db.X * crossA;
+			var y = da.Y * crossB - db.Y * crossA;
+			var d = da.X * db.Y - da.Y * db.X;
+			return new float3(x / d, y / d, 0.5f * (a.Z + b.Z));
+		}
+
+		void DrawDisconnectedLine(IEnumerable<float3> points, float width, Color color)
+		{
+			using (var e = points.GetEnumerator())
+			{
+				if (!e.MoveNext())
+					return;
+
+				var lastPoint = e.Current;
+				while (e.MoveNext())
+				{
+					var point = e.Current;
+					DrawLine(lastPoint, point, width, color);
+					lastPoint = point;
+				}
+			}
+		}
+
+		void DrawConnectedLine(float3[] points, float width, Color color, bool closed)
+		{
+			// Not a line
+			if (points.Length < 2)
+				return;
+
+			// Single segment
+			if (points.Length == 2)
+			{
+				DrawLine(points[0], points[1], width, color);
+				return;
+			}
+
+			renderer.CurrentBatchRenderer = this;
+			color = Util.PremultiplyAlpha(color);
+			var r = color.R / 255.0f;
+			var g = color.G / 255.0f;
+			var b = color.B / 255.0f;
+			var a = color.A / 255.0f;
+
+			var start = points[0];
+			var end = points[1];
+			var dir = (end - start) / (end - start).XY.Length;
+			var corner = width / 2 * new float3(-dir.Y, dir.X, dir.Z);
+
+			// Corners for start of line segment
+			var ca = start - corner;
+			var cb = start + corner;
+
+			// Segment is part of closed loop
+			if (closed)
+			{
+				var prev = points[points.Length - 1];
+				var prevDir = (start - prev) / (start - prev).XY.Length;
+				var prevCorner = width / 2 * new float3(-prevDir.Y, prevDir.X, prevDir.Z);
+				ca = IntersectionOf(start - prevCorner, prevDir, start - corner, dir);
+				cb = IntersectionOf(start + prevCorner, prevDir, start + corner, dir);
+			}
+
+			var limit = closed ? points.Length : points.Length - 1;
+			for (var i = 0; i < limit; i++)
+			{
+				var next = points[(i + 2) % points.Length];
+				var nextDir = (next - end) / (next - end).XY.Length;
+				var nextCorner = width / 2 * new float3(-nextDir.Y, nextDir.X, nextDir.Z);
+
+				// Vertices for the corners joining start-end to end-next
+				var cc = closed || i < limit ? IntersectionOf(end + corner, dir, end + nextCorner, nextDir) : end + corner;
+				var cd = closed || i < limit ? IntersectionOf(end - corner, dir, end - nextCorner, nextDir) : end - corner;
+
+				// Fill segment
+				if (nv + 6 > renderer.TempBufferSize)
+					Flush();
+
+				vertices[nv++] = new Vertex(ca + Offset, r, g, b, a, 0, 0);
+				vertices[nv++] = new Vertex(cb + Offset, r, g, b, a, 0, 0);
+				vertices[nv++] = new Vertex(cc + Offset, r, g, b, a, 0, 0);
+				vertices[nv++] = new Vertex(cc + Offset, r, g, b, a, 0, 0);
+				vertices[nv++] = new Vertex(cd + Offset, r, g, b, a, 0, 0);
+				vertices[nv++] = new Vertex(ca + Offset, r, g, b, a, 0, 0);
+
+				// Advance line segment
+				end = next;
+				dir = nextDir;
+				corner = nextCorner;
+
+				ca = cd;
+				cb = cc;
+			}
+		}
+
+		public void DrawLine(IEnumerable<float2> points, float width, Color color, bool connectSegments = false)
+		{
+			DrawLine(points.Select(p => new float3(p, 0)), width, color, connectSegments);
+		}
+
+		public void DrawLine(IEnumerable<float3> points, float width, Color color, bool connectSegments = false)
+		{
+			if (!connectSegments)
+				DrawDisconnectedLine(points, width, color);
+			else
+				DrawConnectedLine(points as float3[] ?? points.ToArray(), width, color, false);
+		}
+
+		public void DrawPolygon(float3[] vertices, float width, Color color)
+		{
+			DrawConnectedLine(vertices, width, color, true);
+		}
+
+		public void DrawPolygon(float2[] vertices, float width, Color color)
+		{
+			DrawConnectedLine(vertices.Select(v => new float3(v, 0)).ToArray(), width, color, true);
+		}
+
+		public void DrawRect(float3 tl, float3 br, float width, Color color)
+		{
+			var tr = new float3(br.X, tl.Y, tl.Z);
+			var bl = new float3(tl.X, br.Y, br.Z);
+			DrawPolygon(new[] { tl, tr, br, bl }, width, color);
+		}
+
+		public void FillRect(float3 tl, float3 br, Color color)
+		{
+			var tr = new float3(br.X, tl.Y, tl.Z);
+			var bl = new float3(tl.X, br.Y, br.Z);
+			FillRect(tl, tr, br, bl, color);
+		}
+
+		public void FillRect(float3 a, float3 b, float3 c, float3 d, Color color)
+		{
+			renderer.CurrentBatchRenderer = this;
+
+			if (nv + 6 > renderer.TempBufferSize)
+				Flush();
+
+			color = Util.PremultiplyAlpha(color);
+			var cr = color.R / 255.0f;
+			var cg = color.G / 255.0f;
+			var cb = color.B / 255.0f;
+			var ca = color.A / 255.0f;
+
+			vertices[nv++] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[nv++] = new Vertex(b + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[nv++] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[nv++] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[nv++] = new Vertex(d + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[nv++] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
+		}
+
+		public void FillEllipse(float3 tl, float3 br, Color color, int vertices = 32)
+		{
+			// TODO: Create an ellipse polygon instead
+			var a = (br.X - tl.X) / 2;
+			var b = (br.Y - tl.Y) / 2;
+			var xc = (br.X + tl.X) / 2;
+			var yc = (br.Y + tl.Y) / 2;
+			for (var y = tl.Y; y <= br.Y; y++)
+			{
+				var z = float2.Lerp(tl.Z, br.Z, (y - tl.Y) / (br.Y - tl.Y));
+				var dx = a * (float)Math.Sqrt(1 - (y - yc) * (y - yc) / b / b);
+				DrawLine(new float3(xc - dx, y, z), new float3(xc + dx, y, z), 1, color);
+			}
+		}
+
+		public void SetViewportParams(Size screen, float depthScale, float depthOffset, float zoom, int2 scroll)
+		{
+			shader.SetVec("Scroll", scroll.X, scroll.Y, scroll.Y);
+			shader.SetVec("r1",
+				zoom * 2f / screen.Width,
+				-zoom * 2f / screen.Height,
+				-depthScale * zoom / screen.Height);
+			shader.SetVec("r2", -1, 1, 1 - depthOffset);
+		}
+
+		public void SetDepthPreviewEnabled(bool enabled)
+		{
+			shader.SetBool("EnableDepthPreview", enabled);
+		}
+	}
+}

OpenRA.Game/Graphics/SelectionBarsRenderable.cs

@@ -1,15 +1,15 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
 using System.Drawing;
-using OpenRA.Graphics;
 using OpenRA.Traits;
 
 namespace OpenRA.Graphics
@@ -18,17 +18,26 @@ namespace OpenRA.Graphics
 	{
 		readonly WPos pos;
 		readonly Actor actor;
+		readonly bool displayHealth;
+		readonly bool displayExtra;
 
-		public SelectionBarsRenderable(Actor actor)
-			: this(actor.CenterPosition, actor) { }
+		public SelectionBarsRenderable(Actor actor, bool displayHealth, bool displayExtra)
+			: this(actor.CenterPosition, actor)
+		{
+			this.displayHealth = displayHealth;
+			this.displayExtra = displayExtra;
+		}
 
 		public SelectionBarsRenderable(WPos pos, Actor actor)
+			: this()
 		{
 			this.pos = pos;
 			this.actor = actor;
 		}
 
 		public WPos Pos { get { return pos; } }
+		public bool DisplayHealth { get { return displayHealth; } }
+		public bool DisplayExtra { get { return displayExtra; } }
 
 		public PaletteReference Palette { get { return null; } }
 		public int ZOffset { get { return 0; } }
@@ -39,81 +48,63 @@ namespace OpenRA.Graphics
 		public IRenderable OffsetBy(WVec vec) { return new SelectionBarsRenderable(pos + vec, actor); }
 		public IRenderable AsDecoration() { return this; }
 
-		void DrawExtraBars(WorldRenderer wr, float2 start, float2 end)
+		void DrawExtraBars(WorldRenderer wr, float3 start, float3 end)
 		{
 			foreach (var extraBar in actor.TraitsImplementing<ISelectionBar>())
 			{
 				var value = extraBar.GetValue();
-				if (value != 0)
+				if (value != 0 || extraBar.DisplayWhenEmpty)
 				{
-					start.Y += (int)(4 / wr.Viewport.Zoom);
-					end.Y += (int)(4 / wr.Viewport.Zoom);
+					var offset = new float3(0, (int)(4 / wr.Viewport.Zoom), 0);
+					start += offset;
+					end += offset;
 					DrawSelectionBar(wr, start, end, extraBar.GetValue(), extraBar.GetColor());
 				}
 			}
 		}
 
-		void DrawSelectionBar(WorldRenderer wr, float2 start, float2 end, float value, Color barColor)
+		void DrawSelectionBar(WorldRenderer wr, float3 start, float3 end, float value, Color barColor)
 		{
+			var iz = 1 / wr.Viewport.Zoom;
 			var c = Color.FromArgb(128, 30, 30, 30);
 			var c2 = Color.FromArgb(128, 10, 10, 10);
-			var p = new float2(0, -4 / wr.Viewport.Zoom);
-			var q = new float2(0, -3 / wr.Viewport.Zoom);
-			var r = new float2(0, -2 / wr.Viewport.Zoom);
+			var p = new float2(0, -4 * iz);
+			var q = new float2(0, -3 * iz);
+			var r = new float2(0, -2 * iz);
 
 			var barColor2 = Color.FromArgb(255, barColor.R / 2, barColor.G / 2, barColor.B / 2);
 
-			var z = float2.Lerp(start, end, value);
-			var wlr = Game.Renderer.WorldLineRenderer;
-			wlr.DrawLine(start + p, end + p, c);
-			wlr.DrawLine(start + q, end + q, c2);
-			wlr.DrawLine(start + r, end + r, c);
+			var z = float3.Lerp(start, end, value);
+			var wcr = Game.Renderer.WorldRgbaColorRenderer;
+			wcr.DrawLine(start + p, end + p, iz, c);
+			wcr.DrawLine(start + q, end + q, iz, c2);
+			wcr.DrawLine(start + r, end + r, iz, c);
 
-			wlr.DrawLine(start + p, z + p, barColor2);
-			wlr.DrawLine(start + q, z + q, barColor);
-			wlr.DrawLine(start + r, z + r, barColor2);
+			wcr.DrawLine(start + p, z + p, iz, barColor2);
+			wcr.DrawLine(start + q, z + q, iz, barColor);
+			wcr.DrawLine(start + r, z + r, iz, barColor2);
 		}
 
 		Color GetHealthColor(IHealth health)
 		{
-			var player = actor.World.RenderPlayer ?? actor.World.LocalPlayer;
-
-			if (Game.Settings.Game.TeamHealthColors && player != null && !player.Spectating)
-			{
-				var apparentOwner = actor.EffectiveOwner != null && actor.EffectiveOwner.Disguised
-					? actor.EffectiveOwner.Owner
-					: actor.Owner;
-
-				// For friendly spies, treat the unit's owner as the actual owner
-				if (actor.Owner.IsAlliedWith(actor.World.RenderPlayer))
-					apparentOwner = actor.Owner;
-
-				if (apparentOwner == player)
-					return Color.LimeGreen;
-
-				if (apparentOwner.IsAlliedWith(player))
-					return Color.Yellow;
-
-				if (apparentOwner.NonCombatant)
-					return Color.Tan;
-
-				return Color.Red;
-			}
+			if (Game.Settings.Game.UsePlayerStanceColors)
+				return actor.Owner.PlayerStanceColor(actor);
 			else
 				return health.DamageState == DamageState.Critical ? Color.Red :
 					health.DamageState == DamageState.Heavy ? Color.Yellow : Color.LimeGreen;
 		}
 
-		void DrawHealthBar(WorldRenderer wr, IHealth health, float2 start, float2 end)
+		void DrawHealthBar(WorldRenderer wr, IHealth health, float3 start, float3 end)
 		{
 			if (health == null || health.IsDead)
 				return;
 
 			var c = Color.FromArgb(128, 30, 30, 30);
 			var c2 = Color.FromArgb(128, 10, 10, 10);
-			var p = new float2(0, -4 / wr.Viewport.Zoom);
-			var q = new float2(0, -3 / wr.Viewport.Zoom);
-			var r = new float2(0, -2 / wr.Viewport.Zoom);
+			var iz = 1 / wr.Viewport.Zoom;
+			var p = new float2(0, -4 * iz);
+			var q = new float2(0, -3 * iz);
+			var r = new float2(0, -2 * iz);
 
 			var healthColor = GetHealthColor(health);
 			var healthColor2 = Color.FromArgb(
@@ -122,16 +113,16 @@ namespace OpenRA.Graphics
 				healthColor.G / 2,
 				healthColor.B / 2);
 
-			var z = float2.Lerp(start, end, (float)health.HP / health.MaxHP);
+			var z = float3.Lerp(start, end, (float)health.HP / health.MaxHP);
 
-			var wlr = Game.Renderer.WorldLineRenderer;
-			wlr.DrawLine(start + p, end + p, c);
-			wlr.DrawLine(start + q, end + q, c2);
-			wlr.DrawLine(start + r, end + r, c);
+			var wcr = Game.Renderer.WorldRgbaColorRenderer;
+			wcr.DrawLine(start + p, end + p, iz, c);
+			wcr.DrawLine(start + q, end + q, iz, c2);
+			wcr.DrawLine(start + r, end + r, iz, c);
 
-			wlr.DrawLine(start + p, z + p, healthColor2);
-			wlr.DrawLine(start + q, z + q, healthColor);
-			wlr.DrawLine(start + r, z + r, healthColor2);
+			wcr.DrawLine(start + p, z + p, iz, healthColor2);
+			wcr.DrawLine(start + q, z + q, iz, healthColor);
+			wcr.DrawLine(start + r, z + r, iz, healthColor2);
 
 			if (health.DisplayHP != health.HP)
 			{
@@ -141,11 +132,11 @@ namespace OpenRA.Graphics
 					deltaColor.R / 2,
 					deltaColor.G / 2,
 					deltaColor.B / 2);
-				var zz = float2.Lerp(start, end, (float)health.DisplayHP / health.MaxHP);
+				var zz = float3.Lerp(start, end, (float)health.DisplayHP / health.MaxHP);
 
-				wlr.DrawLine(z + p, zz + p, deltaColor2);
-				wlr.DrawLine(z + q, zz + q, deltaColor);
-				wlr.DrawLine(z + r, zz + r, deltaColor2);
+				wcr.DrawLine(z + p, zz + p, iz, deltaColor2);
+				wcr.DrawLine(z + q, zz + q, iz, deltaColor);
+				wcr.DrawLine(z + r, zz + r, iz, deltaColor2);
 			}
 		}
 
@@ -157,15 +148,18 @@ namespace OpenRA.Graphics
 
 			var health = actor.TraitOrDefault<IHealth>();
 
-			var screenPos = wr.ScreenPxPosition(pos);
+			var screenPos = wr.Screen3DPxPosition(pos);
 			var bounds = actor.VisualBounds;
-			bounds.Offset(screenPos.X, screenPos.Y);
+			bounds.Offset((int)screenPos.X, (int)screenPos.Y);
 
-			var start = new float2(bounds.Left + 1, bounds.Top);
-			var end = new float2(bounds.Right - 1, bounds.Top);
+			var start = new float3(bounds.Left + 1, bounds.Top, screenPos.Z);
+			var end = new float3(bounds.Right - 1, bounds.Top, screenPos.Z);
 
-			DrawHealthBar(wr, health, start, end);
-			DrawExtraBars(wr, start, end);
+			if (DisplayHealth)
+				DrawHealthBar(wr, health, start, end);
+
+			if (DisplayExtra)
+				DrawExtraBars(wr, start, end);
 		}
 
 		public void RenderDebugGeometry(WorldRenderer wr) { }

OpenRA.Game/Graphics/SequenceProvider.cs

@@ -1,18 +1,18 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Reflection;
+using OpenRA.FileSystem;
 
 namespace OpenRA.Graphics
 {
@@ -43,15 +43,27 @@ namespace OpenRA.Graphics
 		IReadOnlyDictionary<string, ISpriteSequence> ParseSequences(ModData modData, TileSet tileSet, SpriteCache cache, MiniYamlNode node);
 	}
 
-	public class SequenceProvider
+	public class SequenceProvider : IDisposable
 	{
+		readonly ModData modData;
+		readonly TileSet tileSet;
 		readonly Lazy<Sequences> sequences;
-		public readonly SpriteCache SpriteCache;
+		readonly Lazy<SpriteCache> spriteCache;
+		public SpriteCache SpriteCache { get { return spriteCache.Value; } }
 
-		public SequenceProvider(SequenceCache cache, Map map)
+		readonly Dictionary<string, UnitSequences> sequenceCache = new Dictionary<string, UnitSequences>();
+
+		public SequenceProvider(IReadOnlyFileSystem fileSystem, ModData modData, TileSet tileSet, MiniYaml additionalSequences)
 		{
-			this.sequences = Exts.Lazy(() => cache.LoadSequences(map));
-			this.SpriteCache = cache.SpriteCache;
+			this.modData = modData;
+			this.tileSet = tileSet;
+			sequences = Exts.Lazy(() =>
+			{
+				using (new Support.PerfTimer("LoadSequences"))
+					return Load(fileSystem, additionalSequences);
+			});
+
+			spriteCache = Exts.Lazy(() => new SpriteCache(fileSystem, modData.SpriteLoaders, new SheetBuilder(SheetType.Indexed)));
 		}
 
 		public ISpriteSequence GetSequence(string unitName, string sequenceName)
@@ -90,47 +102,9 @@ namespace OpenRA.Graphics
 			return unitSeq.Value.Keys;
 		}
 
-		public void Preload()
+		Sequences Load(IReadOnlyFileSystem fileSystem, MiniYaml additionalSequences)
 		{
-			SpriteCache.SheetBuilder.Current.CreateBuffer();
-			foreach (var unitSeq in sequences.Value.Values)
-				foreach (var seq in unitSeq.Value.Values) { }
-			SpriteCache.SheetBuilder.Current.ReleaseBuffer();
-		}
-	}
-
-	public sealed class SequenceCache : IDisposable
-	{
-		readonly ModData modData;
-		readonly TileSet tileSet;
-		readonly Lazy<SpriteCache> spriteCache;
-		public SpriteCache SpriteCache { get { return spriteCache.Value; } }
-
-		readonly Dictionary<string, UnitSequences> sequenceCache = new Dictionary<string, UnitSequences>();
-
-		public SequenceCache(ModData modData, TileSet tileSet)
-		{
-			this.modData = modData;
-			this.tileSet = tileSet;
-
-			// Every time we load a tile set, we create a sequence cache for it
-			spriteCache = Exts.Lazy(() => new SpriteCache(modData.SpriteLoaders, new SheetBuilder(SheetType.Indexed)));
-		}
-
-		public Sequences LoadSequences(Map map)
-		{
-			using (new Support.PerfTimer("LoadSequences"))
-				return Load(map != null ? map.SequenceDefinitions : new List<MiniYamlNode>());
-		}
-
-		Sequences Load(List<MiniYamlNode> sequenceNodes)
-		{
-			var sequenceFiles = modData.Manifest.Sequences;
-
-			var nodes = sequenceFiles
-				.Select(s => MiniYaml.FromFile(s))
-				.Aggregate(sequenceNodes, MiniYaml.MergeLiberal);
-
+			var nodes = MiniYaml.Load(fileSystem, modData.Manifest.Sequences, additionalSequences);
 			var items = new Dictionary<string, UnitSequences>();
 			foreach (var n in nodes)
 			{
@@ -153,6 +127,14 @@ namespace OpenRA.Graphics
 			return new ReadOnlyDictionary<string, UnitSequences>(items);
 		}
 
+		public void Preload()
+		{
+			SpriteCache.SheetBuilder.Current.CreateBuffer();
+			foreach (var unitSeq in sequences.Value.Values)
+				foreach (var seq in unitSeq.Value.Values) { }
+			SpriteCache.SheetBuilder.Current.ReleaseBuffer();
+		}
+
 		public void Dispose()
 		{
 			if (spriteCache.IsValueCreated)

OpenRA.Game/Graphics/Sheet.cs

@@ -1,18 +1,19 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
+using System.IO;
 using System.Runtime.InteropServices;
-using OpenRA.FileSystem;
 
 namespace OpenRA.Graphics
 {
@@ -47,9 +48,8 @@ namespace OpenRA.Graphics
 			Size = texture.Size;
 		}
 
-		public Sheet(SheetType type, string filename)
+		public Sheet(SheetType type, Stream stream)
 		{
-			using (var stream = GlobalFileSystem.Open(filename))
 			using (var bitmap = (Bitmap)Image.FromStream(stream))
 			{
 				Size = bitmap.Size;

OpenRA.Game/Graphics/SheetBuilder.cs

@@ -1,17 +1,17 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
 
 namespace OpenRA.Graphics
 {
@@ -25,8 +25,7 @@ namespace OpenRA.Graphics
 	public enum SheetType
 	{
 		Indexed = 1,
-		DualIndexed = 2,
-		BGRA = 4,
+		BGRA = 2,
 	}
 
 	public sealed class SheetBuilder : IDisposable
@@ -60,15 +59,15 @@ namespace OpenRA.Graphics
 			this.allocateSheet = allocateSheet;
 		}
 
-		public Sprite Add(ISpriteFrame frame) { return Add(frame.Data, frame.Size, frame.Offset); }
-		public Sprite Add(byte[] src, Size size) { return Add(src, size, float2.Zero); }
-		public Sprite Add(byte[] src, Size size, float2 spriteOffset)
+		public Sprite Add(ISpriteFrame frame) { return Add(frame.Data, frame.Size, 0, frame.Offset); }
+		public Sprite Add(byte[] src, Size size) { return Add(src, size, 0, float3.Zero); }
+		public Sprite Add(byte[] src, Size size, float zRamp, float3 spriteOffset)
 		{
 			// Don't bother allocating empty sprites
 			if (size.Width == 0 || size.Height == 0)
-				return new Sprite(current, Rectangle.Empty, spriteOffset, channel, BlendMode.Alpha);
+				return new Sprite(current, Rectangle.Empty, 0, spriteOffset, channel, BlendMode.Alpha);
 
-			var rect = Allocate(size, spriteOffset);
+			var rect = Allocate(size, zRamp, spriteOffset);
 			Util.FastCopyIntoChannel(rect, src);
 			current.CommitBufferedData();
 			return rect;
@@ -100,8 +99,8 @@ namespace OpenRA.Graphics
 			return (TextureChannel)nextChannel;
 		}
 
-		public Sprite Allocate(Size imageSize) { return Allocate(imageSize, float2.Zero); }
-		public Sprite Allocate(Size imageSize, float2 spriteOffset)
+		public Sprite Allocate(Size imageSize) { return Allocate(imageSize, 0, float3.Zero); }
+		public Sprite Allocate(Size imageSize, float zRamp, float3 spriteOffset)
 		{
 			if (imageSize.Width + p.X > current.Size.Width)
 			{
@@ -129,7 +128,7 @@ namespace OpenRA.Graphics
 				p = new Point(0, 0);
 			}
 
-			var rect = new Sprite(current, new Rectangle(p, imageSize), spriteOffset, channel, BlendMode.Alpha);
+			var rect = new Sprite(current, new Rectangle(p, imageSize), zRamp, spriteOffset, channel, BlendMode.Alpha);
 			p.X += imageSize.Width;
 
 			return rect;

OpenRA.Game/Graphics/SoftwareCursor.cs

@@ -1,18 +1,17 @@
 #region Copyright & License Information
 /*
-* Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
-* This file is part of OpenRA, which is free software. It is made
-* available to you under the terms of the GNU General Public License
-* as published by the Free Software Foundation. For more information,
-* see COPYING.
-*/
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
 #endregion
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
-using OpenRA.Graphics;
 using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
@@ -24,7 +23,7 @@ namespace OpenRA.Graphics
 		void Tick();
 	}
 
-	public class SoftwareCursor : ICursor
+	public sealed class SoftwareCursor : ICursor
 	{
 		readonly HardwarePalette palette = new HardwarePalette();
 		readonly Cache<string, PaletteReference> paletteReferences;
@@ -82,8 +81,8 @@ namespace OpenRA.Graphics
 			var cursorSize = CursorProvider.CursorViewportZoomed ? 2.0f * cursorSprite.Size : cursorSprite.Size;
 
 			var cursorOffset = CursorProvider.CursorViewportZoomed ?
-				(2 * cursorSequence.Hotspot) + cursorSprite.Size.ToInt2() :
-				cursorSequence.Hotspot + (0.5f * cursorSprite.Size).ToInt2();
+				(2 * cursorSequence.Hotspot) + cursorSprite.Size.XY.ToInt2() :
+				cursorSequence.Hotspot + (0.5f * cursorSprite.Size.XY).ToInt2();
 
 			renderer.SetPalette(palette);
 			renderer.SpriteRenderer.DrawSprite(cursorSprite,

OpenRA.Game/Graphics/Sprite.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -19,24 +20,26 @@ namespace OpenRA.Graphics
 		public readonly Sheet Sheet;
 		public readonly BlendMode BlendMode;
 		public readonly TextureChannel Channel;
-		public readonly float2 Size;
-		public readonly float2 Offset;
-		public readonly float2 FractionalOffset;
+		public readonly float ZRamp;
+		public readonly float3 Size;
+		public readonly float3 Offset;
+		public readonly float3 FractionalOffset;
 		public readonly float Top, Left, Bottom, Right;
 
 		public Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel)
-			: this(sheet, bounds, float2.Zero, channel) { }
+			: this(sheet, bounds, 0, float2.Zero, channel) { }
 
-		public Sprite(Sheet sheet, Rectangle bounds, float2 offset, TextureChannel channel, BlendMode blendMode = BlendMode.Alpha)
+		public Sprite(Sheet sheet, Rectangle bounds, float zRamp, float3 offset, TextureChannel channel, BlendMode blendMode = BlendMode.Alpha)
 		{
 			Sheet = sheet;
 			Bounds = bounds;
 			Offset = offset;
+			ZRamp = zRamp;
 			Channel = channel;
-			Size = new float2(bounds.Size);
+			Size = new float3(bounds.Size.Width, bounds.Size.Height, bounds.Size.Height * zRamp);
 			BlendMode = blendMode;
-
-			FractionalOffset = offset / Size;
+			FractionalOffset = Size.Z != 0 ? offset / Size :
+				new float3(offset.X / Size.X, offset.Y / Size.Y, 0);
 
 			Left = (float)Math.Min(bounds.Left, bounds.Right) / sheet.Size.Width;
 			Top = (float)Math.Min(bounds.Top, bounds.Bottom) / sheet.Size.Height;
@@ -45,6 +48,24 @@ namespace OpenRA.Graphics
 		}
 	}
 
+	public class SpriteWithSecondaryData : Sprite
+	{
+		public readonly Rectangle SecondaryBounds;
+		public readonly TextureChannel SecondaryChannel;
+		public readonly float SecondaryTop, SecondaryLeft, SecondaryBottom, SecondaryRight;
+
+		public SpriteWithSecondaryData(Sprite s, Rectangle secondaryBounds, TextureChannel secondaryChannel)
+			: base(s.Sheet, s.Bounds, s.ZRamp, s.Offset, s.Channel, s.BlendMode)
+		{
+			SecondaryBounds = secondaryBounds;
+			SecondaryChannel = secondaryChannel;
+			SecondaryLeft = (float)Math.Min(secondaryBounds.Left, secondaryBounds.Right) / s.Sheet.Size.Width;
+			SecondaryTop = (float)Math.Min(secondaryBounds.Top, secondaryBounds.Bottom) / s.Sheet.Size.Height;
+			SecondaryRight = (float)Math.Max(secondaryBounds.Left, secondaryBounds.Right) / s.Sheet.Size.Width;
+			SecondaryBottom = (float)Math.Max(secondaryBounds.Top, secondaryBounds.Bottom) / s.Sheet.Size.Height;
+		}
+	}
+
 	public enum TextureChannel : byte
 	{
 		Red = 0,

OpenRA.Game/Graphics/SpriteFont.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -13,11 +14,12 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Primitives;
 using OpenRA.Support;
+using OpenRA.Widgets;
 using SharpFont;
 
 namespace OpenRA.Graphics
 {
-	public class SpriteFont
+	public sealed class SpriteFont : IDisposable
 	{
 		static readonly Library Library = new Library();
 
@@ -27,7 +29,7 @@ namespace OpenRA.Graphics
 		readonly Face face;
 		readonly Cache<Pair<char, Color>, GlyphInfo> glyphs;
 
-		public SpriteFont(string name, int size, SheetBuilder builder)
+		public SpriteFont(string name, byte[] data, int size, SheetBuilder builder)
 		{
 			if (builder.Type != SheetType.BGRA)
 				throw new ArgumentException("The sheet builder must create BGRA sheets.", "builder");
@@ -35,11 +37,12 @@ namespace OpenRA.Graphics
 			this.size = size;
 			this.builder = builder;
 
-			face = new Face(Library, name);
+			face = new Face(Library, data, 0);
 			face.SetPixelSizes((uint)size, (uint)size);
 
 			glyphs = new Cache<Pair<char, Color>, GlyphInfo>(CreateGlyph, Pair<char, Color>.EqualityComparer);
 
+			// PERF: Cache these delegates for Measure calls.
 			Func<char, float> characterWidth = character => glyphs[Pair.New(character, Color.White)].Advance;
 			lineWidth = line => line.Sum(characterWidth);
 
@@ -91,6 +94,24 @@ namespace OpenRA.Graphics
 			DrawText(text, location, fg);
 		}
 
+		public void DrawTextWithContrast(string text, float2 location, Color fg, Color bgDark, Color bgLight, int offset)
+		{
+			DrawTextWithContrast(text, location, fg, WidgetUtils.GetContrastColor(fg, bgDark, bgLight), offset);
+		}
+
+		public void DrawTextWithShadow(string text, float2 location, Color fg, Color bg, int offset)
+		{
+			if (offset != 0)
+				DrawText(text, location + new float2(offset, offset), bg);
+
+			DrawText(text, location, fg);
+		}
+
+		public void DrawTextWithShadow(string text, float2 location, Color fg, Color bgDark, Color bgLight, int offset)
+		{
+			DrawTextWithShadow(text, location, fg, WidgetUtils.GetContrastColor(fg, bgDark, bgLight), offset);
+		}
+
 		public int2 Measure(string text)
 		{
 			if (string.IsNullOrEmpty(text))
@@ -149,6 +170,11 @@ namespace OpenRA.Graphics
 
 			return g;
 		}
+
+		public void Dispose()
+		{
+			face.Dispose();
+		}
 	}
 
 	class GlyphInfo

OpenRA.Game/Graphics/SpriteLoader.cs

@@ -1,13 +1,15 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
+using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -23,8 +25,17 @@ namespace OpenRA.Graphics
 
 	public interface ISpriteFrame
 	{
+		/// <summary>
+		/// Size of the frame's `Data`.
+		/// </summary>
 		Size Size { get; }
+
+		/// <summary>
+		/// Size of the entire frame including the frame's `Size`.
+		/// Think of this like a picture frame.
+		/// </summary>
 		Size FrameSize { get; }
+
 		float2 Offset { get; }
 		byte[] Data { get; }
 		bool DisableExportPadding { get; }
@@ -33,25 +44,56 @@ namespace OpenRA.Graphics
 	public class SpriteCache
 	{
 		public readonly SheetBuilder SheetBuilder;
-		readonly Cache<string, Sprite[]> sprites;
+		readonly ISpriteLoader[] loaders;
+		readonly IReadOnlyFileSystem fileSystem;
 
-		public SpriteCache(ISpriteLoader[] loaders, SheetBuilder sheetBuilder)
+		readonly Dictionary<string, List<Sprite[]>> sprites = new Dictionary<string, List<Sprite[]>>();
+
+		public SpriteCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders, SheetBuilder sheetBuilder)
 		{
 			SheetBuilder = sheetBuilder;
-
-			sprites = new Cache<string, Sprite[]>(filename => SpriteLoader.GetSprites(filename, loaders, sheetBuilder));
+			this.fileSystem = fileSystem;
+			this.loaders = loaders;
 		}
 
-		public Sprite[] this[string filename] { get { return sprites[filename]; } }
+		Sprite[] LoadSprite(string filename, List<Sprite[]> cache)
+		{
+			var sprite = SpriteLoader.GetSprites(fileSystem, filename, loaders, SheetBuilder);
+			cache.Add(sprite);
+			return sprite;
+		}
+
+		/// <summary>Returns the first set of sprites with the given filename.</summary>
+		public Sprite[] this[string filename]
+		{
+			get
+			{
+				var allSprites = sprites.GetOrAdd(filename);
+				var sprite = allSprites.FirstOrDefault();
+				return sprite ?? LoadSprite(filename, allSprites);
+			}
+		}
+
+		/// <summary>Returns all instances of sets of sprites with the given filename</summary>
+		public IEnumerable<Sprite[]> AllCached(string filename)
+		{
+			return sprites.GetOrAdd(filename);
+		}
+
+		/// <summary>Loads and caches a new instance of sprites with the given filename</summary>
+		public Sprite[] Reload(string filename)
+		{
+			return LoadSprite(filename, sprites.GetOrAdd(filename));
+		}
 	}
 
 	public class FrameCache
 	{
 		readonly Cache<string, ISpriteFrame[]> frames;
 
-		public FrameCache(ISpriteLoader[] loaders)
+		public FrameCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders)
 		{
-			frames = new Cache<string, ISpriteFrame[]>(filename => SpriteLoader.GetFrames(filename, loaders));
+			frames = new Cache<string, ISpriteFrame[]>(filename => SpriteLoader.GetFrames(fileSystem, filename, loaders));
 		}
 
 		public ISpriteFrame[] this[string filename] { get { return frames[filename]; } }
@@ -59,22 +101,31 @@ namespace OpenRA.Graphics
 
 	public static class SpriteLoader
 	{
-		public static Sprite[] GetSprites(string filename, ISpriteLoader[] loaders, SheetBuilder sheetBuilder)
+		public static Sprite[] GetSprites(IReadOnlyFileSystem fileSystem, string filename, ISpriteLoader[] loaders, SheetBuilder sheetBuilder)
 		{
-			return GetFrames(filename, loaders).Select(a => sheetBuilder.Add(a)).ToArray();
+			return GetFrames(fileSystem, filename, loaders).Select(a => sheetBuilder.Add(a)).ToArray();
 		}
 
-		public static ISpriteFrame[] GetFrames(string filename, ISpriteLoader[] loaders)
+		public static ISpriteFrame[] GetFrames(IReadOnlyFileSystem fileSystem, string filename, ISpriteLoader[] loaders)
 		{
-			using (var stream = GlobalFileSystem.Open(filename))
+			using (var stream = fileSystem.Open(filename))
 			{
-				ISpriteFrame[] frames;
-				foreach (var loader in loaders)
-					if (loader.TryParseSprite(stream, out frames))
-						return frames;
+				var spriteFrames = GetFrames(stream, loaders);
+				if (spriteFrames == null)
+					throw new InvalidDataException(filename + " is not a valid sprite file!");
 
-				throw new InvalidDataException(filename + " is not a valid sprite file");
+				return spriteFrames;
 			}
 		}
+
+		public static ISpriteFrame[] GetFrames(Stream stream, ISpriteLoader[] loaders)
+		{
+			ISpriteFrame[] frames;
+			foreach (var loader in loaders)
+				if (loader.TryParseSprite(stream, out frames))
+					return frames;
+
+			return null;
+		}
 	}
 }

OpenRA.Game/Graphics/SpriteRenderable.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -48,27 +49,30 @@ namespace OpenRA.Graphics
 		public IRenderable OffsetBy(WVec vec) { return new SpriteRenderable(sprite, pos + vec, offset, zOffset, palette, scale, isDecoration); }
 		public IRenderable AsDecoration() { return new SpriteRenderable(sprite, pos, offset, zOffset, palette, scale, true); }
 
-		float2 ScreenPosition(WorldRenderer wr)
+		float3 ScreenPosition(WorldRenderer wr)
 		{
-			return wr.ScreenPxPosition(pos) + wr.ScreenPxOffset(offset) - (0.5f * scale * sprite.Size).ToInt2();
+			var xy = wr.ScreenPxPosition(pos) + wr.ScreenPxOffset(offset) - (0.5f * scale * sprite.Size.XY).ToInt2();
+
+			// HACK: The z offset needs to be applied somewhere, but this probably is the wrong place.
+			return new float3(xy, sprite.Offset.Z + wr.ScreenZPosition(pos, 0) - 0.5f * scale * sprite.Size.Z);
 		}
 
 		public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }
 		public void Render(WorldRenderer wr)
 		{
-			Game.Renderer.WorldSpriteRenderer.DrawSprite(sprite, ScreenPosition(wr), palette, sprite.Size * scale);
+			Game.Renderer.WorldSpriteRenderer.DrawSprite(sprite, ScreenPosition(wr), palette, scale * sprite.Size);
 		}
 
 		public void RenderDebugGeometry(WorldRenderer wr)
 		{
-			var offset = ScreenPosition(wr) + sprite.Offset;
-			Game.Renderer.WorldLineRenderer.DrawRect(offset, offset + sprite.Size, Color.Red);
+			var screenOffset = ScreenPosition(wr) + sprite.Offset;
+			Game.Renderer.WorldRgbaColorRenderer.DrawRect(screenOffset, screenOffset + sprite.Size, 1 / wr.Viewport.Zoom, Color.Red);
 		}
 
 		public Rectangle ScreenBounds(WorldRenderer wr)
 		{
-			var offset = ScreenPosition(wr) + sprite.Offset;
-			return new Rectangle((int)offset.X, (int)offset.Y, (int)sprite.Size.X, (int)sprite.Size.Y);
+			var screenOffset = ScreenPosition(wr) + sprite.Offset;
+			return new Rectangle((int)screenOffset.X, (int)screenOffset.Y, (int)sprite.Size.X, (int)sprite.Size.Y);
 		}
 	}
 }

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -29,7 +30,7 @@ namespace OpenRA.Graphics
 			this.renderer = renderer;
 			this.shader = shader;
 			vertices = new Vertex[renderer.TempBufferSize];
-			renderAction = () => renderer.DrawBatch(vertices, nv, PrimitiveType.QuadList);
+			renderAction = () => renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList);
 		}
 
 		public void Flush()
@@ -51,53 +52,53 @@ namespace OpenRA.Graphics
 		{
 			renderer.CurrentBatchRenderer = this;
 
-			if (s.BlendMode != currentBlend || s.Sheet != currentSheet || nv + 4 > renderer.TempBufferSize)
+			if (s.BlendMode != currentBlend || s.Sheet != currentSheet || nv + 6 > renderer.TempBufferSize)
 				Flush();
 
 			currentBlend = s.BlendMode;
 			currentSheet = s.Sheet;
 		}
 
-		public void DrawSprite(Sprite s, float2 location, PaletteReference pal)
+		public void DrawSprite(Sprite s, float3 location, PaletteReference pal)
 		{
 			DrawSprite(s, location, pal.TextureIndex, s.Size);
 		}
 
-		public void DrawSprite(Sprite s, float2 location, PaletteReference pal, float2 size)
+		public void DrawSprite(Sprite s, float3 location, PaletteReference pal, float3 size)
 		{
 			DrawSprite(s, location, pal.TextureIndex, size);
 		}
 
-		void DrawSprite(Sprite s, float2 location, float paletteTextureIndex, float2 size)
+		void DrawSprite(Sprite s, float3 location, float paletteTextureIndex, float3 size)
 		{
 			SetRenderStateForSprite(s);
 			Util.FastCreateQuad(vertices, location + s.FractionalOffset * size, s, paletteTextureIndex, nv, size);
-			nv += 4;
+			nv += 6;
 		}
 
 		// For RGBASpriteRenderer, which doesn't use palettes
-		public void DrawSprite(Sprite s, float2 location)
+		public void DrawSprite(Sprite s, float3 location)
 		{
 			DrawSprite(s, location, 0, s.Size);
 		}
 
-		public void DrawSprite(Sprite s, float2 location, float2 size)
+		public void DrawSprite(Sprite s, float3 location, float3 size)
 		{
 			DrawSprite(s, location, 0, size);
 		}
 
-		public void DrawSprite(Sprite s, float2 a, float2 b, float2 c, float2 d)
+		public void DrawSprite(Sprite s, float3 a, float3 b, float3 c, float3 d)
 		{
 			SetRenderStateForSprite(s);
 			Util.FastCreateQuad(vertices, a, b, c, d, s, 0, nv);
-			nv += 4;
+			nv += 6;
 		}
 
 		public void DrawSprite(Sprite s, Vertex[] sourceVertices, int offset)
 		{
 			SetRenderStateForSprite(s);
-			Array.Copy(sourceVertices, offset, vertices, nv, 4);
-			nv += 4;
+			Array.Copy(sourceVertices, offset, vertices, nv, 6);
+			nv += 6;
 		}
 
 		public void DrawVertexBuffer(IVertexBuffer<Vertex> buffer, int start, int length, PrimitiveType type, Sheet sheet, BlendMode blendMode)
@@ -113,11 +114,17 @@ namespace OpenRA.Graphics
 			shader.SetTexture("Palette", palette);
 		}
 
-		public void SetViewportParams(Size screen, float zoom, int2 scroll)
+		public void SetViewportParams(Size screen, float depthScale, float depthOffset, float zoom, int2 scroll)
 		{
-			shader.SetVec("Scroll", scroll.X, scroll.Y);
-			shader.SetVec("r1", zoom * 2f / screen.Width, -zoom * 2f / screen.Height);
-			shader.SetVec("r2", -1, 1);
+			shader.SetVec("Scroll", scroll.X, scroll.Y, scroll.Y);
+			shader.SetVec("r1",
+				zoom * 2f / screen.Width,
+				-zoom * 2f / screen.Height,
+				-depthScale * zoom / screen.Height);
+			shader.SetVec("r2", -1, 1, 1 - depthOffset);
+
+			// Texture index is sampled as a float, so convert to pixels then scale
+			shader.SetVec("DepthTextureScale", 128 * depthScale * zoom / screen.Height);
 		}
 
 		public void SetDepthPreviewEnabled(bool enabled)

OpenRA.Game/Graphics/TargetLineRenderable.cs

@@ -1,18 +1,17 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Graphics;
-using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {
@@ -43,16 +42,26 @@ namespace OpenRA.Graphics
 			if (!waypoints.Any())
 				return;
 
-			var first = wr.ScreenPxPosition(waypoints.First());
+			var iz = 1 / wr.Viewport.Zoom;
+			var first = wr.Screen3DPosition(waypoints.First());
 			var a = first;
-			foreach (var b in waypoints.Skip(1).Select(pos => wr.ScreenPxPosition(pos)))
+			foreach (var b in waypoints.Skip(1).Select(pos => wr.Screen3DPosition(pos)))
 			{
-				Game.Renderer.WorldLineRenderer.DrawLine(a, b, color);
-				wr.DrawTargetMarker(color, b);
+				Game.Renderer.WorldRgbaColorRenderer.DrawLine(a, b, iz, color);
+				DrawTargetMarker(wr, color, b);
 				a = b;
 			}
 
-			wr.DrawTargetMarker(color, first);
+			DrawTargetMarker(wr, color, first);
+		}
+
+		public static void DrawTargetMarker(WorldRenderer wr, Color color, float3 location)
+		{
+			var iz = 1 / wr.Viewport.Zoom;
+			var offset = new float2(iz, iz);
+			var tl = location - offset;
+			var br = location + offset;
+			Game.Renderer.WorldRgbaColorRenderer.FillRect(tl, br, color);
 		}
 
 		public void RenderDebugGeometry(WorldRenderer wr) { }

OpenRA.Game/Graphics/TerrainRenderer.cs

@@ -1,54 +1,73 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
 using System;
+using System.Collections.Generic;
 using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {
 	sealed class TerrainRenderer : IDisposable
 	{
-		readonly TerrainSpriteLayer terrain;
+		readonly Map map;
+		readonly Dictionary<string, TerrainSpriteLayer> spriteLayers = new Dictionary<string, TerrainSpriteLayer>();
 		readonly Theater theater;
-		readonly CellLayer<TerrainTile> mapTiles;
 
 		public TerrainRenderer(World world, WorldRenderer wr)
 		{
+			map = world.Map;
 			theater = wr.Theater;
-			mapTiles = world.Map.MapTiles.Value;
 
-			terrain = new TerrainSpriteLayer(world, wr, theater.Sheet, BlendMode.Alpha,
-				wr.Palette("terrain"), wr.World.Type != WorldType.Editor);
+			foreach (var template in map.Rules.TileSet.Templates)
+			{
+				var palette = template.Value.Palette ?? TileSet.TerrainPaletteInternalName;
+				spriteLayers.GetOrAdd(palette, pal =>
+					new TerrainSpriteLayer(world, wr, theater.Sheet, BlendMode.Alpha, wr.Palette(palette), world.Type != WorldType.Editor));
+			}
 
-			foreach (var cell in world.Map.AllCells)
+			foreach (var cell in map.AllCells)
 				UpdateCell(cell);
 
-			world.Map.MapTiles.Value.CellEntryChanged += UpdateCell;
-			world.Map.MapHeight.Value.CellEntryChanged += UpdateCell;
+			map.Tiles.CellEntryChanged += UpdateCell;
+			map.Height.CellEntryChanged += UpdateCell;
 		}
 
 		public void UpdateCell(CPos cell)
 		{
-			terrain.Update(cell, theater.TileSprite(mapTiles[cell]));
+			var tile = map.Tiles[cell];
+			var palette = TileSet.TerrainPaletteInternalName;
+			if (map.Rules.TileSet.Templates.ContainsKey(tile.Type))
+				palette = map.Rules.TileSet.Templates[tile.Type].Palette ?? palette;
+
+			var sprite = theater.TileSprite(tile);
+			foreach (var kv in spriteLayers)
+				kv.Value.Update(cell, palette == kv.Key ? sprite : null);
 		}
 
 		public void Draw(WorldRenderer wr, Viewport viewport)
 		{
-			terrain.Draw(viewport);
+			foreach (var kv in spriteLayers.Values)
+				kv.Draw(wr.Viewport);
+
 			foreach (var r in wr.World.WorldActor.TraitsImplementing<IRenderOverlay>())
 				r.Render(wr);
 		}
 
 		public void Dispose()
 		{
-			terrain.Dispose();
+			map.Tiles.CellEntryChanged -= UpdateCell;
+			map.Height.CellEntryChanged -= UpdateCell;
+
+			foreach (var kv in spriteLayers.Values)
+				kv.Dispose();
 		}
 	}
 }

OpenRA.Game/Graphics/TerrainSpriteLayer.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -12,8 +13,6 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {
@@ -33,7 +32,7 @@ namespace OpenRA.Graphics
 		readonly WorldRenderer worldRenderer;
 		readonly Map map;
 
-		float paletteIndex;
+		readonly PaletteReference palette;
 
 		public TerrainSpriteLayer(World world, WorldRenderer wr, Sheet sheet, BlendMode blendMode, PaletteReference palette, bool restrictToBounds)
 		{
@@ -41,40 +40,41 @@ namespace OpenRA.Graphics
 			this.restrictToBounds = restrictToBounds;
 			Sheet = sheet;
 			BlendMode = blendMode;
-			paletteIndex = palette.TextureIndex;
+			this.palette = palette;
 
 			map = world.Map;
-			rowStride = 4 * map.MapSize.X;
+			rowStride = 6 * map.MapSize.X;
 
 			vertices = new Vertex[rowStride * map.MapSize.Y];
 			vertexBuffer = Game.Renderer.Device.CreateVertexBuffer(vertices.Length);
 			emptySprite = new Sprite(sheet, Rectangle.Empty, TextureChannel.Alpha);
 
-			wr.PaletteInvalidated += () =>
+			wr.PaletteInvalidated += UpdatePaletteIndices;
+		}
+
+		void UpdatePaletteIndices()
+		{
+			// Everything in the layer uses the same palette,
+			// so we can fix the indices in one pass
+			for (var i = 0; i < vertices.Length; i++)
 			{
-				paletteIndex = palette.TextureIndex;
+				var v = vertices[i];
+				vertices[i] = new Vertex(v.X, v.Y, v.Z, v.S, v.T, v.U, v.V, palette.TextureIndex, v.C);
+			}
 
-				// Everything in the layer uses the same palette,
-				// so we can fix the indices in one pass
-				for (var i = 0; i < vertices.Length; i++)
-				{
-					var v = vertices[i];
-					vertices[i] = new Vertex(v.X, v.Y, v.Z, v.U, v.V, paletteIndex, v.C);
-				}
-
-				for (var row = 0; row < map.MapSize.Y; row++)
-					dirtyRows.Add(row);
-			};
+			for (var row = 0; row < map.MapSize.Y; row++)
+				dirtyRows.Add(row);
 		}
 
 		public void Update(CPos cell, Sprite sprite)
 		{
-			var pos = sprite == null ? float2.Zero :
-				worldRenderer.ScreenPosition(map.CenterOfCell(cell)) + sprite.Offset - 0.5f * sprite.Size;
-			Update(cell.ToMPos(map.Grid.Type), sprite, pos);
+			var xyz = sprite == null ? float3.Zero :
+				worldRenderer.Screen3DPosition(map.CenterOfCell(cell)) + sprite.Offset - 0.5f * sprite.Size;
+
+			Update(cell.ToMPos(map.Grid.Type), sprite, xyz);
 		}
 
-		public void Update(MPos uv, Sprite sprite, float2 pos)
+		public void Update(MPos uv, Sprite sprite, float3 pos)
 		{
 			if (sprite != null)
 			{
@@ -87,8 +87,8 @@ namespace OpenRA.Graphics
 			else
 				sprite = emptySprite;
 
-			var offset = rowStride * uv.V + 4 * uv.U;
-			Util.FastCreateQuad(vertices, pos, sprite, paletteIndex, offset, sprite.Size);
+			var offset = rowStride * uv.V + 6 * uv.U;
+			Util.FastCreateQuad(vertices, pos, sprite, palette.TextureIndex, offset, sprite.Size);
 
 			dirtyRows.Add(uv.V);
 		}
@@ -123,13 +123,14 @@ namespace OpenRA.Graphics
 
 			Game.Renderer.WorldSpriteRenderer.DrawVertexBuffer(
 				vertexBuffer, rowStride * firstRow, rowStride * (lastRow - firstRow),
-				PrimitiveType.QuadList, Sheet, BlendMode);
+				PrimitiveType.TriangleList, Sheet, BlendMode);
 
 			Game.Renderer.Flush();
 		}
 
 		public void Dispose()
 		{
+			worldRenderer.PaletteInvalidated -= UpdatePaletteIndices;
 			vertexBuffer.Dispose();
 		}
 	}

OpenRA.Game/Graphics/Theater.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -12,7 +13,6 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRA.FileSystem;
 using OpenRA.Support;
 
 namespace OpenRA.Graphics
@@ -43,7 +43,6 @@ namespace OpenRA.Graphics
 		{
 			this.tileset = tileset;
 			var allocated = false;
-			var type = tileset.EnableDepth ? SheetType.DualIndexed : SheetType.Indexed;
 
 			Func<Sheet> allocate = () =>
 			{
@@ -51,13 +50,13 @@ namespace OpenRA.Graphics
 					throw new SheetOverflowException("Terrain sheet overflow. Try increasing the tileset SheetSize parameter.");
 				allocated = true;
 
-				return new Sheet(type, new Size(tileset.SheetSize, tileset.SheetSize));
+				return new Sheet(SheetType.Indexed, new Size(tileset.SheetSize, tileset.SheetSize));
 			};
 
-			sheetBuilder = new SheetBuilder(type, allocate);
+			sheetBuilder = new SheetBuilder(SheetType.Indexed, allocate);
 			random = new MersenneTwister();
 
-			var frameCache = new FrameCache(Game.ModData.SpriteLoaders);
+			var frameCache = new FrameCache(Game.ModData.DefaultFileSystem, Game.ModData.SpriteLoaders);
 			foreach (var t in tileset.Templates)
 			{
 				var variants = new List<Sprite[]>();
@@ -70,11 +69,24 @@ namespace OpenRA.Graphics
 					variants.Add(indices.Select(j =>
 					{
 						var f = allFrames[j];
-						var s = sheetBuilder.Allocate(f.Size, f.Offset);
-						Util.FastCopyIntoChannel(s, 0, f.Data);
+						var tile = t.Value.Contains(j) ? t.Value[j] : null;
+
+						// The internal z axis is inverted from expectation (negative is closer)
+						var zOffset = tile != null ? -tile.ZOffset : 0;
+						var zRamp = tile != null ? tile.ZRamp : 1f;
+						var offset = new float3(f.Offset, zOffset);
+						var s = sheetBuilder.Allocate(f.Size, zRamp, offset);
+						Util.FastCopyIntoChannel(s, f.Data);
 
 						if (tileset.EnableDepth)
-							Util.FastCopyIntoChannel(s, 1, allFrames[j + frameCount].Data);
+						{
+							var ss = sheetBuilder.Allocate(f.Size, zRamp, offset);
+							Util.FastCopyIntoChannel(ss, allFrames[j + frameCount].Data);
+
+							// s and ss are guaranteed to use the same sheet
+							// because of the custom terrain sheet allocation
+							s = new SpriteWithSecondaryData(s, ss.Bounds, ss.Channel);
+						}
 
 						return s;
 					}).ToArray());
@@ -84,7 +96,7 @@ namespace OpenRA.Graphics
 
 				// Ignore the offsets baked into R8 sprites
 				if (tileset.IgnoreTileSpriteOffsets)
-					allSprites = allSprites.Select(s => new Sprite(s.Sheet, s.Bounds, float2.Zero, s.Channel, s.BlendMode));
+					allSprites = allSprites.Select(s => new Sprite(s.Sheet, s.Bounds, s.ZRamp, new float3(float2.Zero, s.Offset.Z), s.Channel, s.BlendMode));
 
 				templates.Add(t.Value.Id, new TheaterTemplate(allSprites.ToArray(), variants.First().Count(), t.Value.Images.Length));
 			}

OpenRA.Game/Graphics/UISpriteRenderable.cs

@@ -1,30 +1,31 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
 
 namespace OpenRA.Graphics
 {
 	public struct UISpriteRenderable : IRenderable, IFinalizedRenderable
 	{
 		readonly Sprite sprite;
+		readonly WPos effectiveWorldPos;
 		readonly int2 screenPos;
 		readonly int zOffset;
 		readonly PaletteReference palette;
 		readonly float scale;
 
-		public UISpriteRenderable(Sprite sprite, int2 screenPos, int zOffset, PaletteReference palette, float scale)
+		public UISpriteRenderable(Sprite sprite, WPos effectiveWorldPos, int2 screenPos, int zOffset, PaletteReference palette, float scale)
 		{
 			this.sprite = sprite;
+			this.effectiveWorldPos = effectiveWorldPos;
 			this.screenPos = screenPos;
 			this.zOffset = zOffset;
 			this.palette = palette;
@@ -32,14 +33,14 @@ namespace OpenRA.Graphics
 		}
 
 		// Does not exist in the world, so a world positions don't make sense
-		public WPos Pos { get { return WPos.Zero; } }
+		public WPos Pos { get { return effectiveWorldPos; } }
 		public WVec Offset { get { return WVec.Zero; } }
 		public bool IsDecoration { get { return true; } }
 
 		public PaletteReference Palette { get { return palette; } }
 		public int ZOffset { get { return zOffset; } }
 
-		public IRenderable WithPalette(PaletteReference newPalette) { return new UISpriteRenderable(sprite, screenPos, zOffset, newPalette, scale); }
+		public IRenderable WithPalette(PaletteReference newPalette) { return new UISpriteRenderable(sprite, effectiveWorldPos, screenPos, zOffset, newPalette, scale); }
 		public IRenderable WithZOffset(int newOffset) { return this; }
 		public IRenderable OffsetBy(WVec vec) { return this; }
 		public IRenderable AsDecoration() { return this; }
@@ -47,13 +48,13 @@ namespace OpenRA.Graphics
 		public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }
 		public void Render(WorldRenderer wr)
 		{
-			Game.Renderer.SpriteRenderer.DrawSprite(sprite, screenPos, palette, sprite.Size * scale);
+			Game.Renderer.SpriteRenderer.DrawSprite(sprite, screenPos, palette, scale * sprite.Size);
 		}
 
 		public void RenderDebugGeometry(WorldRenderer wr)
 		{
-			var offset = screenPos + sprite.Offset;
-			Game.Renderer.LineRenderer.DrawRect(offset, offset + sprite.Size, Color.Red);
+			var offset = screenPos + sprite.Offset.XY;
+			Game.Renderer.RgbaColorRenderer.DrawRect(offset, offset + sprite.Size.XY, 1, Color.Red);
 		}
 
 		public Rectangle ScreenBounds(WorldRenderer wr)

OpenRA.Game/Graphics/Util.cs

@@ -1,17 +1,17 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
-using System.Runtime.InteropServices;
 
 namespace OpenRA.Graphics
 {
@@ -21,33 +21,46 @@ namespace OpenRA.Graphics
 		static readonly int[] ChannelMasks = { 2, 1, 0, 3 };
 		static readonly float[] ChannelSelect = { 0.2f, 0.4f, 0.6f, 0.8f };
 
-		public static void FastCreateQuad(Vertex[] vertices, float2 o, Sprite r, float paletteTextureIndex, int nv, float2 size)
+		public static void FastCreateQuad(Vertex[] vertices, float3 o, Sprite r, float paletteTextureIndex, int nv, float3 size)
 		{
-			var b = new float2(o.X + size.X, o.Y);
-			var c = new float2(o.X + size.X, o.Y + size.Y);
-			var d = new float2(o.X, o.Y + size.Y);
+			var b = new float3(o.X + size.X, o.Y, o.Z);
+			var c = new float3(o.X + size.X, o.Y + size.Y, o.Z + size.Z);
+			var d = new float3(o.X, o.Y + size.Y, o.Z + size.Z);
 			FastCreateQuad(vertices, o, b, c, d, r, paletteTextureIndex, nv);
 		}
 
-		public static void FastCreateQuad(Vertex[] vertices, float2 a, float2 b, float2 c, float2 d, Sprite r, float paletteTextureIndex, int nv)
+		public static void FastCreateQuad(Vertex[] vertices, float3 a, float3 b, float3 c, float3 d, Sprite r, float paletteTextureIndex, int nv)
 		{
+			float sl = 0;
+			float st = 0;
+			float sr = 0;
+			float sb = 0;
 			var attribC = ChannelSelect[(int)r.Channel];
-			if (r.Sheet.Type == SheetType.DualIndexed)
-				attribC *= -1;
 
-			vertices[nv] = new Vertex(a, r.Left, r.Top, paletteTextureIndex, attribC);
-			vertices[nv + 1] = new Vertex(b, r.Right, r.Top, paletteTextureIndex, attribC);
-			vertices[nv + 2] = new Vertex(c, r.Right, r.Bottom, paletteTextureIndex, attribC);
-			vertices[nv + 3] = new Vertex(d, r.Left, r.Bottom, paletteTextureIndex, attribC);
+			var ss = r as SpriteWithSecondaryData;
+			if (ss != null)
+			{
+				sl = ss.SecondaryLeft;
+				st = ss.SecondaryTop;
+				sr = ss.SecondaryRight;
+				sb = ss.SecondaryBottom;
+				attribC = -(attribC + ChannelSelect[(int)ss.SecondaryChannel] / 10);
+			}
+
+			vertices[nv] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, attribC);
+			vertices[nv + 1] = new Vertex(b, r.Right, r.Top, sr, st, paletteTextureIndex, attribC);
+			vertices[nv + 2] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, attribC);
+			vertices[nv + 3] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, attribC);
+			vertices[nv + 4] = new Vertex(d, r.Left, r.Bottom, sl, sb, paletteTextureIndex, attribC);
+			vertices[nv + 5] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, attribC);
 		}
 
-		public static void FastCopyIntoChannel(Sprite dest, byte[] src) { FastCopyIntoChannel(dest, 0, src); }
-		public static void FastCopyIntoChannel(Sprite dest, int channelOffset, byte[] src)
+		public static void FastCopyIntoChannel(Sprite dest, byte[] src)
 		{
 			var data = dest.Sheet.GetData();
 			var srcStride = dest.Bounds.Width;
 			var destStride = dest.Sheet.Size.Width * 4;
-			var destOffset = destStride * dest.Bounds.Top + dest.Bounds.Left * 4 + ChannelMasks[(int)dest.Channel + channelOffset];
+			var destOffset = destStride * dest.Bounds.Top + dest.Bounds.Left * 4 + ChannelMasks[(int)dest.Channel];
 			var destSkip = destStride - 4 * srcStride;
 			var height = dest.Bounds.Height;
 

OpenRA.Game/Graphics/Vertex.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -15,17 +16,15 @@ namespace OpenRA.Graphics
 	[StructLayout(LayoutKind.Sequential)]
 	public struct Vertex
 	{
-		public readonly float X, Y, Z, U, V, P, C;
+		public readonly float X, Y, Z, S, T, U, V, P, C;
 
-		public Vertex(float2 xy, float u, float v, float p, float c)
-			: this(xy.X, xy.Y, 0, u, v, p, c) { }
+		public Vertex(float3 xyz, float s, float t, float u, float v, float p, float c)
+			: this(xyz.X, xyz.Y, xyz.Z, s, t, u, v, p, c) { }
 
-		public Vertex(float[] xyz, float u, float v, float p, float c)
-			: this(xyz[0], xyz[1], xyz[2], u, v, p, c) { }
-
-		public Vertex(float x, float y, float z, float u, float v, float p, float c)
+		public Vertex(float x, float y, float z, float s, float t, float u, float v, float p, float c)
 		{
 			X = x; Y = y; Z = z;
+			S = s; T = t;
 			U = u; V = v;
 			P = p; C = c;
 		}

OpenRA.Game/Graphics/Viewport.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -22,6 +23,7 @@ namespace OpenRA.Graphics
 	{
 		public static bool Includes(this ScrollDirection d, ScrollDirection s)
 		{
+			// PERF: Enum.HasFlag is slower and requires allocations.
 			return (d & s) == s;
 		}
 
@@ -52,8 +54,15 @@ namespace OpenRA.Graphics
 
 		ProjectedCellRegion allCells;
 		bool allCellsDirty = true;
+		readonly float[] availableZoomSteps = new[] { 2f, 1f, 0.5f, 0.25f };
 
 		float zoom = 1f;
+
+		public float[] AvailableZoomSteps
+		{
+			get { return availableZoomSteps; }
+		}
+
 		public float Zoom
 		{
 			get
@@ -63,16 +72,34 @@ namespace OpenRA.Graphics
 
 			set
 			{
-				zoom = value;
+				var newValue = ClosestTo(AvailableZoomSteps, value);
+				zoom = newValue;
 				viewportSize = (1f / zoom * new float2(Game.Renderer.Resolution)).ToInt2();
 				cellsDirty = true;
 				allCellsDirty = true;
 			}
 		}
 
-		public static int TicksSinceLastMove = 0;
+		public static long TicksSinceLastMove = 0;
 		public static int2 LastMousePos;
 
+		float ClosestTo(float[] collection, float target)
+		{
+			var closestValue = collection.First();
+			var subtractResult = Math.Abs(closestValue - target);
+
+			foreach (var element in collection)
+			{
+				if (Math.Abs(element - target) < subtractResult)
+				{
+					subtractResult = Math.Abs(element - target);
+					closestValue = element;
+				}
+			}
+
+			return closestValue;
+		}
+
 		public ScrollDirection GetBlockedDirections()
 		{
 			var ret = ScrollDirection.None;
@@ -122,7 +149,7 @@ namespace OpenRA.Graphics
 			var world = worldRenderer.Viewport.ViewToWorldPx(view);
 			var map = worldRenderer.World.Map;
 			var candidates = CandidateMouseoverCells(world).ToList();
-			var tileSet = worldRenderer.World.TileSet;
+			var tileSet = worldRenderer.World.Map.Rules.TileSet;
 
 			foreach (var uv in candidates)
 			{
@@ -134,13 +161,12 @@ namespace OpenRA.Graphics
 					var ramp = 0;
 					if (map.Contains(uv))
 					{
-						var tile = map.MapTiles.Value[uv];
-						var ti = tileSet.GetTileInfo(tile);
+						var ti = tileSet.GetTileInfo(map.Tiles[uv]);
 						if (ti != null)
 							ramp = ti.RampType;
 					}
 
-					var corners = map.CellCorners[ramp];
+					var corners = map.Grid.CellCorners[ramp];
 					var pos = map.CenterOfCell(uv.ToCPos(map));
 					var screen = corners.Select(c => worldRenderer.ScreenPxPosition(pos + c)).ToArray();
 

OpenRA.Game/Graphics/Voxel.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/Graphics/VoxelAnimation.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 

OpenRA.Game/Graphics/VoxelLoader.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -38,6 +39,7 @@ namespace OpenRA.Graphics
 
 		readonly List<Vertex[]> vertices = new List<Vertex[]>();
 		readonly Cache<Pair<string, string>, Voxel> voxels;
+		readonly IReadOnlyFileSystem fileSystem;
 		IVertexBuffer<Vertex> vertexBuffer;
 		int totalVertexCount;
 		int cachedVertexCount;
@@ -52,14 +54,15 @@ namespace OpenRA.Graphics
 				if (allocated)
 					throw new SheetOverflowException("");
 				allocated = true;
-				return SheetBuilder.AllocateSheet(SheetType.DualIndexed, Game.Settings.Graphics.SheetSize);
+				return SheetBuilder.AllocateSheet(SheetType.Indexed, Game.Settings.Graphics.SheetSize);
 			};
 
-			return new SheetBuilder(SheetType.DualIndexed, allocate);
+			return new SheetBuilder(SheetType.Indexed, allocate);
 		}
 
-		public VoxelLoader()
+		public VoxelLoader(IReadOnlyFileSystem fileSystem)
 		{
+			this.fileSystem = fileSystem;
 			voxels = new Cache<Pair<string, string>, Voxel>(LoadFile);
 			vertices = new List<Vertex[]>();
 			totalVertexCount = 0;
@@ -68,13 +71,14 @@ namespace OpenRA.Graphics
 			sheetBuilder = CreateSheetBuilder();
 		}
 
-		Vertex[] GenerateSlicePlane(int su, int sv, Func<int, int, VxlElement> first, Func<int, int, VxlElement> second, Func<int, int, float[]> coord)
+		Vertex[] GenerateSlicePlane(int su, int sv, Func<int, int, VxlElement> first, Func<int, int, VxlElement> second, Func<int, int, float3> coord)
 		{
 			var colors = new byte[su * sv];
 			var normals = new byte[su * sv];
 
 			var c = 0;
 			for (var v = 0; v < sv; v++)
+			{
 				for (var u = 0; u < su; u++)
 				{
 					var voxel = first(u, v) ?? second(u, v);
@@ -82,20 +86,28 @@ namespace OpenRA.Graphics
 					normals[c] = voxel == null ? (byte)0 : voxel.Normal;
 					c++;
 				}
+			}
 
-			var s = sheetBuilder.Allocate(new Size(su, sv));
-			Util.FastCopyIntoChannel(s, 0, colors);
-			Util.FastCopyIntoChannel(s, 1, normals);
+			var size = new Size(su, sv);
+			var s = sheetBuilder.Allocate(size);
+			var t = sheetBuilder.Allocate(size);
+			Util.FastCopyIntoChannel(s, colors);
+			Util.FastCopyIntoChannel(t, normals);
+
+			// s and t are guaranteed to use the same sheet because
+			// of the custom voxel sheet allocation implementation
 			s.Sheet.CommitBufferedData();
 
 			var channelP = ChannelSelect[(int)s.Channel];
-			var channelC = ChannelSelect[(int)s.Channel + 1];
-			return new Vertex[4]
+			var channelC = ChannelSelect[(int)t.Channel];
+			return new Vertex[6]
 			{
-				new Vertex(coord(0, 0), s.Left, s.Top, channelP, channelC),
-				new Vertex(coord(su, 0), s.Right, s.Top, channelP, channelC),
-				new Vertex(coord(su, sv), s.Right, s.Bottom, channelP, channelC),
-				new Vertex(coord(0, sv), s.Left, s.Bottom, channelP, channelC)
+				new Vertex(coord(0, 0), s.Left, s.Top, t.Left, t.Top, channelP, channelC),
+				new Vertex(coord(su, 0), s.Right, s.Top, t.Right, t.Top, channelP, channelC),
+				new Vertex(coord(su, sv), s.Right, s.Bottom, t.Right, t.Bottom, channelP, channelC),
+				new Vertex(coord(su, sv), s.Right, s.Bottom, t.Right, t.Bottom, channelP, channelC),
+				new Vertex(coord(0, sv), s.Left, s.Bottom, t.Left, t.Bottom, channelP, channelC),
+				new Vertex(coord(0, 0), s.Left, s.Top, t.Left, t.Top, channelP, channelC)
 			};
 		}
 
@@ -153,21 +165,21 @@ namespace OpenRA.Graphics
 					yield return GenerateSlicePlane(l.Size[1], l.Size[2],
 						(u, v) => get(x, u, v),
 						(u, v) => get(x - 1, u, v),
-						(u, v) => new float[] { x, u, v });
+						(u, v) => new float3(x, u, v));
 
 			for (var y = 0; y <= l.Size[1]; y++)
 				if (yPlanes[y])
 					yield return GenerateSlicePlane(l.Size[0], l.Size[2],
 						(u, v) => get(u, y, v),
 						(u, v) => get(u, y - 1, v),
-						(u, v) => new float[] { u, y, v });
+						(u, v) => new float3(u, y, v));
 
 			for (var z = 0; z <= l.Size[2]; z++)
 				if (zPlanes[z])
 					yield return GenerateSlicePlane(l.Size[0], l.Size[1],
 						(u, v) => get(u, v, z),
 						(u, v) => get(u, v, z - 1),
-						(u, v) => new float[] { u, v, z });
+						(u, v) => new float3(u, v, z));
 		}
 
 		public VoxelRenderData GenerateRenderData(VxlLimb l)
@@ -217,9 +229,9 @@ namespace OpenRA.Graphics
 		{
 			VxlReader vxl;
 			HvaReader hva;
-			using (var s = GlobalFileSystem.Open(files.First + ".vxl"))
+			using (var s = fileSystem.Open(files.First + ".vxl"))
 				vxl = new VxlReader(s);
-			using (var s = GlobalFileSystem.Open(files.Second + ".hva"))
+			using (var s = fileSystem.Open(files.Second + ".hva"))
 				hva = new HvaReader(s, files.Second + ".hva");
 			return new Voxel(this, vxl, hva);
 		}

OpenRA.Game/Graphics/VoxelProvider.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -12,6 +13,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using OpenRA.FileSystem;
 
 namespace OpenRA.Graphics
 {
@@ -19,21 +21,16 @@ namespace OpenRA.Graphics
 	{
 		static Dictionary<string, Dictionary<string, Voxel>> units;
 
-		public static void Initialize(string[] voxelFiles, List<MiniYamlNode> voxelNodes)
+		public static void Initialize(VoxelLoader loader, IReadOnlyFileSystem fileSystem, List<MiniYamlNode> sequences)
 		{
 			units = new Dictionary<string, Dictionary<string, Voxel>>();
-
-			var sequences = voxelFiles
-				.Select(s => MiniYaml.FromFile(s))
-				.Aggregate(voxelNodes, MiniYaml.MergeLiberal);
-
 			foreach (var s in sequences)
-				LoadVoxelsForUnit(s.Key, s.Value);
+				LoadVoxelsForUnit(loader, s.Key, s.Value);
 
-			Game.ModData.VoxelLoader.RefreshBuffer();
+			loader.RefreshBuffer();
 		}
 
-		static Voxel LoadVoxel(string unit, MiniYaml info)
+		static Voxel LoadVoxel(VoxelLoader voxelLoader, string unit, MiniYaml info)
 		{
 			var vxl = unit;
 			var hva = unit;
@@ -47,15 +44,15 @@ namespace OpenRA.Graphics
 					hva = fields[1].Trim();
 			}
 
-			return Game.ModData.VoxelLoader.Load(vxl, hva);
+			return voxelLoader.Load(vxl, hva);
 		}
 
-		static void LoadVoxelsForUnit(string unit, MiniYaml sequences)
+		static void LoadVoxelsForUnit(VoxelLoader loader, string unit, MiniYaml sequences)
 		{
 			Game.ModData.LoadScreen.Display();
 			try
 			{
-				var seq = sequences.ToDictionary(my => LoadVoxel(unit, my));
+				var seq = sequences.ToDictionary(my => LoadVoxel(loader, unit, my));
 				units.Add(unit, seq);
 			}
 			catch (FileNotFoundException) { } // Do nothing; we can crash later if we actually wanted art

OpenRA.Game/Graphics/VoxelRenderer.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -21,11 +22,11 @@ namespace OpenRA.Graphics
 		public readonly Sprite Sprite;
 		public readonly Sprite ShadowSprite;
 		public readonly float ShadowDirection;
-		public readonly float2[] ProjectedShadowBounds;
+		public readonly float3[] ProjectedShadowBounds;
 
-		public VoxelRenderProxy(Sprite sprite, Sprite shadowSprite, float2[] projectedShadowBounds, float shadowDirection)
+		public VoxelRenderProxy(Sprite sprite, Sprite shadowSprite, float3[] projectedShadowBounds, float shadowDirection)
 		{
-			this.Sprite = sprite;
+			Sprite = sprite;
 			ShadowSprite = shadowSprite;
 			ProjectedShadowBounds = projectedShadowBounds;
 			ShadowDirection = shadowDirection;
@@ -93,6 +94,8 @@ namespace OpenRA.Graphics
 			var invShadowTransform = Util.MatrixInverse(shadowTransform);
 			var cameraTransform = Util.MakeFloatMatrix(camera.AsMatrix());
 			var invCameraTransform = Util.MatrixInverse(cameraTransform);
+			if (invCameraTransform == null)
+				throw new InvalidOperationException("Failed to invert the cameraTransform matrix during RenderAsync.");
 
 			// Sprite rectangle
 			var tl = new float2(float.MaxValue, float.MaxValue);
@@ -142,7 +145,7 @@ namespace OpenRA.Graphics
 
 			var shadowScreenTransform = Util.MatrixMultiply(cameraTransform, invShadowTransform);
 			var shadowGroundNormal = Util.MatrixVectorMultiply(shadowTransform, groundNormal);
-			var screenCorners = new float2[4];
+			var screenCorners = new float3[4];
 			for (var j = 0; j < 4; j++)
 			{
 				// Project to ground plane
@@ -151,17 +154,17 @@ namespace OpenRA.Graphics
 
 				// Rotate to camera-space
 				corners[j] = Util.MatrixVectorMultiply(shadowScreenTransform, corners[j]);
-				screenCorners[j] = new float2(corners[j][0], corners[j][1]);
+				screenCorners[j] = new float3(corners[j][0], corners[j][1], 0);
 			}
 
-			// Shadows are rendered at twice the resolution to reduce artefacts
+			// Shadows are rendered at twice the resolution to reduce artifacts
 			Size spriteSize, shadowSpriteSize;
 			int2 spriteOffset, shadowSpriteOffset;
 			CalculateSpriteGeometry(tl, br, 1, out spriteSize, out spriteOffset);
 			CalculateSpriteGeometry(stl, sbr, 2, out shadowSpriteSize, out shadowSpriteOffset);
 
-			var sprite = sheetBuilder.Allocate(spriteSize, spriteOffset);
-			var shadowSprite = sheetBuilder.Allocate(shadowSpriteSize, shadowSpriteOffset);
+			var sprite = sheetBuilder.Allocate(spriteSize, 0, spriteOffset);
+			var shadowSprite = sheetBuilder.Allocate(shadowSpriteSize, 0, shadowSpriteOffset);
 			var sb = sprite.Bounds;
 			var ssb = shadowSprite.Bounds;
 			var spriteCenter = new float2(sb.Left + sb.Width / 2, sb.Top + sb.Height / 2);
@@ -198,9 +201,12 @@ namespace OpenRA.Graphics
 					{
 						var rd = v.Voxel.RenderData(i);
 						var t = v.Voxel.TransformationMatrix(i, frame);
+						var it = Util.MatrixInverse(t);
+						if (it == null)
+							throw new InvalidOperationException("Failed to invert the transformed matrix of frame {0} during RenderAsync.".F(i));
 
 						// Transform light vector from shadow -> world -> limb coords
-						var lightDirection = ExtractRotationVector(Util.MatrixMultiply(Util.MatrixInverse(t), lightTransform));
+						var lightDirection = ExtractRotationVector(Util.MatrixMultiply(it, lightTransform));
 
 						Render(rd, Util.MatrixMultiply(transform, t), lightDirection,
 							lightAmbientColor, lightDiffuseColor, color.TextureMidIndex, normals.TextureMidIndex);
@@ -263,7 +269,7 @@ namespace OpenRA.Graphics
 			shader.SetVec("AmbientLight", ambientLight, 3);
 			shader.SetVec("DiffuseLight", diffuseLight, 3);
 
-			shader.Render(() => renderer.DrawBatch(Game.ModData.VoxelLoader.VertexBuffer, renderData.Start, renderData.Count, PrimitiveType.QuadList));
+			shader.Render(() => renderer.DrawBatch(Game.ModData.VoxelLoader.VertexBuffer, renderData.Start, renderData.Count, PrimitiveType.TriangleList));
 		}
 
 		public void BeginFrame()
@@ -331,7 +337,7 @@ namespace OpenRA.Graphics
 
 			var size = new Size(renderer.SheetSize, renderer.SheetSize);
 			var framebuffer = renderer.Device.CreateFrameBuffer(size);
-			var sheet = new Sheet(SheetType.DualIndexed, framebuffer.Texture);
+			var sheet = new Sheet(SheetType.BGRA, framebuffer.Texture);
 			mappedBuffers.Add(sheet, framebuffer);
 
 			return sheet;

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -1,10 +1,11 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
  */
 #endregion
 
@@ -12,6 +13,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Effects;
 using OpenRA.Traits;
 
 namespace OpenRA.Graphics
@@ -21,10 +23,6 @@ namespace OpenRA.Graphics
 		public static readonly Func<IRenderable, int> RenderableScreenZPositionComparisonKey =
 			r => ZPosition(r.Pos, r.ZOffset);
 
-		const int RangeCircleSegments = 32;
-		static readonly int[][] RangeCircleStartRotations = Exts.MakeArray(RangeCircleSegments, i => WRot.FromFacing(8 * i).AsMatrix());
-		static readonly int[][] RangeCircleEndRotations = Exts.MakeArray(RangeCircleSegments, i => WRot.FromFacing(8 * i + 6).AsMatrix());
-
 		public readonly Size TileSize;
 		public readonly World World;
 		public readonly Theater Theater;
@@ -37,8 +35,9 @@ namespace OpenRA.Graphics
 		readonly TerrainRenderer terrainRenderer;
 		readonly Lazy<DeveloperMode> devTrait;
 		readonly Func<string, PaletteReference> createPaletteReference;
+		readonly bool enableDepthBuffer;
 
-		internal WorldRenderer(World world)
+		internal WorldRenderer(ModData modData, World world)
 		{
 			World = world;
 			TileSize = World.Map.Grid.TileSize;
@@ -46,6 +45,9 @@ namespace OpenRA.Graphics
 
 			createPaletteReference = CreatePaletteReference;
 
+			var mapGrid = modData.Manifest.Get<MapGrid>();
+			enableDepthBuffer = mapGrid.EnableDepthBuffer;
+
 			foreach (var pal in world.TraitDict.ActorsWithTrait<ILoadsPalettes>())
 				pal.Trait.LoadPalettes(this);
 
@@ -54,7 +56,7 @@ namespace OpenRA.Graphics
 
 			palette.Initialize();
 
-			Theater = new Theater(world.TileSet);
+			Theater = new Theater(world.Map.Rules.TileSet);
 			terrainRenderer = new TerrainRenderer(world, this);
 
 			devTrait = Exts.Lazy(() => world.LocalPlayer != null ? world.LocalPlayer.PlayerActor.Trait<DeveloperMode>() : null);
@@ -98,10 +100,7 @@ namespace OpenRA.Graphics
 
 		List<IFinalizedRenderable> GenerateRenderables()
 		{
-			var actors = World.ScreenMap.ActorsInBox(Viewport.TopLeft, Viewport.BottomRight)
-				.Append(World.WorldActor);
-
-			// Include player actor for the rendered player
+			var actors = World.ScreenMap.ActorsInBox(Viewport.TopLeft, Viewport.BottomRight).Append(World.WorldActor);
 			if (World.RenderPlayer != null)
 				actors = actors.Append(World.RenderPlayer.PlayerActor);
 
@@ -109,19 +108,11 @@ namespace OpenRA.Graphics
 			if (World.OrderGenerator != null)
 				worldRenderables = worldRenderables.Concat(World.OrderGenerator.Render(this, World));
 
+			worldRenderables = worldRenderables.Concat(World.Effects.SelectMany(e => e.Render(this)));
 			worldRenderables = worldRenderables.OrderBy(RenderableScreenZPositionComparisonKey);
 
-			// Effects are drawn on top of all actors
-			// HACK: Effects aren't interleaved with actors.
-			var effectRenderables = World.Effects
-				.SelectMany(e => e.Render(this));
-
-			if (World.OrderGenerator != null)
-				effectRenderables = effectRenderables.Concat(World.OrderGenerator.RenderAfterWorld(this, World));
-
 			Game.Renderer.WorldVoxelRenderer.BeginFrame();
-			var renderables = worldRenderables.Concat(effectRenderables)
-				.Select(r => r.PrepareRender(this)).ToList();
+			var renderables = worldRenderables.Select(r => r.PrepareRender(this)).ToList();
 			Game.Renderer.WorldVoxelRenderer.EndFrame();
 
 			return renderables;
@@ -133,7 +124,11 @@ namespace OpenRA.Graphics
 				return;
 
 			if (devTrait.Value != null)
+			{
 				Game.Renderer.WorldSpriteRenderer.SetDepthPreviewEnabled(devTrait.Value.ShowDepthPreview);
+				Game.Renderer.WorldRgbaSpriteRenderer.SetDepthPreviewEnabled(devTrait.Value.ShowDepthPreview);
+				Game.Renderer.WorldRgbaColorRenderer.SetDepthPreviewEnabled(devTrait.Value.ShowDepthPreview);
+			}
 
 			RefreshPalette();
 
@@ -144,33 +139,56 @@ namespace OpenRA.Graphics
 			var bounds = Viewport.GetScissorBounds(World.Type != WorldType.Editor);
 			Game.Renderer.EnableScissor(bounds);
 
+			if (enableDepthBuffer)
+				Game.Renderer.Device.EnableDepthBuffer();
+
 			terrainRenderer.Draw(this, Viewport);
 			Game.Renderer.Flush();
 
 			for (var i = 0; i < renderables.Count; i++)
 				renderables[i].Render(this);
 
-			foreach (var a in World.ActorsWithTrait<IPostRender>())
+			if (enableDepthBuffer)
+				Game.Renderer.ClearDepthBuffer();
+
+			foreach (var a in World.ActorsWithTrait<IRenderAboveWorld>())
 				if (a.Actor.IsInWorld && !a.Actor.Disposed)
-					a.Trait.RenderAfterWorld(this, a.Actor);
+					a.Trait.RenderAboveWorld(a.Actor, this);
 
 			var renderShroud = World.RenderPlayer != null ? World.RenderPlayer.Shroud : null;
 
-			foreach (var a in World.ActorsWithTrait<IRenderShroud>())
-				a.Trait.RenderShroud(this, renderShroud);
+			if (enableDepthBuffer)
+				Game.Renderer.ClearDepthBuffer();
 
-			if (devTrait.Value != null && devTrait.Value.ShowDebugGeometry)
-				for (var i = 0; i < renderables.Count; i++)
-					renderables[i].RenderDebugGeometry(this);
+			foreach (var a in World.ActorsWithTrait<IRenderShroud>())
+				a.Trait.RenderShroud(renderShroud, this);
+
+			if (enableDepthBuffer)
+				Game.Renderer.Device.DisableDepthBuffer();
 
 			Game.Renderer.DisableScissor();
 
-			var overlayRenderables = World.Selection.Actors.Where(a => !a.Disposed)
-				.SelectMany(a => a.TraitsImplementing<IPostRenderSelection>())
-				.SelectMany(t => t.RenderAfterWorld(this));
+			var aboveShroud = World.ActorsWithTrait<IRenderAboveShroud>().Where(a => a.Actor.IsInWorld && !a.Actor.Disposed)
+				.SelectMany(a => a.Trait.RenderAboveShroud(a.Actor, this));
+
+			var aboveShroudSelected = World.Selection.Actors.Where(a => !a.Disposed)
+				.SelectMany(a => a.TraitsImplementing<IRenderAboveShroudWhenSelected>()
+					.SelectMany(t => t.RenderAboveShroud(a, this)));
+
+			var aboveShroudEffects = World.Effects.Select(e => e as IEffectAboveShroud)
+				.Where(e => e != null)
+				.SelectMany(e => e.RenderAboveShroud(this));
+
+			var aboveShroudOrderGenerator = SpriteRenderable.None;
+			if (World.OrderGenerator != null)
+				aboveShroudOrderGenerator = World.OrderGenerator.RenderAboveShroud(this, World);
 
 			Game.Renderer.WorldVoxelRenderer.BeginFrame();
-			var finalOverlayRenderables = overlayRenderables.Select(r => r.PrepareRender(this));
+			var finalOverlayRenderables = aboveShroud
+				.Concat(aboveShroudSelected)
+				.Concat(aboveShroudEffects)
+				.Concat(aboveShroudOrderGenerator)
+				.Select(r => r.PrepareRender(this));
 			Game.Renderer.WorldVoxelRenderer.EndFrame();
 
 			// HACK: Keep old grouping behaviour
@@ -179,54 +197,18 @@ namespace OpenRA.Graphics
 					r.Render(this);
 
 			if (devTrait.Value != null && devTrait.Value.ShowDebugGeometry)
+			{
+				for (var i = 0; i < renderables.Count; i++)
+					renderables[i].RenderDebugGeometry(this);
+
 				foreach (var g in finalOverlayRenderables.GroupBy(prs => prs.GetType()))
 					foreach (var r in g)
 						r.RenderDebugGeometry(this);
-
-			if (World.Type == WorldType.Regular && Game.Settings.Game.AlwaysShowStatusBars)
-			{
-				foreach (var g in World.Actors.Where(a => !a.Disposed
-					&& a.Info.HasTraitInfo<SelectableInfo>()
-					&& !World.FogObscures(a)
-					&& !World.Selection.Actors.Contains(a)))
-
-					DrawRollover(g);
 			}
 
 			Game.Renderer.Flush();
 		}
 
-		public void DrawRollover(Actor unit)
-		{
-			if (unit.Info.HasTraitInfo<SelectableInfo>())
-				new SelectionBarsRenderable(unit).Render(this);
-		}
-
-		public void DrawRangeCircle(WPos pos, WDist range, Color c)
-		{
-			var offset = new WVec(range.Length, 0, 0);
-			for (var i = 0; i < RangeCircleSegments; i++)
-			{
-				var pa = pos + offset.Rotate(RangeCircleStartRotations[i]);
-				var pb = pos + offset.Rotate(RangeCircleEndRotations[i]);
-				Game.Renderer.WorldLineRenderer.DrawLine(ScreenPosition(pa), ScreenPosition(pb), c);
-			}
-		}
-
-		public void DrawTargetMarker(Color c, float2 location)
-		{
-			var tl = new float2(-1 / Viewport.Zoom, -1 / Viewport.Zoom);
-			var br = new float2(1 / Viewport.Zoom, 1 / Viewport.Zoom);
-			var bl = new float2(tl.X, br.Y);
-			var tr = new float2(br.X, tl.Y);
-
-			var wlr = Game.Renderer.WorldLineRenderer;
-			wlr.DrawLine(location + tl, location + tr, c);
-			wlr.DrawLine(location + tr, location + br, c);
-			wlr.DrawLine(location + br, location + bl, c);
-			wlr.DrawLine(location + bl, location + tl, c);
-		}
-
 		public void RefreshPalette()
 		{
 			palette.ApplyModifiers(World.WorldActor.TraitsImplementing<IPaletteModifier>());
@@ -239,6 +221,12 @@ namespace OpenRA.Graphics
 			return new float2(TileSize.Width * pos.X / 1024f, TileSize.Height * (pos.Y - pos.Z) / 1024f);
 		}
 
+		public float3 Screen3DPosition(WPos pos)
+		{
+			var z = ZPosition(pos, 0) * TileSize.Height / 1024f;
+			return new float3(TileSize.Width * pos.X / 1024f, TileSize.Height * (pos.Y - pos.Z) / 1024f, z);
+		}
+
 		public int2 ScreenPxPosition(WPos pos)
 		{
 			// Round to nearest pixel
@@ -246,28 +234,34 @@ namespace OpenRA.Graphics
 			return new int2((int)Math.Round(px.X), (int)Math.Round(px.Y));
 		}
 
-		// For scaling vectors to pixel sizes in the voxel renderer
-		public void ScreenVectorComponents(WVec vec, out float x, out float y, out float z)
+		public float3 Screen3DPxPosition(WPos pos)
 		{
-			x = TileSize.Width * vec.X / 1024f;
-			y = TileSize.Height * vec.Y / 1024f;
-			z = TileSize.Height * vec.Z / 1024f;
+			// Round to nearest pixel
+			var px = Screen3DPosition(pos);
+			return new float3((float)Math.Round(px.X), (float)Math.Round(px.Y), px.Z);
+		}
+
+		// For scaling vectors to pixel sizes in the voxel renderer
+		public float3 ScreenVectorComponents(WVec vec)
+		{
+			return new float3(
+				TileSize.Width * vec.X / 1024f,
+				TileSize.Height * (vec.Y - vec.Z) / 1024f,
+				TileSize.Height * vec.Z / 1024f);
 		}
 
 		// For scaling vectors to pixel sizes in the voxel renderer
 		public float[] ScreenVector(WVec vec)
 		{
-			float x, y, z;
-			ScreenVectorComponents(vec, out x, out y, out z);
-			return new[] { x, y, z, 1f };
+			var xyz = ScreenVectorComponents(vec);
+			return new[] { xyz.X, xyz.Y, xyz.Z, 1f };
 		}
 
 		public int2 ScreenPxOffset(WVec vec)
 		{
 			// Round to nearest pixel
-			float x, y, z;
-			ScreenVectorComponents(vec, out x, out y, out z);
-			return new int2((int)Math.Round(x), (int)Math.Round(y - z));
+			var xyz = ScreenVectorComponents(vec);
+			return new int2((int)Math.Round(xyz.X), (int)Math.Round(xyz.Y));
 		}
 
 		public float ScreenZPosition(WPos pos, int offset)