Deploy builds to the local repository.

.editorconfig

@@ -1,6 +1,5 @@
 ; Top-most http://editorconfig.org/ file
 root = true
-charset=utf-8
 
 ; Unix-style newlines
 [*]

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,39 @@
+<!--
+  This is a guideline, which shall help to write enhancement requests or bug reports.
+  Fill in the placeholders below. Delete any headings and placeholders that you do not use.
+
+  Before you start check if a similar request/bug report already exists in this Github issue tracker and comment there.
+
+When submitting a feature or enhancement request:
+
+1. Explain briefly what the enhancement is and why you think it would be useful.
+2. Provide any other necessary or useful information regarding your issue, such as (code) examples or related links.
+
+
+When submitting a bug report, please follow the template below:
+-->
+
+### Issue Summary
+<!-- Explanation of the issue. Expectation vs. actual behavior. -->
+... ... ...
+
+#### System Information
+- **Operating System:** [e.g. Windows 10, Mac OS 10.12, Ubuntu 16.04, ...]
+- **.NET / Mono Version:** [e.g. .NET 4.7.1, Mono 4.6.2, ...]
+- **OpenRA Version:** [e.g. release-20180218, playtest-20180208, ...]
+- **Mod:** [e.g. Red Alert, Tiberian Dawn, Dune2000, ...]
+
+#### Additional Information:
+- Steps to reproduce
+	1. Step
+	2. Step
+	3. ...
+
+- Logs
+<!-- If you have a log (e.g. debug.log, exception.log), zip and attach it. -->
+
+- OpenRA Replays
+<!-- You have to zip it before you can attach it. When does the issue appear [e.g. 10:33]? -->
+
+- Screenshots & Videos
+<!-- You should be able to attach screenshots by drag&drop. Videos need to be uploaded to an external platform (e.g. https://www.youtube.com, https://www.dropbox.com) -->

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,33 +0,0 @@
----
-name: Bug report
-about: Report unexpected behavior or any issues you experienced in OpenRA.
-title: ''
-labels: Bug
-assignees: ''
-
----
-
-<!-- This is a guideline that shall help you to include information we need to understand and fix the issue you experienced. Please follow the instructions and replace any placeholders that are written in capital letters. Instructions like this comment will not be visible in your report. -->
-
-<!-- Important: Help us to avoid duplicates and use the search function to find existing reports for your issue. Please do not submit duplicate reports! Try to help others to find your report by using a precise title. -->
-
-## Issue Summary
-<!-- Please provide a a clear and concise description of what the issue is below. -->
-
-DESCRIPTION
-
-
-## Reproduction
-<!-- Please provide information about how the issue can be reproduced below. -->
-
-STEPS TO REPRODUCE THE ISSUE
-
-
-## Expected behavior
-<!-- Please explain what you expected to happen below. -->
-
-EXPECTED BEHAVIOR
-
-
-## Screenshots / Screen recordings / Replays
-<!-- If applicable, attach screenshots, screen recordings or replays to help explain your problem. -->

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: OpenRA Forum
-    url: https://forum.openra.net/
-    about: "Please ask questions about modding here."
-  - name: OpenRA Discord server
-    url: https://discord.openra.net/
-    about: "Join the community Discord server for community discussion and support."
-  - name: OpenRA IRC Channel
-    url: https://webchat.freenode.net/#openra
-    about: "Join our development IRC channel on freenode for discussion of development topics."

.github/ISSUE_TEMPLATE/crash-report.md

@@ -1,35 +0,0 @@
----
-name: Crash report
-about: Report a game crash.
-title: My game crashed
-labels: Crash
-assignees: ''
-
----
-
-<!-- This is a guideline that shall help you to include all the required information we depend on to investigate and fix game-breaking bugs. Please follow the instructions and replace any placeholders that are written in capital letters. Instructions like this comment will not be visible in your report. -->
-
-## System Information
-<!-- Information about the operating system, engine version, game mod and package source are mandatory for investigating and fixing crashes. -->
-
-- Operating System:  OPERATING SYSTEM
-- OpenRA Version: ENGINE VERSION
-- OpenRA Mod: GAME MOD
-- Source: Official download package OR self-compiled OR third-party package
-- For self-compiled or third-party packages: Mono version
-
-
-## Exception log
-<!-- Please replace the placeholder below with the content of the exception.log file. The three backticks before and after the placeholder are used for formatting, so don't remove them. If you don't find the log folder consult https://github.com/OpenRA/OpenRA/wiki/FAQ#my-game-just-crashed. -->
-
-```
-PASTE LOG HERE
-```
-
-
-## Replay
-<!-- If you have a replay file for the game that crashed, and it crashes again when you play it back, it will be a great help for us to fix the issue. Please compress the replay into a zip file and drag it here to include it in the report. -->
-
-
-## Additional information
-<!-- Please tell us below everything that you think is important for us to know about the crash. Specifically, what you were doing in the moment before the crash or ideally steps to reproduce it are very valuable information. -->

.github/ISSUE_TEMPLATE/feature---enhancement-request.md

@@ -1,35 +0,0 @@
----
-name: Feature / Enhancement request
-about: Describe what you think is missing or could be improved in OpenRA.
-title: ''
-labels: Idea/Wishlist
-assignees: ''
-
----
-
-<!-- This is a guideline that shall help you to describe your idea for a missing feature or enhancement. Please follow the instructions and replace any placeholders that are written in capital letters. Instructions like this comment will not be visible in your report. -->
-
-<!-- Important: Help us to avoid duplicates and use the search function to find existing requests. Please do not submit duplicate requests! Try to help others to find your request by using a precise title. -->
-
-## Motivation
-<!-- Please provide a clear and concise description of the motivation behind the request. If your request is related to a problem or limitation, describe it below. -->
-
-REQUEST MOTIVATION
-
-
-## Proposed solution
-<!-- Please describe your idea and how it is intended to address the motivation of your request. Provide a clear and concise description of the proposed changes. -->
-
-PROPOSED SOLUTION
-
-
-## Side effects
-<!-- Changes often have side effects or unintended consequences. If you expect that your solution has any side effects, please describe them below. -->
-
-EXPECTED SIDE EFFECTS
-
-
-## Alternatives
-<!-- Please outline any alternative solutions you have considered. -->
-
-ALTERNATIVES

.gitignore

@@ -26,7 +26,7 @@ mods/*/*.pdb
 /*.exe
 /*.exe.config
 thirdparty/download/*
-IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP
+*.mmdb.gz
 
 # backup files by various editors
 *~

.travis.yml

@@ -1,16 +1,9 @@
 # Travis-CI Build for OpenRA
 # see travis-ci.org for details
 
+dist: xenial
 language: csharp
-mono: 6.4.0
-
-jobs:
-  include:
-    - os: linux
-      dist: xenial
-    - os: osx
-      if: tag IS present
-      osx_image: xcode10
+mono: 5.20.1
 
 cache:
   directories:
@@ -21,8 +14,13 @@ addons:
     packages:
     - lua5.1
     - dpkg
-    - zsync
     - markdown
+    - zlib1g-dev
+    - libbz2-dev
+    - cmake
+    - genisoimage
+    - fakeroot
+    - zsync
 
 # Environment variables
 env:
@@ -34,13 +32,8 @@ env:
 # call OpenRA to check for YAML errors
 # Run the NUnit tests
 script:
+ - travis_retry make all-dependencies
  - make all
- - test "$TRAVIS_OS_NAME" == "linux" && make check || echo "Skipping check"
- - test "$TRAVIS_OS_NAME" == "linux" && make check-scripts || echo "Skipping scripts check"
- - test "$TRAVIS_OS_NAME" == "linux" && make test || echo "Skipping tests"
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-     mono ~/.nuget/packages/nunit.consolerunner/3.11.1/tools/nunit3-console.exe --noresult OpenRA.Test.dll;
-   fi
 
 # Only watch the development branch and tagged release.
 branches:
@@ -48,40 +41,30 @@ branches:
    - /^release-.*$/
    - /^playtest-.*$/
    - /^pkgtest-.*$/
+   - /^devtest-.*$/
    - /^prep-.*$/
    - bleed
 
-# Notify developers when build passed/failed.
-notifications:
-  irc:
-    template:
-      - "%{repository}#%{build_number} %{commit} %{author}: %{message} %{build_url}"
-    channels:
-      - "irc.freenode.net#openra"
-    use_notice: true
-    skip_join: true
-
 before_deploy:
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-     wget https://mirrors.edge.kernel.org/ubuntu/pool/universe/n/nsis/nsis-common_3.04-1_all.deb;
-     wget https://mirrors.edge.kernel.org/ubuntu/pool/universe/n/nsis/nsis_3.04-1_amd64.deb;
-     sudo dpkg -i nsis-common_3.04-1_all.deb;
-     sudo dpkg -i nsis_3.04-1_amd64.deb;
-     cd packaging && ./update-wiki.sh ${TRAVIS_TAG} && cd ..;
-   fi;
+ - wget http://mirrors.kernel.org/ubuntu/pool/universe/n/nsis/nsis-common_3.03-2_all.deb
+ - wget http://mirrors.kernel.org/ubuntu/pool/universe/n/nsis/nsis_3.03-2_amd64.deb
+ - sudo dpkg -i nsis-common_3.03-2_all.deb
+ - sudo dpkg -i nsis_3.03-2_amd64.deb
+ - makensis -VERSION
  - export PATH=$PATH:$HOME/usr/bin
  - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"`
  - cd packaging
  - mkdir build
  - ./package-all.sh ${TRAVIS_TAG} ${PWD}/build/
+
 deploy:
   provider: releases
   api_key:
-    secure: "g/LU11f+mjqv+lj0sR1UliHwogXL4ofJUwoG5Dbqlvdf5UTLWytw/OWSCv8RGyuh10miyWeaoqHh1cn2C1IFhUEqN1sSeKKKOWOTvJ2FR5mzi9uH3d/MOBzG5icQ7Qh0fZ1YPz5RaJJhYu6bmfvA/1gD49GoaX2kxQL4J5cEBgg="
+    secure: BzLdjZHvDqd5jyyHS8KK8zrNiXEIQiGRS/RMfqK6LuFPC4mXYDE4C/0oLPe93ULtai6LgUUkwB+zKq4lDV109EBO8Xp0jXKdDLLsepGU5xRLt3Z2tT4Zj+Nx6daVjAJe1MaKO5Zo5ODi8kBploRnPCffA8AMzOyQ+OwwJNlcRSs=
   file_glob: true
   file: build/*
   skip_cleanup: true
   on:
     all_branches: true
     tags: true
-    repo: OpenRA/OpenRA
+    repo: pchote/OpenRA

AUTHORS

@@ -3,27 +3,26 @@ hard work of many contributors.
 
 The OpenRA developers are:
     * Chris Forbes (chrisf)
+    * Igor Popov (ihptru)
     * Lukas Franke (abcdefg30)
+    * Oliver Brakmann (obrakmann)
     * Paul Chote (pchote)
     * Reaperrr
+    * Tom Roostan (RoosterDragon)
 
 Previous developers included:
     * Alli Witheford (alzeih)
     * Caleb Anderson (RobotCaleb)
     * Curtis Shmyr (hamb)
     * Daniel Hernandez (Mancano)
-    * Igor Popov (ihptru)
     * Matthias Mailänder (Mailaender)
     * Megan Bowra-Dean (beedee)
     * Mike Bundy (kehaar)
-    * Oliver Brakmann (obrakmann)
     * Pavel Penev (penev92)
     * Robert Pepperell (ytinasni)
     * ScottNZ
-    * Tom Roostan (RoosterDragon)
 
 Also thanks to:
-    * abmyii
     * Adam Valy (Tschokky)
     * Akseli Virtanen (RAGEQUIT)
     * Alexander Fast (mizipzor)
@@ -42,9 +41,8 @@ Also thanks to:
     * Brendan Gluth (Mechanical_Man)
     * Bryan Wilbur
     * Bugra Cuhadaroglu (BugraC)
-    * Chris Cameron (Vesuvian)
-    * Chris Grant (Unit158)
     * Christer Ulfsparre (Holloweye)
+    * Chris Grant (Unit158)
     * clem
     * Cody Brittain (Generalcamo)
     * Constantin Helmig (CH4Code)
@@ -160,6 +158,12 @@ FreeType License.
 
 Using OpenAL Soft distributed under the GNU LGPL.
 
+Using MaxMind GeoIP2 .NET API distributed under
+the Apache 2.0 license.
+
+Using GeoLite2 data created by MaxMind and
+distributed under the CC BY-SA 3.0 license.
+
 Using SDL2-CS and OpenAL-CS created by Ethan
 Lee and released under the zlib license.
 
@@ -179,9 +183,6 @@ Krueger and distributed under the GNU GPL terms.
 Using rix0rrr.BeaconLib developed by Rico Huijbers
 distributed under MIT License.
 
-This site or product includes IP2Location LITE data
-available from http://www.ip2location.com.
-
 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

@@ -8,9 +8,15 @@ Windows
 
 Compiling OpenRA requires the following dependencies:
 * [Windows PowerShell >= 4.0](http://microsoft.com/powershell) (included by default in recent Windows 10 versions)
-* [.NET Framework 4.7.2 (Developer Pack)](https://dotnet.microsoft.com/download/dotnet-framework/net472) (or via Visual Studio 2017)
+* [.NET Framework 4.6.1 (Developer Pack)](https://dotnet.microsoft.com/download/dotnet-framework/net461) (or via Visual Studio 2017)
 * [.NET Core 2.2 SDK](https://dotnet.microsoft.com/download/dotnet-core/2.2) (or via Visual Studio 2017)
 
+Type `make dependencies` in a command terminal to download pre-compiled native libraries for:
+* [SDL 2](http://www.libsdl.org/download-2.0.php)
+* [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm)
+* [zlib](http://gnuwin32.sourceforge.net/packages/zlib.htm)
+* [OpenAL](http://kcat.strangesoft.net/openal.html)
+* [liblua 5.1](http://luabinaries.sourceforge.net/download.html)
 
 To compile OpenRA, open the `OpenRA.sln` solution in the main folder, build it from the command-line with MSBuild or use the Makefile analogue command `make all` scripted in PowerShell syntax.
 
@@ -19,17 +25,11 @@ Run the game with `launch-game.cmd`. It can be handed arguments that specify the
 Linux
 =====
 
-Mono, version 5.18 or later, is required to compile OpenRA. You can add the [upstream mono repository](https://www.mono-project.com/download/stable/#download-lin) for your distro to obtain the latest version if your system packages are not sufficient.
+Mono, version 5.4 or later, is required to compile OpenRA. You can add the [upstream mono repository](https://www.mono-project.com/download/stable/#download-lin) for your distro to obtain the latest version if your system packages are not sufficient.
 
-To compile OpenRA, run `make` from the command line. After this one can run the game with `./launch-game.sh`. It is also possible to specify the mod you wish to run from the command line, e.g. with `./launch-game.sh Game.Mod=ts` if you wish to try the experimental Tiberian Sun mod. 
+Use `make dependencies` to map the native libraries to your system and fetch the remaining CLI dependencies to place them at the appropriate places.
 
-The default behaviour on the x86_64 architecture is to download several pre-compiled native libraries using the Nuget packaging manager. If you prefer to use system libraries, compile instead using `make TARGETPLATFORM=unix-generic`.
-
-If you choose to use system libraries, or your system is not x86_64, you will need to install the following using your system package manager:
-* [SDL 2](http://www.libsdl.org/download-2.0.php)
-* [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm)
-* [OpenAL](http://kcat.strangesoft.net/openal.html)
-* [liblua 5.1](http://luabinaries.sourceforge.net/download.html)
+To compile OpenRA, run `make all` from the command line. After this one can run the game with `./launch-game.sh`. It is also possible to specify the mod you wish to run from the command line, e.g. with `./launch-game.sh Game.Mod=ts` if you wish to try the experimental Tiberian Sun mod. 
 
 Type `sudo make install` for system-wide installation. Run `sudo make install-linux-shortcuts` to get startup scripts, icons and desktop files. You can then run the Red Alert by executing the `openra-ra` command, the Dune 2000 mod by running the `openra-d2k` command and Tiberian Dawn by the `openra-cnc` command. Alternatively, you can also run these mods by clicking on their desktop shortcuts if you ran `sudo make install-linux-shortcuts`. 
 
@@ -95,17 +95,18 @@ The EPEL repository is required in order for the following command to run proper
 sudo yum install "pkgconfig(mono)" SDL2 freetype "lua = 5.1" openal-soft xdg-utils zenity
 ```
 
-macOS
+OSX
 =====
 
 Before compiling OpenRA you must install the following dependencies:
-* [Mono >= 5.18](https://www.mono-project.com/download/stable/#download-mac)
+* [Mono >= 5.4](https://www.mono-project.com/download/stable/#download-mac)
 
-To compile OpenRA, run `make` from the command line. Run with `./launch-game.sh`.
+Use `make dependencies` to download pre-compiled native libraries for:
+* [SDL 2](http://www.libsdl.org/download-2.0.php)
+* [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm)
+* [OpenAL](http://kcat.strangesoft.net/openal.html)
+* [liblua 5.1](http://luabinaries.sourceforge.net/download.html)
 
-The default behaviour is to download several pre-compiled native libraries using the Nuget packaging manager. If you prefer to use system libraries, compile instead using `make TARGETPLATFORM=unix-generic`. If you choose to use system libraries you will need to install:
-* [SDL 2](http://www.libsdl.org/download-2.0.php) (`brew install sdl2`)
-* [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm) (`brew install freetype`)
-* [OpenAL](http://kcat.strangesoft.net/openal.html) (`brew install openal-soft`)
-* [liblua 5.1](http://luabinaries.sourceforge.net/download.html) (`brew install lua@5.1`)
+To compile OpenRA, run `make` from the command line.
 
+Run with `./launch-game.sh`.

Makefile

@@ -3,13 +3,15 @@
 # to compile, run:
 #   make [DEBUG=true]
 #
-# to compile using system libraries for native dependencies, run:
-#   make [DEBUG=true] TARGETPLATFORM=unix-generic
-#
+# 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
 #
-# to check the engine and official mod dlls for code style violations, run:
+# to check the official mod dlls for StyleCop violations, run:
 #   make check
 #
 # to install, run:
@@ -20,7 +22,6 @@
 #
 # to install the engine and common mod files (omitting the default mods):
 #   make install-engine
-#   make install-dependencies
 #   make install-common-mod-files
 #
 # to uninstall, run:
@@ -39,11 +40,11 @@
 WHITELISTED_OPENRA_ASSEMBLIES = OpenRA.Game.exe OpenRA.Utility.exe OpenRA.Platforms.Default.dll OpenRA.Mods.Common.dll OpenRA.Mods.Cnc.dll OpenRA.Mods.D2k.dll OpenRA.Game.dll
 
 # These are explicitly shipped alongside our core files by the packaging script
-WHITELISTED_THIRDPARTY_ASSEMBLIES = ICSharpCode.SharpZipLib.dll FuzzyLogicLibrary.dll Eluant.dll BeaconLib.dll Open.Nat.dll SDL2-CS.dll OpenAL-CS.Core.dll 
+WHITELISTED_THIRDPARTY_ASSEMBLIES = ICSharpCode.SharpZipLib.dll FuzzyLogicLibrary.dll MaxMind.Db.dll Eluant.dll rix0rrr.BeaconLib.dll Open.Nat.dll SDL2-CS.dll OpenAL-CS.dll 
 
 # These are shipped in our custom minimal mono runtime and also available in the full system-installed .NET/mono stack
 # This list *must* be kept in sync with the files packaged by the AppImageSupport and OpenRALauncherOSX repositories
-WHITELISTED_CORE_ASSEMBLIES = mscorlib.dll System.dll System.Configuration.dll System.Core.dll System.Numerics.dll System.Security.dll System.Xml.dll Mono.Security.dll netstandard.dll
+WHITELISTED_CORE_ASSEMBLIES = mscorlib.dll System.dll System.Configuration.dll System.Core.dll System.Numerics.dll System.Security.dll System.Xml.dll Mono.Security.dll
 
 NUNIT_LIBS_PATH :=
 NUNIT_LIBS  := $(NUNIT_LIBS_PATH)nunit.framework.dll
@@ -80,31 +81,24 @@ MSBUILD = msbuild -verbosity:m -nologo
 # Enable 32 bit builds while generating the windows installer
 WIN32 = false
 
-# dependencies
-ifndef TARGETPLATFORM
-UNAME_S := $(shell uname -s)
-UNAME_M := $(shell uname -m)
-ifeq ($(UNAME_S),Darwin)
-TARGETPLATFORM = osx-x64
-else
-ifeq ($(UNAME_M),x86_64)
-TARGETPLATFORM = linux-x64
-else
-TARGETPLATFORM = unix-generic
-endif
-endif
-endif
-
 # program targets
 VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
 
+# dependencies
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+os-dependencies = osx-dependencies
+else
+os-dependencies = linux-dependencies
+endif
+
 check-scripts:
 	@echo
 	@echo "Checking for Lua syntax errors..."
 	@luac -p $(shell find mods/*/maps/* -iname '*.lua')
 	@luac -p $(shell find lua/* -iname '*.lua')
 
-check:
+check: dependencies
 	@echo
 	@echo "Compiling in debug mode..."
 	@$(MSBUILD) -t:build -p:Configuration=Debug
@@ -118,6 +112,26 @@ check:
 	@echo "Checking for incorrect conditional trait interface overrides..."
 	@mono --debug OpenRA.Utility.exe all --check-conditional-trait-interface-overrides
 
+
+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: core
+	@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: core
 	@echo
 	@echo "Testing Tiberian Sun mod MiniYAML..."
@@ -134,21 +148,55 @@ test: core
 
 ########################## MAKE/INSTALL RULES ##########################
 #
-all: core
+all: dependencies core
 
 core:
-	@command -v $(firstword $(MSBUILD)) >/dev/null || (echo "OpenRA requires the '$(MSBUILD)' tool provided by Mono >= 5.18."; exit 1)
-	@$(MSBUILD) -t:Build -restore -p:Configuration=Release -p:TargetPlatform=$(TARGETPLATFORM)
-ifeq ($(TARGETPLATFORM), unix-generic)
-	@./configure-system-libraries.sh
+	@command -v $(MSBUILD) >/dev/null || (echo "OpenRA requires the '$(MSBUILD)' tool provided by Mono >= 5.4."; exit 1)
+ifeq ($(WIN32), $(filter $(WIN32),true yes y on 1))
+	@$(MSBUILD) -t:build -p:Configuration="Release-x86"
+else
+	@$(MSBUILD) -t:build -p:Configuration=Release
 endif
-	@./fetch-geoip.sh
 
 clean:
-	@-$(RM_F) *.config IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP
-	@-$(RM_F) *.exe *.dll *.dll.config *.so *.dylib ./OpenRA*/*.dll *.pdb mods/**/*.dll mods/**/*.pdb *.resources
-	@-$(RM_RF) ./*/bin ./*/obj
 	@ $(MSBUILD) -t:clean
+	@-$(RM_F) *.config
+	@-$(RM_F) *.exe *.dll *.dylib ./OpenRA*/*.dll *.pdb mods/**/*.dll mods/**/*.pdb *.resources
+	@-$(RM_RF) ./*/bin ./*/obj
+	@-$(RM_RF) ./thirdparty/download
+
+distclean: clean
+
+cli-dependencies:
+	@./thirdparty/fetch-thirdparty-deps.sh
+	@ $(CP_R) thirdparty/download/*.dll .
+	@ $(CP_R) thirdparty/download/*.dll.config .
+	@ test -f OpenRA.Game/obj/project.assets.json || $(MSBUILD) -t:restore
+
+linux-dependencies: cli-dependencies geoip-dependencies linux-native-dependencies
+
+linux-native-dependencies:
+	@./thirdparty/configure-native-deps.sh
+
+windows-dependencies: cli-dependencies geoip-dependencies
+ifeq ($(WIN32), $(filter $(WIN32),true yes y on 1))
+	@./thirdparty/fetch-thirdparty-deps-windows.sh x86
+else
+	@./thirdparty/fetch-thirdparty-deps-windows.sh x64
+endif
+
+osx-dependencies: cli-dependencies geoip-dependencies
+	@./thirdparty/fetch-thirdparty-deps-osx.sh
+	@ $(CP_R) thirdparty/download/osx/*.dylib .
+	@ $(CP_R) thirdparty/download/osx/*.dll.config .
+
+geoip-dependencies:
+	@./thirdparty/fetch-geoip-db.sh
+	@ $(CP) thirdparty/download/GeoLite2-Country.mmdb.gz .
+
+dependencies: $(os-dependencies)
+
+all-dependencies: cli-dependencies windows-dependencies osx-dependencies geoip-dependencies
 
 version: VERSION mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml
 	@echo "$(VERSION)" > VERSION
@@ -158,33 +206,10 @@ version: VERSION mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mo
 		rm $${i}.tmp; \
 	done
 
-install: core install-core
+install: dependencies core install-core
 
 install-linux-shortcuts: install-linux-scripts install-linux-icons install-linux-desktop
 
-install-dependencies:
-ifeq ($(TARGETPLATFORM), $(filter $(TARGETPLATFORM),win-x86 win-x64))
-	@-echo "Installing OpenRA dependencies to $(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) soft_oal.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) SDL2.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) freetype6.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) lua51.dll "$(DATA_INSTALL_DIR)"
-endif
-ifeq ($(TARGETPLATFORM), linux-x64)
-	@-echo "Installing OpenRA dependencies to $(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) soft_oal.so "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) SDL2.so "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) freetype6.so "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) lua51.so "$(DATA_INSTALL_DIR)"
-endif
-ifeq ($(TARGETPLATFORM), osx-x64)
-	@-echo "Installing OpenRA dependencies to $(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) soft_oal.dylib "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) SDL2.dylib "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) freetype6.dylib "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) lua51.dylib "$(DATA_INSTALL_DIR)"
-endif
-
 install-engine:
 	@-echo "Installing OpenRA engine to $(DATA_INSTALL_DIR)"
 	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
@@ -193,13 +218,11 @@ install-engine:
 	@$(INSTALL_PROGRAM) OpenRA.Utility.exe "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) OpenRA.Platforms.Default.dll "$(DATA_INSTALL_DIR)"
 
-ifneq ($(TARGETPLATFORM), $(filter $(TARGETPLATFORM),win-x86 win-x64))
 	@$(INSTALL_DATA) OpenRA.Platforms.Default.dll.config "$(DATA_INSTALL_DIR)"
-endif
+	@$(INSTALL_DATA) "GeoLite2-Country.mmdb.gz" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb.gz"
 	@$(INSTALL_DATA) VERSION "$(DATA_INSTALL_DIR)/VERSION"
 	@$(INSTALL_DATA) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS"
 	@$(INSTALL_DATA) COPYING "$(DATA_INSTALL_DIR)/COPYING"
-	@$(INSTALL_DATA) IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP "$(DATA_INSTALL_DIR)/IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP"
 
 	@$(CP_R) glsl "$(DATA_INSTALL_DIR)"
 	@$(CP_R) lua "$(DATA_INSTALL_DIR)"
@@ -209,7 +232,8 @@ endif
 	@$(INSTALL_PROGRAM) ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) FuzzyLogicLibrary.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) Open.Nat.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) BeaconLib.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) MaxMind.Db.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) rix0rrr.BeaconLib.dll "$(DATA_INSTALL_DIR)"
 
 install-common-mod-files:
 	@-echo "Installing OpenRA common mod files to $(DATA_INSTALL_DIR)"
@@ -334,28 +358,23 @@ uninstall:
 
 help:
 	@echo 'to compile, run:'
-	@echo '  make [DEBUG=true]'
+	@echo '  make [DEBUG=false]'
 	@echo
-	@echo 'to compile using system libraries for native dependencies, run:'
-	@echo '  make [DEBUG=true] TARGETPLATFORM=unix-generic'
+	@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 check the official mods for erroneous yaml files, run:'
 	@echo '  make test'
 	@echo
-	@echo 'to check the engine and official mod dlls for code style violations, run:'
-	@echo '  make test'
-	@echo
 	@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
-	@echo ' to install the engine and common mod files (omitting the default mods):'
-	@echo '   make install-engine'
-	@echo '   make install-dependencies'
-	@echo '   make install-common-mod-files'
-	@echo
 	@echo 'to uninstall, run:'
 	@echo '  make uninstall'
 	@echo
@@ -368,4 +387,4 @@ help:
 
 .SUFFIXES:
 
-.PHONY: check-scripts check test all core clean version install install-linux-shortcuts install-dependencies install-engine install-common-mod-files install-default-mods install-core install-linux-icons install-linux-desktop install-linux-mime install-linux-appdata install-man-page install-linux-scripts uninstall help
+.PHONY: check-scripts check nunit test all core clean distclean cli-dependencies linux-dependencies linux-native-dependencies windows-dependencies osx-dependencies geoip-dependencies dependencies all-dependencies version install install-linux-shortcuts install-engine install-common-mod-files install-default-mods install-core install-linux-icons install-linux-desktop install-linux-mime install-linux-appdata install-man-page install-linux-scripts uninstall help

OpenRA.Game/Activities/Activity.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -40,50 +40,21 @@ namespace OpenRA.Activities
 	 * Things to be aware of when writing activities:
 	 *
 	 * - Use "return true" at least once somewhere in the tick method.
-	 * - Do not "reuse" activity objects (by queuing them as next or child, for example) that have already started running.
+	 * - Do not "reuse" (with "SequenceActivities", for example) activity objects that have already started running.
 	 *   Queue a new instance instead.
 	 * - Avoid calling actor.CancelActivity(). It is almost always a bug. Call activity.Cancel() instead.
-	 * - Do not evaluate dynamic state (an actor's location, health, conditions, etc.) in the activity's constructor,
-	 *   as that might change before the activity gets to tick for the first time.  Use the OnFirstRun() method instead.
 	 */
 	public abstract class Activity : IActivityInterface
 	{
 		public ActivityState State { get; private set; }
 
-		Activity childActivity;
-		protected Activity ChildActivity
-		{
-			get { return SkipDoneActivities(childActivity); }
-			private set { childActivity = value; }
-		}
-
-		Activity nextActivity;
-		public Activity NextActivity
-		{
-			get { return SkipDoneActivities(nextActivity); }
-			private set { nextActivity = value; }
-		}
-
-		internal static Activity SkipDoneActivities(Activity first)
-		{
-			// If first.Cancel() was called while it was queued (i.e. before it first ticked), its state will be Done
-			// rather than Queued (the activity system guarantees that it cannot be Active or Canceling).
-			// An unknown number of ticks may have elapsed between the Cancel() call and now,
-			// so we cannot make any assumptions on the value of first.NextActivity.
-			// We must not return first (ticking it would be bogus), but returning null would potentially
-			// drop valid activities queued after it. Walk the queue until we find a valid activity or
-			// (more likely) run out of activities.
-			while (first != null && first.State == ActivityState.Done)
-				first = first.NextActivity;
-
-			return first;
-		}
+		protected Activity ChildActivity { get; private set; }
+		public Activity NextActivity { get; private set; }
 
 		public bool IsInterruptible { get; protected set; }
 		public bool ChildHasPriority { get; protected set; }
 		public bool IsCanceling { get { return State == ActivityState.Canceling; } }
 		bool finishing;
-		bool firstRunCompleted;
 		bool lastRun;
 
 		public Activity()
@@ -100,13 +71,9 @@ namespace OpenRA.Activities
 			if (State == ActivityState.Queued)
 			{
 				OnFirstRun(self);
-				firstRunCompleted = true;
 				State = ActivityState.Active;
 			}
 
-			if (!firstRunCompleted)
-				throw new InvalidOperationException("Actor {0} attempted to tick activity {1} before running its OnFirstRun method.".F(self, GetType()));
-
 			// Only run the parent tick when the child is done.
 			// We must always let the child finish on its own before continuing.
 			if (ChildHasPriority)
@@ -202,8 +169,7 @@ namespace OpenRA.Activities
 			if (ChildActivity != null)
 				ChildActivity.Cancel(self);
 
-			// Directly mark activities that are queued and therefore didn't run yet as done
-			State = State == ActivityState.Queued ? ActivityState.Done : ActivityState.Canceling;
+			State = ActivityState.Canceling;
 		}
 
 		public void Queue(Activity activity)

OpenRA.Game/Activities/CallFunc.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Actor.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -44,12 +44,7 @@ namespace OpenRA
 		public bool WillDispose { get; private set; }
 		public bool Disposed { get; private set; }
 
-		Activity currentActivity;
-		public Activity CurrentActivity
-		{
-			get { return Activity.SkipDoneActivities(currentActivity); }
-			private set { currentActivity = value; }
-		}
+		public Activity CurrentActivity { get; private set; }
 
 		public int Generation;
 		public Actor ReplacedByActor;
@@ -74,31 +69,6 @@ namespace OpenRA
 			}
 		}
 
-		/// <summary>Value used to represent an invalid token.</summary>
-		public static readonly int InvalidConditionToken = -1;
-
-		class ConditionState
-		{
-			/// <summary>Delegates that have registered to be notified when this condition changes.</summary>
-			public readonly List<VariableObserverNotifier> Notifiers = new List<VariableObserverNotifier>();
-
-			/// <summary>Unique integers identifying granted instances of the condition.</summary>
-			public readonly HashSet<int> Tokens = new HashSet<int>();
-		}
-
-		readonly Dictionary<string, ConditionState> conditionStates = new Dictionary<string, ConditionState>();
-
-		/// <summary>Each granted condition receives a unique token that is used when revoking.</summary>
-		readonly Dictionary<int, string> conditionTokens = new Dictionary<int, string>();
-
-		int nextConditionToken = 1;
-
-		/// <summary>Cache of condition -> enabled state for quick evaluation of token counter conditions.</summary>
-		readonly Dictionary<string, int> conditionCache = new Dictionary<string, int>();
-
-		/// <summary>Read-only version of conditionCache that is passed to IConditionConsumers.</summary>
-		readonly IReadOnlyDictionary<string, int> readOnlyConditionCache;
-
 		internal SyncHash[] SyncHashes { get; private set; }
 
 		readonly IFacing facing;
@@ -112,14 +82,11 @@ namespace OpenRA
 		readonly INotifyIdle[] tickIdles;
 		readonly ITargetablePositions[] targetablePositions;
 		WPos[] staticTargetablePositions;
-		bool created;
 
 		internal Actor(World world, string name, TypeDictionary initDict)
 		{
 			var init = new ActorInitializer(this, initDict);
 
-			readOnlyConditionCache = new ReadOnlyDictionary<string, int>(conditionCache);
-
 			World = world;
 			ActorID = world.NextAID();
 			if (initDict.Contains<OwnerInit>())
@@ -171,62 +138,6 @@ namespace OpenRA
 			SyncHashes = TraitsImplementing<ISync>().Select(sync => new SyncHash(sync)).ToArray();
 		}
 
-		internal void Created()
-		{
-			created = true;
-
-			// Make sure traits are usable for condition notifiers
-			foreach (var t in TraitsImplementing<INotifyCreated>())
-				t.Created(this);
-
-			var allObserverNotifiers = new HashSet<VariableObserverNotifier>();
-			foreach (var provider in TraitsImplementing<IObservesVariables>())
-			{
-				foreach (var variableUser in provider.GetVariableObservers())
-				{
-					allObserverNotifiers.Add(variableUser.Notifier);
-					foreach (var variable in variableUser.Variables)
-					{
-						var cs = conditionStates.GetOrAdd(variable);
-						cs.Notifiers.Add(variableUser.Notifier);
-
-						// Initialize conditions that have not yet been granted to 0
-						// NOTE: Some conditions may have already been granted by INotifyCreated calling GrantCondition,
-						// and we choose to assign the token count to safely cover both cases instead of adding an if branch.
-						conditionCache[variable] = cs.Tokens.Count;
-					}
-				}
-			}
-
-			// Update all traits with their initial condition state
-			foreach (var notify in allObserverNotifiers)
-				notify(this, readOnlyConditionCache);
-
-			// TODO: Some traits may need initialization after being notified of initial condition state.
-
-			// TODO: A post condition initialization notification phase may allow queueing activities instead.
-			// The initial activity should run before any activities queued by INotifyCreated.Created
-			// However, we need to know which traits are enabled (via conditions), so wait for after the calls and insert the activity as the first
-			ICreationActivity creationActivity = null;
-			foreach (var ica in TraitsImplementing<ICreationActivity>())
-			{
-				if (!ica.IsTraitEnabled())
-					continue;
-
-				if (creationActivity != null)
-					throw new InvalidOperationException("More than one enabled ICreationActivity trait: {0} and {1}".F(creationActivity.GetType().Name, ica.GetType().Name));
-
-				var activity = ica.GetCreationActivity();
-				if (activity == null)
-					continue;
-
-				creationActivity = ica;
-
-				activity.Queue(CurrentActivity);
-				CurrentActivity = activity;
-			}
-		}
-
 		public void Tick()
 		{
 			var wasIdle = IsIdle;
@@ -287,7 +198,7 @@ namespace OpenRA
 						yield return r;
 		}
 
-		public Polygon MouseBounds(WorldRenderer wr)
+		public Rectangle MouseBounds(WorldRenderer wr)
 		{
 			foreach (var mb in mouseBounds)
 			{
@@ -296,22 +207,18 @@ namespace OpenRA
 					return bounds;
 			}
 
-			return Polygon.Empty;
+			return Rectangle.Empty;
 		}
 
 		public void QueueActivity(bool queued, Activity nextActivity)
 		{
 			if (!queued)
 				CancelActivity();
-
 			QueueActivity(nextActivity);
 		}
 
 		public void QueueActivity(Activity nextActivity)
 		{
-			if (!created)
-				throw new InvalidOperationException("An activity was queued before the actor was created. Queue it inside the INotifyCreated.Created callback instead.");
-
 			if (CurrentActivity == null)
 				CurrentActivity = nextActivity;
 			else
@@ -508,60 +415,6 @@ namespace OpenRA
 			return new[] { CenterPosition };
 		}
 
-		#region Conditions
-
-		void UpdateConditionState(string condition, int token, bool isRevoke)
-		{
-			ConditionState conditionState = conditionStates.GetOrAdd(condition);
-
-			if (isRevoke)
-				conditionState.Tokens.Remove(token);
-			else
-				conditionState.Tokens.Add(token);
-
-			conditionCache[condition] = conditionState.Tokens.Count;
-
-			// Conditions may be granted or revoked before the state is initialized.
-			// These notifications will be processed after INotifyCreated.Created.
-			if (created)
-				foreach (var notify in conditionState.Notifiers)
-					notify(this, readOnlyConditionCache);
-		}
-
-		/// <summary>Grants a specified condition.</summary>
-		/// <returns>The token that is used to revoke this condition.</returns>
-		public int GrantCondition(string condition)
-		{
-			var token = nextConditionToken++;
-			conditionTokens.Add(token, condition);
-			UpdateConditionState(condition, token, false);
-			return token;
-		}
-
-		/// <summary>
-		/// Revokes a previously granted condition.
-		/// </summary>
-		/// <param name="token">The token ID returned by GrantCondition.</param>
-		/// <returns>The invalid token ID.</returns>
-		public int RevokeCondition(int token)
-		{
-			string condition;
-			if (!conditionTokens.TryGetValue(token, out condition))
-				throw new InvalidOperationException("Attempting to revoke condition with invalid token {0} for {1}.".F(token, this));
-
-			conditionTokens.Remove(token);
-			UpdateConditionState(condition, token, true);
-			return InvalidConditionToken;
-		}
-
-		/// <summary>Returns whether the specified token is valid for RevokeCondition</summary>
-		public bool TokenValid(int token)
-		{
-			return conditionTokens.ContainsKey(token);
-		}
-
-		#endregion
-
 		#region Scripting interface
 
 		Lazy<ScriptActorInterface> luaInterface;

OpenRA.Game/CPos.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/CVec.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/CacheStorage.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/CryptoUtil.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/DefaultPlayer.cs

@@ -1,20 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2020 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 OpenRA.Primitives;
-
-namespace OpenRA
-{
-	public class DefaultPlayer : IGlobalModData
-	{
-		public readonly Color Color = Color.FromAhsl(0, 0, 238);
-	}
-}

OpenRA.Game/Download.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Effects/AsyncAction.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Effects/DelayedAction.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Effects/DelayedImpact.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -10,7 +10,6 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRA.GameRules;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
@@ -19,23 +18,26 @@ namespace OpenRA.Effects
 	public class DelayedImpact : IEffect
 	{
 		readonly Target target;
+		readonly Actor firedBy;
+		readonly IEnumerable<int> damageModifiers;
 		readonly IWarhead wh;
-		readonly WarheadArgs args;
 
 		int delay;
 
-		public DelayedImpact(int delay, IWarhead wh, Target target, WarheadArgs args)
+		public DelayedImpact(int delay, IWarhead wh, Target target, Actor firedBy, IEnumerable<int> damageModifiers)
 		{
 			this.wh = wh;
 			this.delay = delay;
+
 			this.target = target;
-			this.args = args;
+			this.firedBy = firedBy;
+			this.damageModifiers = damageModifiers;
 		}
 
 		public void Tick(World world)
 		{
 			if (--delay <= 0)
-				world.AddFrameEndTask(w => { w.Remove(this); wh.DoImpact(target, args); });
+				world.AddFrameEndTask(w => { w.Remove(this); wh.DoImpact(target, firedBy, damageModifiers); });
 		}
 
 		public IEnumerable<IRenderable> Render(WorldRenderer wr) { yield break; }

OpenRA.Game/Effects/IEffect.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -24,5 +24,4 @@ namespace OpenRA.Effects
 	public interface ISpatiallyPartitionable { }
 
 	public interface IEffectAboveShroud { IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr); }
-	public interface IEffectAnnotation { IEnumerable<IRenderable> RenderAnnotation(WorldRenderer wr); }
 }

OpenRA.Game/ExternalMods.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -16,7 +16,6 @@ using System.IO;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Graphics;
-using OpenRA.Primitives;
 
 namespace OpenRA
 {
@@ -31,8 +30,6 @@ namespace OpenRA
 		public readonly string LaunchPath;
 		public readonly string[] LaunchArgs;
 		public Sprite Icon { get; internal set; }
-		public Sprite Icon2x { get; internal set; }
-		public Sprite Icon3x { get; internal set; }
 
 		public static string MakeKey(Manifest mod) { return MakeKey(mod.Id, mod.Metadata.Version); }
 		public static string MakeKey(ExternalMod mod) { return MakeKey(mod.Id, mod.Version); }
@@ -44,34 +41,14 @@ namespace OpenRA
 		readonly Dictionary<string, ExternalMod> mods = new Dictionary<string, ExternalMod>();
 		readonly SheetBuilder sheetBuilder;
 
-		Sheet CreateSheet()
-		{
-			var sheet = new Sheet(SheetType.BGRA, new Size(512, 512));
-
-			// We must manually force the buffer creation to avoid a crash
-			// that is indirectly triggered by rendering from a Sheet that
-			// has not yet been written to.
-			sheet.CreateBuffer();
-			sheet.GetTexture().ScaleFilter = TextureScaleFilter.Linear;
-
-			return sheet;
-		}
-
 		public ExternalMods()
 		{
-			// Don't try to load mod icons if we don't have a texture to put them in
-			if (Game.Renderer != null)
-				sheetBuilder = new SheetBuilder(SheetType.BGRA, CreateSheet);
+			sheetBuilder = new SheetBuilder(SheetType.BGRA, 256);
 
-			// Several types of support directory types are available, depending on
-			// how the player has installed and launched the game.
-			// Read registration metadata from all of them
-			var sources = Enum.GetValues(typeof(SupportDirType))
-				.Cast<SupportDirType>()
-				.Select(t => Platform.GetSupportDir(t))
-				.Distinct();
-
-			foreach (var source in sources)
+			// If the player has defined a local support directory (in the game directory)
+			// then this will override both the regular and system support dirs
+			var sources = new[] { Platform.SystemSupportDir, Platform.SupportDir };
+			foreach (var source in sources.Distinct())
 			{
 				var metadataPath = Path.Combine(source, "ModMetadata");
 				if (!Directory.Exists(metadataPath))
@@ -96,23 +73,11 @@ namespace OpenRA
 		void LoadMod(MiniYaml yaml, string path = null, bool forceRegistration = false)
 		{
 			var mod = FieldLoader.Load<ExternalMod>(yaml);
-
-			if (sheetBuilder != null)
+			var iconNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Icon");
+			if (iconNode != null && !string.IsNullOrEmpty(iconNode.Value.Value))
 			{
-				var iconNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Icon");
-				if (iconNode != null && !string.IsNullOrEmpty(iconNode.Value.Value))
-					using (var stream = new MemoryStream(Convert.FromBase64String(iconNode.Value.Value)))
-						mod.Icon = sheetBuilder.Add(new Png(stream));
-
-				var icon2xNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Icon2x");
-				if (icon2xNode != null && !string.IsNullOrEmpty(icon2xNode.Value.Value))
-					using (var stream = new MemoryStream(Convert.FromBase64String(icon2xNode.Value.Value)))
-						mod.Icon2x = sheetBuilder.Add(new Png(stream), 1f / 2);
-
-				var icon3xNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Icon3x");
-				if (icon3xNode != null && !string.IsNullOrEmpty(icon3xNode.Value.Value))
-					using (var stream = new MemoryStream(Convert.FromBase64String(icon3xNode.Value.Value)))
-						mod.Icon3x = sheetBuilder.Add(new Png(stream), 1f / 3);
+				using (var stream = new MemoryStream(Convert.FromBase64String(iconNode.Value.Value)))
+					mod.Icon = sheetBuilder.Add(new Png(stream));
 			}
 
 			// Avoid possibly overwriting a valid mod with an obviously bogus one
@@ -126,47 +91,35 @@ namespace OpenRA
 			if (mod.Metadata.Hidden)
 				return;
 
-			var key = ExternalMod.MakeKey(mod);
-			var yaml = new MiniYamlNode("Registration", new MiniYaml("", new List<MiniYamlNode>()
-			{
-				new MiniYamlNode("Id", mod.Id),
-				new MiniYamlNode("Version", mod.Metadata.Version),
-				new MiniYamlNode("Title", mod.Metadata.Title),
-				new MiniYamlNode("LaunchPath", launchPath),
-				new MiniYamlNode("LaunchArgs", "Game.Mod=" + mod.Id)
-			}));
-
+			var iconData = "";
 			using (var stream = mod.Package.GetStream("icon.png"))
 				if (stream != null)
-					yaml.Value.Nodes.Add(new MiniYamlNode("Icon", Convert.ToBase64String(stream.ReadAllBytes())));
+					iconData = Convert.ToBase64String(stream.ReadAllBytes());
 
-			using (var stream = mod.Package.GetStream("icon-2x.png"))
-				if (stream != null)
-					yaml.Value.Nodes.Add(new MiniYamlNode("Icon2x", Convert.ToBase64String(stream.ReadAllBytes())));
-
-			using (var stream = mod.Package.GetStream("icon-3x.png"))
-				if (stream != null)
-					yaml.Value.Nodes.Add(new MiniYamlNode("Icon3x", Convert.ToBase64String(stream.ReadAllBytes())));
+			var key = ExternalMod.MakeKey(mod);
+			var yaml = new List<MiniYamlNode>()
+			{
+				new MiniYamlNode("Registration", new MiniYaml("", new List<MiniYamlNode>()
+				{
+					new MiniYamlNode("Id", mod.Id),
+					new MiniYamlNode("Version", mod.Metadata.Version),
+					new MiniYamlNode("Title", mod.Metadata.Title),
+					new MiniYamlNode("Icon", iconData),
+					new MiniYamlNode("LaunchPath", launchPath),
+					new MiniYamlNode("LaunchArgs", "Game.Mod=" + mod.Id)
+				}))
+			};
 
 			var sources = new List<string>();
 			if (registration.HasFlag(ModRegistration.System))
-				sources.Add(Platform.GetSupportDir(SupportDirType.System));
+				sources.Add(Platform.SystemSupportDir);
 
 			if (registration.HasFlag(ModRegistration.User))
-			{
-				sources.Add(Platform.GetSupportDir(SupportDirType.User));
-
-				// If using the modern support dir we must also write the registration
-				// to the legacy support dir for older engine versions, but ONLY if it exists
-				var legacyPath = Platform.GetSupportDir(SupportDirType.LegacyUser);
-				if (Directory.Exists(legacyPath))
-					sources.Add(legacyPath);
-			}
+				sources.Add(Platform.SupportDir);
 
 			// Make sure the mod is available for this session, even if saving it fails
-			LoadMod(yaml.Value, forceRegistration: true);
+			LoadMod(yaml.First().Value, forceRegistration: true);
 
-			var lines = new List<MiniYamlNode> { yaml }.ToLines().ToArray();
 			foreach (var source in sources.Distinct())
 			{
 				var metadataPath = Path.Combine(source, "ModMetadata");
@@ -174,7 +127,7 @@ namespace OpenRA
 				try
 				{
 					Directory.CreateDirectory(metadataPath);
-					File.WriteAllLines(Path.Combine(metadataPath, key + ".yaml"), lines);
+					File.WriteAllLines(Path.Combine(metadataPath, key + ".yaml"), yaml.ToLines().ToArray());
 				}
 				catch (Exception e)
 				{
@@ -195,16 +148,10 @@ namespace OpenRA
 		{
 			var sources = new List<string>();
 			if (registration.HasFlag(ModRegistration.System))
-				sources.Add(Platform.GetSupportDir(SupportDirType.System));
+				sources.Add(Platform.SystemSupportDir);
 
 			if (registration.HasFlag(ModRegistration.User))
-			{
-				// User support dir may be using the modern or legacy value, or overridden by the user
-				// Add all the possibilities and let the .Distinct() below ignore the duplicates
-				sources.Add(Platform.GetSupportDir(SupportDirType.User));
-				sources.Add(Platform.GetSupportDir(SupportDirType.ModernUser));
-				sources.Add(Platform.GetSupportDir(SupportDirType.LegacyUser));
-			}
+				sources.Add(Platform.SupportDir);
 
 			var activeModKey = ExternalMod.MakeKey(activeMod);
 			foreach (var source in sources.Distinct())
@@ -260,16 +207,10 @@ namespace OpenRA
 		{
 			var sources = new List<string>();
 			if (registration.HasFlag(ModRegistration.System))
-				sources.Add(Platform.GetSupportDir(SupportDirType.System));
+				sources.Add(Platform.SystemSupportDir);
 
 			if (registration.HasFlag(ModRegistration.User))
-			{
-				// User support dir may be using the modern or legacy value, or overridden by the user
-				// Add all the possibilities and let the .Distinct() below ignore the duplicates
-				sources.Add(Platform.GetSupportDir(SupportDirType.User));
-				sources.Add(Platform.GetSupportDir(SupportDirType.ModernUser));
-				sources.Add(Platform.GetSupportDir(SupportDirType.LegacyUser));
-			}
+				sources.Add(Platform.SupportDir);
 
 			var key = ExternalMod.MakeKey(mod);
 			mods.Remove(key);

OpenRA.Game/Exts.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -80,7 +80,7 @@ namespace OpenRA
 
 		static int WindingDirectionTest(int2 v0, int2 v1, int2 p)
 		{
-			return Math.Sign((v1.X - v0.X) * (p.Y - v0.Y) - (p.X - v0.X) * (v1.Y - v0.Y));
+			return (v1.X - v0.X) * (p.Y - v0.Y) - (p.X - v0.X) * (v1.Y - v0.Y);
 		}
 
 		public static bool PolygonContains(this int2[] polygon, int2 p)
@@ -101,16 +101,6 @@ namespace OpenRA
 			return windingNumber != 0;
 		}
 
-		public static bool LinesIntersect(int2 a, int2 b, int2 c, int2 d)
-		{
-			// If line segments AB and CD intersect:
-			//  - the triangles ACD and BCD must have opposite sense (clockwise or anticlockwise)
-			//  - the triangles CAB and DAB must have opposite sense
-			// Segments intersect if the orientation (clockwise or anticlockwise) of the two points in each line segment are opposite with respect to the other
-			// Assumes that lines are not colinear
-			return WindingDirectionTest(c, d, a) != WindingDirectionTest(c, d, b) && WindingDirectionTest(a, b, c) != WindingDirectionTest(a, b, d);
-		}
-
 		public static bool HasModifier(this Modifiers k, Modifiers mod)
 		{
 			// PERF: Enum.HasFlag is slower and requires allocations.
@@ -161,26 +151,6 @@ namespace OpenRA
 				return xs.ElementAt(r.Next(xs.Count));
 		}
 
-		public static Rectangle Union(this IEnumerable<Rectangle> rects)
-		{
-			// PERF: Avoid LINQ.
-			var first = true;
-			var result = Rectangle.Empty;
-			foreach (var rect in rects)
-			{
-				if (first)
-				{
-					first = false;
-					result = rect;
-					continue;
-				}
-
-				result = Rectangle.Union(rect, result);
-			}
-
-			return result;
-		}
-
 		public static float Product(this IEnumerable<float> xs)
 		{
 			return xs.Aggregate(1f, (a, x) => a * x);

OpenRA.Game/FieldLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -415,13 +415,7 @@ namespace OpenRA
 				}
 			}
 			else if (fieldType == typeof(bool))
-			{
-				bool result;
-				if (bool.TryParse(value.ToLowerInvariant(), out result))
-					return result;
-
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
+				return ParseYesNo(value, fieldType, fieldName);
 			else if (fieldType == typeof(int2[]))
 			{
 				if (value != null)
@@ -598,6 +592,20 @@ namespace OpenRA
 			return null;
 		}
 
+		static object ParseYesNo(string p, Type fieldType, string field)
+		{
+			if (string.IsNullOrEmpty(p))
+				return InvalidValueAction(p, fieldType, field);
+
+			p = p.ToLowerInvariant();
+			if (p == "yes") return true;
+			if (p == "true") return true;
+			if (p == "no") return false;
+			if (p == "false") return false;
+
+			return InvalidValueAction(p, fieldType, field);
+		}
+
 		public sealed class FieldLoadInfo
 		{
 			public readonly FieldInfo Field;

OpenRA.Game/FieldSaver.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/FileFormats/Png.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/FileFormats/ReplayMetadata.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/FileSystem/FileSystem.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/FileSystem/Folder.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/FileSystem/IPackage.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/FileSystem/ZipFile.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Fonts.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Game.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -22,7 +22,6 @@ using System.Threading.Tasks;
 using OpenRA.Graphics;
 using OpenRA.Network;
 using OpenRA.Primitives;
-using OpenRA.Server;
 using OpenRA.Support;
 using OpenRA.Widgets;
 
@@ -39,10 +38,9 @@ namespace OpenRA
 
 		public static ModData ModData;
 		public static Settings Settings;
-		public static CursorManager Cursor;
+		public static ICursor Cursor;
 		public static bool HideCursor;
 		static WorldRenderer worldRenderer;
-		static string modLaunchWrapper;
 
 		internal static OrderManager OrderManager;
 		static Server.Server server;
@@ -51,6 +49,7 @@ namespace OpenRA
 
 		public static Renderer Renderer;
 		public static Sound Sound;
+		public static bool HasInputFocus = false;
 
 		public static string EngineVersion { get; private set; }
 		public static LocalPlayerProfile LocalPlayerProfile;
@@ -61,13 +60,13 @@ namespace OpenRA
 
 		public static event Action OnShellmapLoaded = () => { };
 
-		public static OrderManager JoinServer(ConnectionTarget endpoint, string password, bool recordReplay = true)
+		public static OrderManager JoinServer(string host, int port, string password, bool recordReplay = true)
 		{
-			var connection = new NetworkConnection(endpoint);
+			var connection = new NetworkConnection(host, port);
 			if (recordReplay)
 				connection.StartRecording(() => { return TimestampedFilename(); });
 
-			var om = new OrderManager(endpoint, password, connection);
+			var om = new OrderManager(host, port, password, connection);
 			JoinInner(om);
 			return om;
 		}
@@ -88,12 +87,12 @@ namespace OpenRA
 
 		public static void JoinReplay(string replayFile)
 		{
-			JoinInner(new OrderManager(new ConnectionTarget(), "", new ReplayConnection(replayFile)));
+			JoinInner(new OrderManager("<no server>", -1, "", new ReplayConnection(replayFile)));
 		}
 
 		static void JoinLocal()
 		{
-			JoinInner(new OrderManager(new ConnectionTarget(), "", new EchoConnection()));
+			JoinInner(new OrderManager("<no server>", -1, "", new EchoConnection()));
 		}
 
 		// More accurate replacement for Environment.TickCount
@@ -104,14 +103,14 @@ namespace OpenRA
 		public static int NetFrameNumber { get { return OrderManager.NetFrameNumber; } }
 		public static int LocalTick { get { return OrderManager.LocalFrameNumber; } }
 
-		public static event Action<ConnectionTarget> OnRemoteDirectConnect = _ => { };
+		public static event Action<string, int> OnRemoteDirectConnect = (a, b) => { };
 		public static event Action<OrderManager> ConnectionStateChanged = _ => { };
 		static ConnectionState lastConnectionState = ConnectionState.PreConnecting;
 		public static int LocalClientId { get { return OrderManager.Connection.LocalClientId; } }
 
-		public static void RemoteDirectConnect(ConnectionTarget endpoint)
+		public static void RemoteDirectConnect(string host, int port)
 		{
-			OnRemoteDirectConnect(endpoint);
+			OnRemoteDirectConnect(host, port);
 		}
 
 		// Hacky workaround for orderManager visibility
@@ -233,7 +232,7 @@ namespace OpenRA
 
 			LobbyInfoChanged += lobbyReady;
 
-			om = JoinServer(CreateLocalServer(mapUID), "");
+			om = JoinServer(IPAddress.Loopback.ToString(), CreateLocalServer(mapUID), "");
 		}
 
 		public static bool IsHost
@@ -265,7 +264,7 @@ namespace OpenRA
 		static void Initialize(Arguments args)
 		{
 			var supportDirArg = args.GetValue("Engine.SupportDir", null);
-			if (!string.IsNullOrEmpty(supportDirArg))
+			if (supportDirArg != null)
 				Platform.OverrideSupportDir(supportDirArg);
 
 			Console.WriteLine("Platform is {0}", Platform.CurrentPlatform);
@@ -301,7 +300,6 @@ namespace OpenRA
 			Log.AddChannel("graphics", "graphics.log");
 			Log.AddChannel("geoip", "geoip.log");
 			Log.AddChannel("nat", "nat.log");
-			Log.AddChannel("client", "client.log");
 
 			var platforms = new[] { Settings.Game.Platform, "Default", null };
 			foreach (var p in platforms)
@@ -338,6 +336,8 @@ namespace OpenRA
 				}
 			}
 
+			GeoIP.Initialize();
+
 			if (Settings.Server.DiscoverNatDevices)
 				discoverNat = UPnP.DiscoverNatDevices(Settings.Server.NatDiscoveryTimeout);
 
@@ -351,8 +351,6 @@ namespace OpenRA
 			foreach (var mod in Mods)
 				Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Metadata.Title, mod.Value.Metadata.Version);
 
-			modLaunchWrapper = args.GetValue("Engine.LaunchWrapper", null);
-
 			ExternalMods = new ExternalMods();
 
 			Manifest currentMod;
@@ -385,7 +383,7 @@ namespace OpenRA
 			LobbyInfoChanged = () => { };
 			ConnectionStateChanged = om => { };
 			BeforeGameStart = () => { };
-			OnRemoteDirectConnect = endpoint => { };
+			OnRemoteDirectConnect = (a, b) => { };
 			delayedActions = new ActionQueue();
 
 			Ui.ResetAll();
@@ -435,11 +433,28 @@ namespace OpenRA
 			if (Cursor != null)
 				Cursor.Dispose();
 
-			Cursor = new CursorManager(ModData.CursorProvider);
+			if (Settings.Graphics.HardwareCursors)
+			{
+				try
+				{
+					Cursor = new HardwareCursor(ModData.CursorProvider);
+				}
+				catch (Exception e)
+				{
+					Log.Write("debug", "Failed to initialize hardware cursors. Falling back to software cursors.");
+					Log.Write("debug", "Error was: " + e.Message);
+
+					Console.WriteLine("Failed to initialize hardware cursors. Falling back to software cursors.");
+					Console.WriteLine("Error was: " + e.Message);
+
+					Cursor = new SoftwareCursor(ModData.CursorProvider);
+				}
+			}
+			else
+				Cursor = new SoftwareCursor(ModData.CursorProvider);
 
 			PerfHistory.Items["render"].HasNormalTick = false;
 			PerfHistory.Items["batches"].HasNormalTick = false;
-			PerfHistory.Items["render_world"].HasNormalTick = false;
 			PerfHistory.Items["render_widgets"].HasNormalTick = false;
 			PerfHistory.Items["render_flip"].HasNormalTick = false;
 
@@ -494,15 +509,8 @@ namespace OpenRA
 		{
 			try
 			{
-				var path = mod.LaunchPath;
 				var args = launchArguments != null ? mod.LaunchArgs.Append(launchArguments) : mod.LaunchArgs;
-				if (modLaunchWrapper != null)
-				{
-					path = modLaunchWrapper;
-					args = new[] { mod.LaunchPath }.Concat(args);
-				}
-
-				var p = Process.Start(path, args.Select(a => "\"" + a + "\"").JoinWith(" "));
+				var p = Process.Start(mod.LaunchPath, args.Select(a => "\"" + a + "\"").JoinWith(" "));
 				if (p == null || p.HasExited)
 					onFailed();
 				else
@@ -542,7 +550,7 @@ namespace OpenRA
 				var path = Path.Combine(directory, string.Concat(filename, ".png"));
 				Log.Write("debug", "Taking screenshot " + path);
 
-				Renderer.SaveScreenshot(path);
+				Renderer.Context.SaveScreenshot(path);
 				Debug("Saved screenshot " + filename);
 			}
 		}
@@ -618,7 +626,7 @@ namespace OpenRA
 
 		static void LogicTick()
 		{
-			PerformDelayedActions();
+			delayedActions.PerformActions(RunTime);
 
 			if (OrderManager.Connection.ConnectionState != lastConnectionState)
 			{
@@ -631,11 +639,6 @@ namespace OpenRA
 				InnerLogicTick(worldRenderer.World.OrderManager);
 		}
 
-		public static void PerformDelayedActions()
-		{
-			delayedActions.PerformActions(RunTime);
-		}
-
 		public static void TakeScreenshot()
 		{
 			takeScreenshot = true;
@@ -647,39 +650,24 @@ namespace OpenRA
 			{
 				++RenderFrame;
 
-				// Prepare renderables (i.e. render voxels) before calling BeginFrame
-				using (new PerfSample("render_prepare"))
-				{
-					Renderer.WorldModelRenderer.BeginFrame();
-
-					// World rendering is disabled while the loading screen is displayed
-					if (worldRenderer != null && !worldRenderer.World.IsLoadingGameSave)
-					{
-						worldRenderer.Viewport.Tick();
-						worldRenderer.PrepareRenderables();
-					}
-
-					Ui.PrepareRenderables();
-					Renderer.WorldModelRenderer.EndFrame();
-				}
-
 				// worldRenderer is null during the initial install/download screen
-				// World rendering is disabled while the loading screen is displayed
-				// Use worldRenderer.World instead of OrderManager.World to avoid a rendering mismatch while processing orders
-				if (worldRenderer != null && !worldRenderer.World.IsLoadingGameSave)
+				if (worldRenderer != null)
 				{
-					Renderer.BeginWorld(worldRenderer.Viewport.Rectangle);
+					Renderer.BeginFrame(worldRenderer.Viewport.TopLeft, worldRenderer.Viewport.Zoom);
 					Sound.SetListenerPosition(worldRenderer.Viewport.CenterPosition);
-					using (new PerfSample("render_world"))
+
+					// Use worldRenderer.World instead of OrderManager.World to avoid a rendering mismatch while processing orders
+					if (!worldRenderer.World.IsLoadingGameSave)
 						worldRenderer.Draw();
 				}
+				else
+					Renderer.BeginFrame(int2.Zero, 1f);
 
 				using (new PerfSample("render_widgets"))
 				{
-					Renderer.BeginUI();
-
-					if (worldRenderer != null && !worldRenderer.World.IsLoadingGameSave)
-						worldRenderer.DrawAnnotations();
+					Renderer.WorldModelRenderer.BeginFrame();
+					Ui.PrepareRenderables();
+					Renderer.WorldModelRenderer.EndFrame();
 
 					Ui.Draw();
 
@@ -707,7 +695,6 @@ namespace OpenRA
 
 			PerfHistory.Items["render"].Tick();
 			PerfHistory.Items["batches"].Tick();
-			PerfHistory.Items["render_world"].Tick();
 			PerfHistory.Items["render_widgets"].Tick();
 			PerfHistory.Items["render_flip"].Tick();
 		}
@@ -755,7 +742,6 @@ namespace OpenRA
 			var nextLogic = RunTime;
 			var nextRender = RunTime;
 			var forcedNextRender = RunTime;
-			var renderBeforeNextTick = false;
 
 			while (state == RunStatus.Running)
 			{
@@ -784,9 +770,9 @@ namespace OpenRA
 				var nextUpdate = Math.Min(nextLogic, nextRender);
 				if (now >= nextUpdate)
 				{
-					var forceRender = renderBeforeNextTick || now >= forcedNextRender;
+					var forceRender = now >= forcedNextRender;
 
-					if (now >= nextLogic && !renderBeforeNextTick)
+					if (now >= nextLogic)
 					{
 						nextLogic += logicInterval;
 
@@ -794,7 +780,7 @@ namespace OpenRA
 
 						// Force at least one render per tick during regular gameplay
 						if (OrderManager.World != null && !OrderManager.World.IsLoadingGameSave && !OrderManager.World.IsReplay)
-							renderBeforeNextTick = true;
+							forceRender = true;
 					}
 
 					var haveSomeTimeUntilNextLogic = now < nextLogic;
@@ -813,7 +799,6 @@ namespace OpenRA
 						forcedNextRender = now + maxRenderInterval;
 
 						RenderTick();
-						renderBeforeNextTick = false;
 					}
 				}
 				else
@@ -858,11 +843,6 @@ namespace OpenRA
 			state = RunStatus.Success;
 		}
 
-		public static void AddSystemLine(string text)
-		{
-			AddSystemLine("Battlefield Control", text);
-		}
-
 		public static void AddSystemLine(string name, string text)
 		{
 			OrderManager.AddChatLine(name, systemMessageColor, text, systemMessageColor);
@@ -899,19 +879,12 @@ namespace OpenRA
 			return ModData.ObjectCreator.CreateObject<T>(name);
 		}
 
-		public static ConnectionTarget CreateServer(ServerSettings settings)
+		public static void CreateServer(ServerSettings settings)
 		{
-			var endpoints = new List<IPEndPoint>
-			{
-				new IPEndPoint(IPAddress.IPv6Any, settings.ListenPort),
-				new IPEndPoint(IPAddress.Any, settings.ListenPort)
-			};
-			server = new Server.Server(endpoints, settings, ModData, ServerType.Multiplayer);
-
-			return server.GetEndpointForLocalConnection();
+			server = new Server.Server(new IPEndPoint(IPAddress.Any, settings.ListenPort), settings, ModData, false);
 		}
 
-		public static ConnectionTarget CreateLocalServer(string map)
+		public static int CreateLocalServer(string map)
 		{
 			var settings = new ServerSettings()
 			{
@@ -920,14 +893,9 @@ namespace OpenRA
 				AdvertiseOnline = false
 			};
 
-			var endpoints = new List<IPEndPoint>
-			{
-				new IPEndPoint(IPAddress.IPv6Loopback, 0),
-				new IPEndPoint(IPAddress.Loopback, 0)
-			};
-			server = new Server.Server(endpoints, settings, ModData, ServerType.Local);
+			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0), settings, ModData, false);
 
-			return server.GetEndpointForLocalConnection();
+			return server.Port;
 		}
 
 		public static bool IsCurrentWorld(World world)

OpenRA.Game/GameInformation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/GameRules/ActorInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -44,11 +44,7 @@ namespace OpenRA
 				{
 					try
 					{
-						// HACK: The linter does not want to crash when a trait doesn't exist but only print an error instead
-						// LoadTraitInfo will only return null to signal us to abort here if the linter is running
-						var trait = LoadTraitInfo(creator, t.Key.Split('@')[0], t.Value);
-						if (trait != null)
-							traits.Add(trait);
+						traits.Add(LoadTraitInfo(creator, t.Key.Split('@')[0], t.Value));
 					}
 					catch (FieldLoader.MissingFieldsException e)
 					{
@@ -77,13 +73,7 @@ namespace OpenRA
 			if (!string.IsNullOrEmpty(my.Value))
 				throw new YamlException("Junk value `{0}` on trait node {1}"
 				.F(my.Value, traitName));
-
-			// HACK: The linter does not want to crash when a trait doesn't exist but only print an error instead
-			// ObjectCreator will only return null to signal us to abort here if the linter is running
 			var info = creator.CreateObject<ITraitInfo>(traitName + "Info");
-			if (info == null)
-				return null;
-
 			try
 			{
 				FieldLoader.Load(info, my);

OpenRA.Game/GameRules/MusicInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/GameRules/Ruleset.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/GameRules/SoundInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/GameRules/WeaponInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -33,37 +33,6 @@ namespace OpenRA.GameRules
 		public Target GuidedTarget;
 	}
 
-	public class WarheadArgs
-	{
-		public WeaponInfo Weapon;
-		public int[] DamageModifiers = { };
-		public WPos? Source;
-		public Actor SourceActor;
-		public Target WeaponTarget;
-
-		public WarheadArgs(ProjectileArgs args)
-		{
-			Weapon = args.Weapon;
-			DamageModifiers = args.DamageModifiers;
-			Source = args.Source;
-			SourceActor = args.SourceActor;
-			WeaponTarget = args.GuidedTarget;
-		}
-
-		// For places that only want to update some of the fields (usually DamageModifiers)
-		public WarheadArgs(WarheadArgs args)
-		{
-			Weapon = args.Weapon;
-			DamageModifiers = args.DamageModifiers;
-			Source = args.Source;
-			SourceActor = args.SourceActor;
-			WeaponTarget = args.WeaponTarget;
-		}
-
-		// Default empty constructor for callers that want to initialize fields themselves
-		public WarheadArgs() { }
-	}
-
 	public interface IProjectile : IEffect { }
 	public interface IProjectileInfo { IProjectile Create(ProjectileArgs args); }
 
@@ -208,33 +177,17 @@ namespace OpenRA.GameRules
 		}
 
 		/// <summary>Applies all the weapon's warheads to the target.</summary>
-		public void Impact(Target target, WarheadArgs args)
+		public void Impact(Target target, Actor firedBy, IEnumerable<int> damageModifiers)
 		{
-			var world = args.SourceActor.World;
 			foreach (var warhead in Warheads)
 			{
-				if (warhead.Delay > 0)
-					world.AddFrameEndTask(w => w.Add(new DelayedImpact(warhead.Delay, warhead, target, args)));
+				var wh = warhead; // force the closure to bind to the current warhead
+
+				if (wh.Delay > 0)
+					firedBy.World.AddFrameEndTask(w => w.Add(new DelayedImpact(wh.Delay, wh, target, firedBy, damageModifiers)));
 				else
-					warhead.DoImpact(target, args);
+					wh.DoImpact(target, firedBy, damageModifiers);
 			}
 		}
-
-		/// <summary>Applies all the weapon's warheads to the target. Only use for projectile-less, special-case impacts.</summary>
-		public void Impact(Target target, Actor firedBy)
-		{
-			// The impact will happen immediately at target.CenterPosition.
-			var args = new WarheadArgs
-			{
-				Weapon = this,
-				SourceActor = firedBy,
-				WeaponTarget = target
-			};
-
-			if (firedBy.OccupiesSpace != null)
-				args.Source = firedBy.CenterPosition;
-
-			Impact(target, args);
-		}
 	}
 }

OpenRA.Game/GameSpeed.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Graphics/Animation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -23,7 +23,7 @@ namespace OpenRA.Graphics
 		public bool IsDecoration { get; set; }
 
 		readonly SequenceProvider sequenceProvider;
-		readonly Func<WAngle> facingFunc;
+		readonly Func<int> facingFunc;
 		readonly Func<bool> paused;
 
 		int frame;
@@ -33,15 +33,15 @@ namespace OpenRA.Graphics
 		Action tickFunc = () => { };
 
 		public Animation(World world, string name)
-			: this(world, name, () => WAngle.Zero) { }
+			: this(world, name, () => 0) { }
 
-		public Animation(World world, string name, Func<WAngle> facingFunc)
+		public Animation(World world, string name, Func<int> facingFunc)
 			: this(world, name, facingFunc, null) { }
 
 		public Animation(World world, string name, Func<bool> paused)
-			: this(world, name, () => WAngle.Zero, paused) { }
+			: this(world, name, () => 0, paused) { }
 
-		public Animation(World world, string name, Func<WAngle> facingFunc, Func<bool> paused)
+		public Animation(World world, string name, Func<int> facingFunc, Func<bool> paused)
 		{
 			sequenceProvider = world.Map.Rules.Sequences;
 			Name = name.ToLowerInvariant();
@@ -66,23 +66,6 @@ namespace OpenRA.Graphics
 			return new IRenderable[] { imageRenderable };
 		}
 
-		public IRenderable[] RenderUI(WorldRenderer wr, int2 pos, WVec offset, int zOffset, PaletteReference palette, float scale)
-		{
-			var screenOffset = (scale * wr.ScreenVectorComponents(offset)).XY.ToInt2();
-			var imagePos = pos + screenOffset - new int2((int)(scale * Image.Size.X / 2), (int)(scale * Image.Size.Y / 2));
-			var imageRenderable = new UISpriteRenderable(Image, WPos.Zero + offset, imagePos, CurrentSequence.ZOffset + zOffset, palette, scale);
-
-			if (CurrentSequence.ShadowStart >= 0)
-			{
-				var shadow = CurrentSequence.GetShadow(CurrentFrame, facingFunc());
-				var shadowPos = pos - new int2((int)(scale * shadow.Size.X / 2), (int)(scale * shadow.Size.Y / 2));
-				var shadowRenderable = new UISpriteRenderable(shadow, WPos.Zero + offset, shadowPos, CurrentSequence.ShadowZOffset + zOffset, palette, scale);
-				return new IRenderable[] { shadowRenderable, imageRenderable };
-			}
-
-			return new IRenderable[] { imageRenderable };
-		}
-
 		public Rectangle ScreenBounds(WorldRenderer wr, WPos pos, WVec offset, float scale)
 		{
 			var xy = wr.ScreenPxPosition(pos) + wr.ScreenPxOffset(offset);

OpenRA.Game/Graphics/AnimationWithOffset.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Graphics/ChromeProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -9,142 +9,81 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.FileSystem;
-using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
-	[Flags]
-	public enum PanelSides
-	{
-		Left = 1,
-		Top = 2,
-		Right = 4,
-		Bottom = 8,
-		Center = 16,
-
-		Edges = Left | Top | Right | Bottom,
-		All = Edges | Center,
-	}
-
-	public static class PanelSidesExts
-	{
-		public static bool HasSide(this PanelSides self, PanelSides m)
-		{
-			// PERF: Enum.HasFlag is slower and requires allocations.
-			return (self & m) == m;
-		}
-	}
-
 	public static class ChromeProvider
 	{
-		public class Collection
+		struct Collection
 		{
-			public readonly string Image = null;
-			public readonly string Image2x = null;
-			public readonly string Image3x = null;
-
-			public readonly int[] PanelRegion = null;
-			public readonly PanelSides PanelSides = PanelSides.All;
-			public readonly Dictionary<string, Rectangle> Regions = new Dictionary<string, Rectangle>();
+			public string Src;
+			public Dictionary<string, MappedImage> Regions;
 		}
 
-		public static IReadOnlyDictionary<string, Collection> Collections { get; private set; }
 		static Dictionary<string, Collection> collections;
-		static Dictionary<string, Pair<Sheet, int>> cachedSheets;
+		static Dictionary<string, Sheet> cachedSheets;
 		static Dictionary<string, Dictionary<string, Sprite>> cachedSprites;
-		static Dictionary<string, Sprite[]> cachedPanelSprites;
-		static Dictionary<Collection, Pair<Sheet, int>> cachedCollectionSheets;
-
 		static IReadOnlyFileSystem fileSystem;
-		static float dpiScale = 1;
 
 		public static void Initialize(ModData modData)
 		{
 			Deinitialize();
 
-			// Load higher resolution images if available on HiDPI displays
-			if (Game.Renderer != null)
-				dpiScale = Game.Renderer.WindowScale;
-
 			fileSystem = modData.DefaultFileSystem;
 			collections = new Dictionary<string, Collection>();
-			cachedSheets = new Dictionary<string, Pair<Sheet, int>>();
+			cachedSheets = new Dictionary<string, Sheet>();
 			cachedSprites = new Dictionary<string, Dictionary<string, Sprite>>();
-			cachedPanelSprites = new Dictionary<string, Sprite[]>();
-			cachedCollectionSheets = new Dictionary<Collection, Pair<Sheet, int>>();
-
-			Collections = new ReadOnlyDictionary<string, Collection>(collections);
 
 			var chrome = MiniYaml.Merge(modData.Manifest.Chrome
 				.Select(s => MiniYaml.FromStream(fileSystem.Open(s), s)));
 
 			foreach (var c in chrome)
-				if (!c.Key.StartsWith("^", StringComparison.Ordinal))
-					LoadCollection(c.Key, c.Value);
+				LoadCollection(c.Key, c.Value);
 		}
 
 		public static void Deinitialize()
 		{
 			if (cachedSheets != null)
 				foreach (var sheet in cachedSheets.Values)
-					sheet.First.Dispose();
+					sheet.Dispose();
 
 			collections = null;
 			cachedSheets = null;
 			cachedSprites = null;
-			cachedPanelSprites = null;
-			cachedCollectionSheets = null;
+		}
+
+		public static void Save(string file)
+		{
+			var root = new List<MiniYamlNode>();
+			foreach (var kv in collections)
+				root.Add(new MiniYamlNode(kv.Key, SaveCollection(kv.Value)));
+
+			root.WriteToFile(file);
+		}
+
+		static MiniYaml SaveCollection(Collection collection)
+		{
+			var root = new List<MiniYamlNode>();
+			foreach (var kv in collection.Regions)
+				root.Add(new MiniYamlNode(kv.Key, kv.Value.Save(collection.Src)));
+
+			return new MiniYaml(collection.Src, root);
 		}
 
 		static void LoadCollection(string name, MiniYaml yaml)
 		{
 			if (Game.ModData.LoadScreen != null)
 				Game.ModData.LoadScreen.Display();
-
-			collections.Add(name, FieldLoader.Load<Collection>(yaml));
-		}
-
-		static Pair<Sheet, int> SheetForCollection(Collection c)
-		{
-			Pair<Sheet, int> sheetDensity;
-
-			// Outer cache avoids recalculating image names
-			if (!cachedCollectionSheets.TryGetValue(c, out sheetDensity))
+			var collection = new Collection()
 			{
-				var image = c.Image;
-				var density = 1;
-				if (dpiScale > 2 && !string.IsNullOrEmpty(c.Image3x))
-				{
-					image = c.Image3x;
-					density = 3;
-				}
-				else if (dpiScale > 1 && !string.IsNullOrEmpty(c.Image2x))
-				{
-					image = c.Image2x;
-					density = 2;
-				}
+				Src = yaml.Value,
+				Regions = yaml.Nodes.ToDictionary(n => n.Key, n => new MappedImage(yaml.Value, n.Value))
+			};
 
-				// Inner cache makes sure we share sheets between collections
-				if (!cachedSheets.TryGetValue(image, out sheetDensity))
-				{
-					Sheet sheet;
-					using (var stream = fileSystem.Open(image))
-						sheet = new Sheet(SheetType.BGRA, stream);
-
-					sheet.GetTexture().ScaleFilter = TextureScaleFilter.Linear;
-
-					sheetDensity = Pair.New(sheet, density);
-					cachedSheets.Add(image, sheetDensity);
-				}
-
-				cachedCollectionSheets.Add(c, sheetDensity);
-			}
-
-			return sheetDensity;
+			collections.Add(name, collection);
 		}
 
 		public static Sprite GetImage(string collectionName, string imageName)
@@ -165,130 +104,33 @@ namespace OpenRA.Graphics
 				return null;
 			}
 
-			Rectangle mi;
+			MappedImage mi;
 			if (!collection.Regions.TryGetValue(imageName, out mi))
 				return null;
 
+			// Cached sheet
+			Sheet sheet;
+			if (cachedSheets.ContainsKey(mi.Src))
+				sheet = cachedSheets[mi.Src];
+			else
+			{
+				using (var stream = fileSystem.Open(mi.Src))
+					sheet = new Sheet(SheetType.BGRA, stream);
+
+				cachedSheets.Add(mi.Src, sheet);
+			}
+
 			// Cache the sprite
-			var sheetDensity = SheetForCollection(collection);
 			if (cachedCollection == null)
 			{
 				cachedCollection = new Dictionary<string, Sprite>();
 				cachedSprites.Add(collectionName, cachedCollection);
 			}
 
-			var image = new Sprite(sheetDensity.First, sheetDensity.Second * mi, TextureChannel.RGBA, 1f / sheetDensity.Second);
+			var image = mi.GetImage(sheet);
 			cachedCollection.Add(imageName, image);
 
 			return image;
 		}
-
-		public static Sprite[] GetPanelImages(string collectionName)
-		{
-			if (string.IsNullOrEmpty(collectionName))
-				return null;
-
-			// Cached sprite
-			Sprite[] cachedSprites;
-			if (cachedPanelSprites.TryGetValue(collectionName, out cachedSprites))
-				return cachedSprites;
-
-			Collection collection;
-			if (!collections.TryGetValue(collectionName, out collection))
-			{
-				Log.Write("debug", "Could not find collection '{0}'", collectionName);
-				return null;
-			}
-
-			Sprite[] sprites;
-			if (collection.PanelRegion != null)
-			{
-				if (collection.PanelRegion.Length != 8)
-				{
-					Log.Write("debug", "Collection '{0}' does not define a valid PanelRegion", collectionName);
-					return null;
-				}
-
-				// Cache the sprites
-				var sheetDensity = SheetForCollection(collection);
-				var pr = collection.PanelRegion;
-				var ps = collection.PanelSides;
-
-				var sides = new[]
-				{
-					Pair.New(PanelSides.Top | PanelSides.Left, new Rectangle(pr[0], pr[1], pr[2], pr[3])),
-					Pair.New(PanelSides.Top, new Rectangle(pr[0] + pr[2], pr[1], pr[4], pr[3])),
-					Pair.New(PanelSides.Top | PanelSides.Right, new Rectangle(pr[0] + pr[2] + pr[4], pr[1], pr[6], pr[3])),
-					Pair.New(PanelSides.Left, new Rectangle(pr[0], pr[1] + pr[3], pr[2], pr[5])),
-					Pair.New(PanelSides.Center, new Rectangle(pr[0] + pr[2], pr[1] + pr[3], pr[4], pr[5])),
-					Pair.New(PanelSides.Right, new Rectangle(pr[0] + pr[2] + pr[4], pr[1] + pr[3], pr[6], pr[5])),
-					Pair.New(PanelSides.Bottom | PanelSides.Left, new Rectangle(pr[0], pr[1] + pr[3] + pr[5], pr[2], pr[7])),
-					Pair.New(PanelSides.Bottom, new Rectangle(pr[0] + pr[2], pr[1] + pr[3] + pr[5], pr[4], pr[7])),
-					Pair.New(PanelSides.Bottom | PanelSides.Right, new Rectangle(pr[0] + pr[2] + pr[4], pr[1] + pr[3] + pr[5], pr[6], pr[7]))
-				};
-
-				sprites = sides.Select(x => ps.HasSide(x.First) ? new Sprite(sheetDensity.First, sheetDensity.Second * x.Second, TextureChannel.RGBA, 1f / sheetDensity.Second) : null)
-					.ToArray();
-			}
-			else
-			{
-				// Support manual definitions for unusual dialog layouts
-				sprites = new[]
-				{
-					GetImage(collectionName, "corner-tl"),
-					GetImage(collectionName, "border-t"),
-					GetImage(collectionName, "corner-tr"),
-					GetImage(collectionName, "border-l"),
-					GetImage(collectionName, "background"),
-					GetImage(collectionName, "border-r"),
-					GetImage(collectionName, "corner-bl"),
-					GetImage(collectionName, "border-b"),
-					GetImage(collectionName, "corner-br")
-				};
-			}
-
-			cachedPanelSprites.Add(collectionName, sprites);
-			return sprites;
-		}
-
-		public static Size GetMinimumPanelSize(string collectionName)
-		{
-			if (string.IsNullOrEmpty(collectionName))
-				return new Size(0, 0);
-
-			Collection collection;
-			if (!collections.TryGetValue(collectionName, out collection))
-			{
-				Log.Write("debug", "Could not find collection '{0}'", collectionName);
-				return new Size(0, 0);
-			}
-
-			if (collection.PanelRegion == null || collection.PanelRegion.Length != 8)
-			{
-				Log.Write("debug", "Collection '{0}' does not define a valid PanelRegion", collectionName);
-				return new Size(0, 0);
-			}
-
-			var pr = collection.PanelRegion;
-			return new Size(pr[2] + pr[6], pr[3] + pr[7]);
-		}
-
-		public static void SetDPIScale(float scale)
-		{
-			if (dpiScale == scale)
-				return;
-
-			dpiScale = scale;
-
-			// Clear the sprite caches so the new artwork can be loaded
-			// Sheets are not cleared: we assume that the extra memory overhead
-			// of having the same sheet in memory in multiple DPIs is better than
-			// the overhead of having to dispose and reload everything.
-			// Changing the DPI scale is rare, but if it does happen then there
-			// is a reasonable chance that it may happen again this session.
-			cachedSprites.Clear();
-			cachedPanelSprites.Clear();
-			cachedCollectionSheets.Clear();
-		}
 	}
 }

OpenRA.Game/Graphics/CursorManager.cs

@@ -1,299 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2020 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 OpenRA.Primitives;
-
-namespace OpenRA.Graphics
-{
-	public sealed class CursorManager
-	{
-		class Cursor
-		{
-			public string Name;
-			public int2 PaddedSize;
-			public Rectangle Bounds;
-
-			public int Length;
-			public Sprite[] Sprites;
-			public IHardwareCursor[] Cursors;
-		}
-
-		readonly Dictionary<string, Cursor> cursors = new Dictionary<string, Cursor>();
-		readonly SheetBuilder sheetBuilder;
-		readonly GraphicSettings graphicSettings;
-
-		Cursor cursor;
-		bool isLocked = false;
-		int2 lockedPosition;
-		bool hardwareCursorsDisabled = false;
-		bool hardwareCursorsDoubled = false;
-
-		public CursorManager(CursorProvider cursorProvider)
-		{
-			hardwareCursorsDisabled = Game.Settings.Graphics.DisableHardwareCursors;
-
-			graphicSettings = Game.Settings.Graphics;
-			sheetBuilder = new SheetBuilder(SheetType.BGRA);
-			foreach (var kv in cursorProvider.Cursors)
-			{
-				var frames = kv.Value.Frames;
-				var palette = !string.IsNullOrEmpty(kv.Value.Palette) ? cursorProvider.Palettes[kv.Value.Palette] : null;
-
-				var c = new Cursor
-				{
-					Name = kv.Key,
-					Bounds = Rectangle.FromLTRB(0, 0, 1, 1),
-
-					Length = 0,
-					Sprites = new Sprite[frames.Length],
-					Cursors = new IHardwareCursor[frames.Length]
-				};
-
-				// Hardware cursors have a number of odd platform-specific bugs/limitations.
-				// Reduce the number of edge cases by padding the individual frames such that:
-				// - the hotspot is inside the frame bounds (enforced by SDL)
-				// - all frames within a sequence have the same size (needed for macOS 10.15)
-				// - the frame size is a multiple of 8 (needed for Windows)
-				foreach (var f in frames)
-				{
-					// Hotspot is specified relative to the center of the frame
-					var hotspot = f.Offset.ToInt2() - kv.Value.Hotspot - new int2(f.Size) / 2;
-
-					// SheetBuilder expects data in BGRA
-					var data = FrameToBGRA(kv.Key, f, palette);
-					c.Sprites[c.Length++] = sheetBuilder.Add(data, f.Size, 0, hotspot);
-
-					// Bounds relative to the hotspot
-					c.Bounds = Rectangle.Union(c.Bounds, new Rectangle(hotspot, f.Size));
-				}
-
-				// Pad bottom-right edge to make the frame size a multiple of 8
-				c.PaddedSize = 8 * new int2((c.Bounds.Width + 7) / 8, (c.Bounds.Height + 7) / 8);
-
-				cursors.Add(kv.Key, c);
-			}
-
-			CreateOrUpdateHardwareCursors();
-
-			foreach (var s in sheetBuilder.AllSheets)
-				s.ReleaseBuffer();
-
-			Update();
-		}
-
-		void CreateOrUpdateHardwareCursors()
-		{
-			if (hardwareCursorsDisabled)
-				return;
-
-			// Dispose any existing cursors to avoid leaking native resources
-			ClearHardwareCursors();
-
-			try
-			{
-				foreach (var kv in cursors)
-				{
-					var template = kv.Value;
-					for (var i = 0; i < template.Sprites.Length; i++)
-					{
-						if (template.Cursors[i] != null)
-							template.Cursors[i].Dispose();
-
-						// Calculate the padding to position the frame within sequenceBounds
-						var paddingTL = -(template.Bounds.Location - template.Sprites[i].Offset.XY.ToInt2());
-						var paddingBR = template.PaddedSize - new int2(template.Sprites[i].Bounds.Size) - paddingTL;
-
-						template.Cursors[i] = CreateHardwareCursor(kv.Key, template.Sprites[i], paddingTL, paddingBR, -template.Bounds.Location);
-					}
-				}
-			}
-			catch (Exception e)
-			{
-				Log.Write("debug", "Failed to initialize hardware cursors. Falling back to software cursors.");
-				Log.Write("debug", "Error was: " + e.Message);
-
-				Console.WriteLine("Failed to initialize hardware cursors. Falling back to software cursors.");
-				Console.WriteLine("Error was: " + e.Message);
-
-				ClearHardwareCursors();
-			}
-
-			hardwareCursorsDoubled = graphicSettings.CursorDouble;
-		}
-
-		public void SetCursor(string cursorName)
-		{
-			if ((cursorName == null && cursor == null) || (cursor != null && cursorName == cursor.Name))
-				return;
-
-			if (cursorName == null || !cursors.TryGetValue(cursorName, out cursor))
-				cursor = null;
-
-			Update();
-		}
-
-		int frame;
-		int ticks;
-
-		public void Tick()
-		{
-			if (hardwareCursorsDoubled != graphicSettings.CursorDouble)
-			{
-				CreateOrUpdateHardwareCursors();
-				Update();
-			}
-
-			if (cursor == null || cursor.Cursors.Length == 1)
-				return;
-
-			if (++ticks > 2)
-			{
-				ticks -= 2;
-				frame++;
-
-				Update();
-			}
-		}
-
-		void Update()
-		{
-			if (cursor != null && frame >= cursor.Cursors.Length)
-				frame %= cursor.Cursors.Length;
-
-			if (cursor == null || isLocked)
-				Game.Renderer.Window.SetHardwareCursor(null);
-			else
-				Game.Renderer.Window.SetHardwareCursor(cursor.Cursors[frame]);
-		}
-
-		public void Render(Renderer renderer)
-		{
-			// Cursor is hidden
-			if (cursor == null)
-				return;
-
-			// Hardware cursor is enabled
-			if (!isLocked && cursor.Cursors[frame % cursor.Length] != null)
-				return;
-
-			// Render cursor in software
-			var doubleCursor = graphicSettings.CursorDouble;
-			var cursorSprite = cursor.Sprites[frame % cursor.Length];
-			var cursorSize = doubleCursor ? 2.0f * cursorSprite.Size : cursorSprite.Size;
-
-			// Cursor is rendered in native window coordinates
-			// Apply same scaling rules as hardware cursors
-			if (Game.Renderer.NativeWindowScale > 1.5f)
-				cursorSize = 2 * cursorSize;
-
-			var mousePos = isLocked ? lockedPosition : Viewport.LastMousePos;
-			renderer.RgbaSpriteRenderer.DrawSprite(cursorSprite,
-				mousePos,
-				cursorSize / Game.Renderer.WindowScale);
-		}
-
-		public void Lock()
-		{
-			lockedPosition = Viewport.LastMousePos;
-			Game.Renderer.Window.SetRelativeMouseMode(true);
-			isLocked = true;
-			Update();
-		}
-
-		public void Unlock()
-		{
-			Game.Renderer.Window.SetRelativeMouseMode(false);
-			isLocked = false;
-			Update();
-		}
-
-		public static byte[] FrameToBGRA(string name, ISpriteFrame frame, ImmutablePalette palette)
-		{
-			// Data is already in BGRA format
-			if (frame.Type == SpriteFrameType.BGRA)
-				return frame.Data;
-
-			// Cursors may be either native BGRA or Indexed.
-			// Indexed sprites are converted to BGRA using the referenced palette.
-			// All palettes must be explicitly referenced, even if they are embedded in the sprite.
-			if (frame.Type == SpriteFrameType.Indexed && palette == null)
-				throw new InvalidOperationException("Cursor sequence `{0}` attempted to load an indexed sprite but does not define Palette".F(name));
-
-			var width = frame.Size.Width;
-			var height = frame.Size.Height;
-			var data = new byte[4 * width * height];
-			for (var j = 0; j < height; j++)
-			{
-				for (var i = 0; i < width; i++)
-				{
-					var bytes = BitConverter.GetBytes(palette[frame.Data[j * width + i]]);
-					var c = palette[frame.Data[j * width + i]];
-					var k = 4 * (j * width + i);
-
-					// Convert RGBA to BGRA
-					data[k] = bytes[2];
-					data[k + 1] = bytes[1];
-					data[k + 2] = bytes[0];
-					data[k + 3] = bytes[3];
-				}
-			}
-
-			return data;
-		}
-
-		IHardwareCursor CreateHardwareCursor(string name, Sprite data, int2 paddingTL, int2 paddingBR, int2 hotspot)
-		{
-			var size = data.Bounds.Size;
-			var srcStride = data.Sheet.Size.Width;
-			var srcData = data.Sheet.GetData();
-			var newWidth = paddingTL.X + size.Width + paddingBR.X;
-			var newHeight = paddingTL.Y + size.Height + paddingBR.Y;
-			var rgbaData = new byte[4 * newWidth * newHeight];
-
-			for (var j = 0; j < size.Height; j++)
-			{
-				for (var i = 0; i < size.Width; i++)
-				{
-					var src = 4 * ((j + data.Bounds.Top) * srcStride + data.Bounds.Left + i);
-					var dest = 4 * ((j + paddingTL.Y) * newWidth + i + paddingTL.X);
-					Array.Copy(srcData, src, rgbaData, dest, 4);
-				}
-			}
-
-			return Game.Renderer.Window.CreateHardwareCursor(name, new Size(newWidth, newHeight), rgbaData, hotspot, graphicSettings.CursorDouble);
-		}
-
-		void ClearHardwareCursors()
-		{
-			foreach (var c in cursors.Values)
-			{
-				for (var i = 0; i < c.Cursors.Length; i++)
-				{
-					if (c.Cursors[i] != null)
-					{
-						c.Cursors[i].Dispose();
-						c.Cursors[i] = null;
-					}
-				}
-			}
-		}
-
-		public void Dispose()
-		{
-			ClearHardwareCursors();
-
-			cursors.Clear();
-			sheetBuilder.Dispose();
-		}
-	}
-}

OpenRA.Game/Graphics/CursorProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -36,7 +36,6 @@ namespace OpenRA.Graphics
 					pals[p.Palette] = p;
 
 			Palettes = nodesDict["Cursors"].Nodes.Select(n => n.Value.Value)
-				.Where(p => p != null)
 				.Distinct()
 				.ToDictionary(p => p, p => pals[p].ReadPalette(modData.DefaultFileSystem))
 				.AsReadOnly();
@@ -50,6 +49,8 @@ namespace OpenRA.Graphics
 			Cursors = cursors.AsReadOnly();
 		}
 
+		public static bool CursorViewportZoomed { get { return Game.Settings.Graphics.CursorDouble && Game.Settings.Graphics.PixelDouble; } }
+
 		public bool HasCursorSequence(string cursor)
 		{
 			return Cursors.ContainsKey(cursor);

OpenRA.Game/Graphics/CursorSequence.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Graphics/HardwareCursor.cs

@@ -0,0 +1,192 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2019 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.Linq;
+using OpenRA.Primitives;
+
+namespace OpenRA.Graphics
+{
+	public sealed class HardwareCursor : ICursor
+	{
+		readonly Dictionary<string, IHardwareCursor[]> hardwareCursors = new Dictionary<string, IHardwareCursor[]>();
+		readonly CursorProvider cursorProvider;
+		readonly Dictionary<string, Sprite[]> sprites = new Dictionary<string, Sprite[]>();
+		readonly SheetBuilder sheetBuilder;
+		readonly HardwarePalette hardwarePalette = new HardwarePalette();
+		readonly Cache<string, PaletteReference> paletteReferences;
+
+		CursorSequence cursor;
+		bool isLocked = false;
+		int2 lockedPosition;
+
+		public HardwareCursor(CursorProvider cursorProvider)
+		{
+			this.cursorProvider = cursorProvider;
+
+			paletteReferences = new Cache<string, PaletteReference>(CreatePaletteReference);
+			foreach (var p in cursorProvider.Palettes)
+				hardwarePalette.AddPalette(p.Key, p.Value, false);
+
+			hardwarePalette.Initialize();
+
+			sheetBuilder = new SheetBuilder(SheetType.Indexed);
+			foreach (var kv in cursorProvider.Cursors)
+			{
+				var palette = cursorProvider.Palettes[kv.Value.Palette];
+				var hc = kv.Value.Frames
+					.Select(f => CreateCursor(f, palette, kv.Key, kv.Value))
+					.ToArray();
+
+				hardwareCursors.Add(kv.Key, hc);
+
+				var s = kv.Value.Frames.Select(a => sheetBuilder.Add(a)).ToArray();
+				sprites.Add(kv.Key, s);
+			}
+
+			sheetBuilder.Current.ReleaseBuffer();
+
+			Update();
+		}
+
+		PaletteReference CreatePaletteReference(string name)
+		{
+			var pal = hardwarePalette.GetPalette(name);
+			return new PaletteReference(name, hardwarePalette.GetPaletteIndex(name), pal, hardwarePalette);
+		}
+
+		IHardwareCursor CreateCursor(ISpriteFrame f, ImmutablePalette palette, string name, CursorSequence sequence)
+		{
+			var hotspot = sequence.Hotspot - f.Offset.ToInt2() + new int2(f.Size) / 2;
+
+			// Expand the frame if required to include the hotspot
+			var frameWidth = f.Size.Width;
+			var dataWidth = f.Size.Width;
+			var dataX = 0;
+			if (hotspot.X < 0)
+			{
+				dataX = -hotspot.X;
+				dataWidth += dataX;
+				hotspot = hotspot.WithX(0);
+			}
+			else if (hotspot.X >= frameWidth)
+				dataWidth = hotspot.X + 1;
+
+			var frameHeight = f.Size.Height;
+			var dataHeight = f.Size.Height;
+			var dataY = 0;
+			if (hotspot.Y < 0)
+			{
+				dataY = -hotspot.Y;
+				dataHeight += dataY;
+				hotspot = hotspot.WithY(0);
+			}
+			else if (hotspot.Y >= frameHeight)
+				dataHeight = hotspot.Y + 1;
+
+			var data = new byte[4 * dataWidth * dataHeight];
+			for (var j = 0; j < frameHeight; j++)
+			{
+				for (var i = 0; i < frameWidth; i++)
+				{
+					var bytes = BitConverter.GetBytes(palette[f.Data[j * frameWidth + i]]);
+					var start = 4 * ((j + dataY) * dataWidth + dataX + i);
+					for (var k = 0; k < 4; k++)
+						data[start + k] = bytes[k];
+				}
+			}
+
+			return Game.Renderer.Window.CreateHardwareCursor(name, new Size(dataWidth, dataHeight), data, hotspot);
+		}
+
+		public void SetCursor(string cursorName)
+		{
+			if ((cursorName == null && cursor == null) || (cursor != null && cursorName == cursor.Name))
+				return;
+
+			if (cursorName == null || !cursorProvider.Cursors.TryGetValue(cursorName, out cursor))
+				cursor = null;
+
+			Update();
+		}
+
+		int frame;
+		int ticks;
+
+		public void Tick()
+		{
+			if (cursor == null || cursor.Length == 1)
+				return;
+
+			if (++ticks > 2)
+			{
+				ticks -= 2;
+				frame++;
+
+				Update();
+			}
+		}
+
+		void Update()
+		{
+			if (cursor != null && frame >= cursor.Length)
+				frame %= cursor.Length;
+
+			if (cursor == null || isLocked)
+				Game.Renderer.Window.SetHardwareCursor(null);
+			else
+				Game.Renderer.Window.SetHardwareCursor(hardwareCursors[cursor.Name][frame]);
+		}
+
+		public void Render(Renderer renderer)
+		{
+			if (cursor.Name == null || !isLocked)
+				return;
+
+			var cursorSequence = cursorProvider.GetCursorSequence(cursor.Name);
+			var cursorSprite = sprites[cursor.Name][frame];
+
+			var cursorOffset = cursorSequence.Hotspot + (0.5f * cursorSprite.Size.XY).ToInt2();
+
+			renderer.SetPalette(hardwarePalette);
+			renderer.SpriteRenderer.DrawSprite(cursorSprite,
+				lockedPosition - cursorOffset,
+				paletteReferences[cursorSequence.Palette],
+				cursorSprite.Size);
+		}
+
+		public void Lock()
+		{
+			lockedPosition = Viewport.LastMousePos;
+			Game.Renderer.Window.SetRelativeMouseMode(true);
+			isLocked = true;
+			Update();
+		}
+
+		public void Unlock()
+		{
+			Game.Renderer.Window.SetRelativeMouseMode(false);
+			isLocked = false;
+			Update();
+		}
+
+		public void Dispose()
+		{
+			foreach (var cursors in hardwareCursors)
+				foreach (var cursor in cursors.Value)
+					cursor.Dispose();
+
+			sheetBuilder.Dispose();
+			hardwareCursors.Clear();
+		}
+	}
+}

OpenRA.Game/Graphics/HardwarePalette.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Graphics/MappedImage.cs

@@ -0,0 +1,44 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2019 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.Collections.Generic;
+using OpenRA.Primitives;
+
+namespace OpenRA.Graphics
+{
+	class MappedImage
+	{
+		readonly Rectangle rect = Rectangle.Empty;
+		public readonly string Src;
+
+		public MappedImage(string defaultSrc, MiniYaml info)
+		{
+			FieldLoader.LoadField(this, "rect", info.Value);
+			FieldLoader.Load(this, info);
+			if (Src == null)
+				Src = defaultSrc;
+		}
+
+		public Sprite GetImage(Sheet s)
+		{
+			return new Sprite(s, rect, TextureChannel.RGBA);
+		}
+
+		public MiniYaml Save(string defaultSrc)
+		{
+			var root = new List<MiniYamlNode>();
+			if (defaultSrc != Src)
+				root.Add(new MiniYamlNode("Src", Src));
+
+			return new MiniYaml(FieldSaver.FormatValue(this, GetType().GetField("rect")), root);
+		}
+	}
+}

OpenRA.Game/Graphics/Model.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Graphics/ModelAnimation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Graphics/ModelRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -64,10 +64,10 @@ namespace OpenRA.Graphics
 			shader.SetTexture("Palette", palette);
 		}
 
-		public void SetViewportParams(Size screen, int2 scroll)
+		public void SetViewportParams(Size screen, float zoom, int2 scroll)
 		{
 			var a = 2f / renderer.SheetSize;
-			var view = new[]
+			var view = new float[]
 			{
 				a, 0, 0, 0,
 				0, -a, 0, 0,

OpenRA.Game/Graphics/Palette.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Graphics/PaletteReference.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Graphics/PlatformInterfaces.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -15,16 +15,9 @@ using OpenRA.Primitives;
 
 namespace OpenRA
 {
-	public enum GLProfile
-	{
-		Modern,
-		Embedded,
-		Legacy
-	}
-
 	public interface IPlatform
 	{
-		IPlatformWindow CreateWindow(Size size, WindowMode windowMode, float scaleModifier, int batchSize, int videoDisplay, GLProfile profile);
+		IPlatformWindow CreateWindow(Size size, WindowMode windowMode, int batchSize);
 		ISoundEngine CreateSound(string device);
 		IFont CreateFont(byte[] data);
 	}
@@ -39,26 +32,16 @@ namespace OpenRA
 		Subtractive,
 		Multiply,
 		Multiplicative,
-		DoubleMultiplicative,
-		LowAdditive,
-		Screen,
-		Translucent
+		DoubleMultiplicative
 	}
 
 	public interface IPlatformWindow : IDisposable
 	{
 		IGraphicsContext Context { get; }
 
-		Size NativeWindowSize { get; }
-		Size EffectiveWindowSize { get; }
-		float NativeWindowScale { get; }
-		float EffectiveWindowScale { get; }
-		Size SurfaceSize { get; }
-		int DisplayCount { get; }
-		int CurrentDisplay { get; }
-		bool HasInputFocus { get; }
-
-		event Action<float, float, float, float> OnWindowScaleChanged;
+		Size WindowSize { get; }
+		float WindowScale { get; }
+		event Action<float, float> OnWindowScaleChanged;
 
 		void PumpInput(IInputHandler inputHandler);
 		string GetClipboardText();
@@ -67,14 +50,9 @@ namespace OpenRA
 		void GrabWindowMouseFocus();
 		void ReleaseWindowMouseFocus();
 
-		IHardwareCursor CreateHardwareCursor(string name, Size size, byte[] data, int2 hotspot, bool pixelDouble);
+		IHardwareCursor CreateHardwareCursor(string name, Size size, byte[] data, int2 hotspot);
 		void SetHardwareCursor(IHardwareCursor cursor);
 		void SetRelativeMouseMode(bool mode);
-		void SetScaleModifier(float scale);
-
-		GLProfile GLProfile { get; }
-
-		GLProfile[] SupportedGLProfiles { get; }
 	}
 
 	public interface IGraphicsContext : IDisposable
@@ -82,10 +60,10 @@ namespace OpenRA
 		IVertexBuffer<Vertex> CreateVertexBuffer(int size);
 		ITexture CreateTexture();
 		IFrameBuffer CreateFrameBuffer(Size s);
-		IFrameBuffer CreateFrameBuffer(Size s, Color clearColor);
 		IShader CreateShader(string name);
-		void EnableScissor(int x, int y, int width, int height);
+		void EnableScissor(int left, int top, int width, int height);
 		void DisableScissor();
+		void SaveScreenshot(string path);
 		void Present();
 		void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices);
 		void Clear();
@@ -93,7 +71,6 @@ namespace OpenRA
 		void DisableDepthBuffer();
 		void ClearDepthBuffer();
 		void SetBlendMode(BlendMode mode);
-		void SetVSyncEnabled(bool enabled);
 		string GLVersion { get; }
 	}
 
@@ -132,8 +109,6 @@ namespace OpenRA
 	{
 		void Bind();
 		void Unbind();
-		void EnableScissor(Rectangle rect);
-		void DisableScissor();
 		ITexture Texture { get; }
 	}
 

OpenRA.Game/Graphics/PlayerColorRemap.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Graphics/Renderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Graphics/RgbaColorRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -153,8 +153,8 @@ namespace OpenRA.Graphics
 				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 - 1 ? IntersectionOf(end + corner, dir, end + nextCorner, nextDir) : end + corner;
-				var cd = closed || i < limit - 1 ? IntersectionOf(end - corner, dir, end - nextCorner, nextDir) : end - corner;
+				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
 				vertices[0] = new Vertex(ca + Offset, r, g, b, a, 0, 0);

OpenRA.Game/Graphics/RgbaSpriteRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Graphics/SequenceProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -34,8 +34,8 @@ namespace OpenRA.Graphics
 		Rectangle Bounds { get; }
 
 		Sprite GetSprite(int frame);
-		Sprite GetSprite(int frame, WAngle facing);
-		Sprite GetShadow(int frame, WAngle facing);
+		Sprite GetSprite(int frame, int facing);
+		Sprite GetShadow(int frame, int facing);
 	}
 
 	public interface ISpriteSequenceLoader
@@ -64,7 +64,7 @@ namespace OpenRA.Graphics
 					return Load(fileSystem, additionalSequences);
 			});
 
-			spriteCache = Exts.Lazy(() => new SpriteCache(fileSystem, modData.SpriteLoaders));
+			spriteCache = Exts.Lazy(() => new SpriteCache(fileSystem, modData.SpriteLoaders, new SheetBuilder(SheetType.Indexed)));
 		}
 
 		public ISpriteSequence GetSequence(string unitName, string sequenceName)
@@ -130,21 +130,16 @@ namespace OpenRA.Graphics
 
 		public void Preload()
 		{
-			foreach (var sb in SpriteCache.SheetBuilders.Values)
-				sb.Current.CreateBuffer();
-
+			SpriteCache.SheetBuilder.Current.CreateBuffer();
 			foreach (var unitSeq in sequences.Value.Values)
 				foreach (var seq in unitSeq.Value.Values) { }
-
-			foreach (var sb in SpriteCache.SheetBuilders.Values)
-				sb.Current.ReleaseBuffer();
+			SpriteCache.SheetBuilder.Current.ReleaseBuffer();
 		}
 
 		public void Dispose()
 		{
 			if (spriteCache.IsValueCreated)
-				foreach (var sb in SpriteCache.SheetBuilders.Values)
-					sb.Dispose();
+				spriteCache.Value.SheetBuilder.Dispose();
 		}
 	}
 }

OpenRA.Game/Graphics/Sheet.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -79,17 +79,7 @@ namespace OpenRA.Graphics
 
 		public Png AsPng()
 		{
-			var data = GetData();
-
-			// Convert BGRA to RGBA
-			for (var i = 0; i < Size.Width * Size.Height; i++)
-			{
-				var temp = data[i * 4];
-				data[i * 4] = data[i * 4 + 2];
-				data[i * 4 + 2] = temp;
-			}
-
-			return new Png(data, Size.Width, Size.Height);
+			return new Png(GetData(), Size.Width, Size.Height);
 		}
 
 		public Png AsPng(TextureChannel channel, IPalette pal)

OpenRA.Game/Graphics/SheetBuilder.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -36,7 +36,6 @@ namespace OpenRA.Graphics
 		public readonly SheetType Type;
 		readonly List<Sheet> sheets = new List<Sheet>();
 		readonly Func<Sheet> allocateSheet;
-		readonly int margin;
 
 		Sheet current;
 		TextureChannel channel;
@@ -48,30 +47,19 @@ namespace OpenRA.Graphics
 			return new Sheet(type, new Size(sheetSize, sheetSize));
 		}
 
-		public static SheetType FrameTypeToSheetType(SpriteFrameType t)
-		{
-			switch (t)
-			{
-				case SpriteFrameType.Indexed: return SheetType.Indexed;
-				case SpriteFrameType.BGRA: return SheetType.BGRA;
-				default: throw new NotImplementedException("Unknown SpriteFrameType {0}".F(t));
-			}
-		}
-
 		public SheetBuilder(SheetType t)
 			: this(t, Game.Settings.Graphics.SheetSize) { }
 
-		public SheetBuilder(SheetType t, int sheetSize, int margin = 1)
-			: this(t, () => AllocateSheet(t, sheetSize), margin) { }
+		public SheetBuilder(SheetType t, int sheetSize)
+			: this(t, () => AllocateSheet(t, sheetSize)) { }
 
-		public SheetBuilder(SheetType t, Func<Sheet> allocateSheet, int margin = 1)
+		public SheetBuilder(SheetType t, Func<Sheet> allocateSheet)
 		{
 			channel = t == SheetType.Indexed ? TextureChannel.Red : TextureChannel.RGBA;
 			Type = t;
 			current = allocateSheet();
 			sheets.Add(current);
 			this.allocateSheet = allocateSheet;
-			this.margin = margin;
 		}
 
 		public Sprite Add(ISpriteFrame frame) { return Add(frame.Data, frame.Size, 0, frame.Offset); }
@@ -88,9 +76,9 @@ namespace OpenRA.Graphics
 			return rect;
 		}
 
-		public Sprite Add(Png src, float scale = 1f)
+		public Sprite Add(Png src)
 		{
-			var rect = Allocate(new Size(src.Width, src.Height),  scale);
+			var rect = Allocate(new Size(src.Width, src.Height));
 			Util.FastCopyIntoSprite(rect, src);
 			current.CommitBufferedData();
 			return rect;
@@ -114,19 +102,19 @@ namespace OpenRA.Graphics
 			return (TextureChannel)nextChannel;
 		}
 
-		public Sprite Allocate(Size imageSize, float scale = 1f) { return Allocate(imageSize, 0, float3.Zero, scale); }
-		public Sprite Allocate(Size imageSize, float zRamp, float3 spriteOffset, float scale = 1f)
+		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 + margin > current.Size.Width)
+			if (imageSize.Width + p.X > current.Size.Width)
 			{
-				p = new int2(0, p.Y + rowHeight + margin);
+				p = new int2(0, p.Y + rowHeight);
 				rowHeight = imageSize.Height;
 			}
 
 			if (imageSize.Height > rowHeight)
 				rowHeight = imageSize.Height;
 
-			if (p.Y + imageSize.Height + margin > current.Size.Height)
+			if (p.Y + imageSize.Height > current.Size.Height)
 			{
 				var next = NextChannel(channel);
 				if (next == null)
@@ -143,8 +131,8 @@ namespace OpenRA.Graphics
 				p = int2.Zero;
 			}
 
-			var rect = new Sprite(current, new Rectangle(p.X + margin, p.Y + margin, imageSize.Width, imageSize.Height), zRamp, spriteOffset, channel, BlendMode.Alpha, scale);
-			p += new int2(imageSize.Width + margin, 0);
+			var rect = new Sprite(current, new Rectangle(p.X, p.Y, imageSize.Width, imageSize.Height), zRamp, spriteOffset, channel, BlendMode.Alpha);
+			p += new int2(imageSize.Width, 0);
 
 			return rect;
 		}

OpenRA.Game/Graphics/SoftwareCursor.cs

@@ -0,0 +1,119 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2019 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.Linq;
+using OpenRA.Primitives;
+
+namespace OpenRA.Graphics
+{
+	public interface ICursor : IDisposable
+	{
+		void Render(Renderer renderer);
+		void SetCursor(string cursor);
+		void Tick();
+		void Lock();
+		void Unlock();
+	}
+
+	public sealed class SoftwareCursor : ICursor
+	{
+		readonly HardwarePalette palette = new HardwarePalette();
+		readonly Cache<string, PaletteReference> paletteReferences;
+		readonly Dictionary<string, Sprite[]> sprites = new Dictionary<string, Sprite[]>();
+		readonly CursorProvider cursorProvider;
+		readonly SheetBuilder sheetBuilder;
+
+		bool isLocked = false;
+		int2 lockedPosition;
+
+		public SoftwareCursor(CursorProvider cursorProvider)
+		{
+			this.cursorProvider = cursorProvider;
+
+			paletteReferences = new Cache<string, PaletteReference>(CreatePaletteReference);
+			foreach (var p in cursorProvider.Palettes)
+				palette.AddPalette(p.Key, p.Value, false);
+
+			palette.Initialize();
+
+			sheetBuilder = new SheetBuilder(SheetType.Indexed);
+			foreach (var kv in cursorProvider.Cursors)
+			{
+				var s = kv.Value.Frames.Select(a => sheetBuilder.Add(a)).ToArray();
+				sprites.Add(kv.Key, s);
+			}
+
+			sheetBuilder.Current.ReleaseBuffer();
+
+			Game.Renderer.Window.SetHardwareCursor(null);
+		}
+
+		PaletteReference CreatePaletteReference(string name)
+		{
+			var pal = palette.GetPalette(name);
+			return new PaletteReference(name, palette.GetPaletteIndex(name), pal, palette);
+		}
+
+		string cursorName;
+		public void SetCursor(string cursor)
+		{
+			cursorName = cursor;
+		}
+
+		float cursorFrame;
+		public void Tick()
+		{
+			cursorFrame += 0.5f;
+		}
+
+		public void Render(Renderer renderer)
+		{
+			if (cursorName == null)
+				return;
+
+			var cursorSequence = cursorProvider.GetCursorSequence(cursorName);
+			var cursorSprite = sprites[cursorName][(int)cursorFrame % cursorSequence.Length];
+			var cursorSize = CursorProvider.CursorViewportZoomed ? 2.0f * cursorSprite.Size : cursorSprite.Size;
+
+			var cursorOffset = CursorProvider.CursorViewportZoomed ?
+				(2 * cursorSequence.Hotspot) + cursorSprite.Size.XY.ToInt2() :
+				cursorSequence.Hotspot + (0.5f * cursorSprite.Size.XY).ToInt2();
+
+			renderer.SetPalette(palette);
+			var mousePos = isLocked ? lockedPosition : Viewport.LastMousePos;
+			renderer.SpriteRenderer.DrawSprite(cursorSprite,
+				mousePos - cursorOffset,
+				paletteReferences[cursorSequence.Palette],
+				cursorSize);
+		}
+
+		public void Lock()
+		{
+			Game.Renderer.Window.SetRelativeMouseMode(true);
+			lockedPosition = Viewport.LastMousePos;
+			isLocked = true;
+		}
+
+		public void Unlock()
+		{
+			Game.Renderer.Window.SetRelativeMouseMode(false);
+			isLocked = false;
+		}
+
+		public void Dispose()
+		{
+			palette.Dispose();
+			sheetBuilder.Dispose();
+		}
+	}
+}

OpenRA.Game/Graphics/Sprite.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -26,17 +26,17 @@ namespace OpenRA.Graphics
 		public readonly float3 FractionalOffset;
 		public readonly float Top, Left, Bottom, Right;
 
-		public Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel, float scale = 1)
-			: this(sheet, bounds, 0, float2.Zero, channel, BlendMode.Alpha, scale) { }
+		public Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel)
+			: this(sheet, bounds, 0, float2.Zero, channel) { }
 
-		public Sprite(Sheet sheet, Rectangle bounds, float zRamp, float3 offset, TextureChannel channel, BlendMode blendMode = BlendMode.Alpha, float scale = 1f)
+		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 = scale * new float3(bounds.Size.Width, bounds.Size.Height, bounds.Size.Height * zRamp);
+			Size = new float3(bounds.Size.Width, bounds.Size.Height, bounds.Size.Height * zRamp);
 			BlendMode = blendMode;
 			FractionalOffset = Size.Z != 0 ? offset / Size :
 				new float3(offset.X / Size.X, offset.Y / Size.Y, 0);

OpenRA.Game/Graphics/SpriteFont.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -13,6 +13,7 @@ using System;
 using System.Linq;
 using OpenRA.Primitives;
 using OpenRA.Support;
+using OpenRA.Widgets;
 
 namespace OpenRA.Graphics
 {
@@ -24,8 +25,6 @@ namespace OpenRA.Graphics
 		readonly Func<string, float> lineWidth;
 		readonly IFont font;
 		readonly Cache<Pair<char, Color>, GlyphInfo> glyphs;
-		readonly Cache<Tuple<char, Color, int>, Sprite> contrastGlyphs;
-		readonly Cache<int, float[]> dilationElements;
 
 		float deviceScale;
 
@@ -41,8 +40,6 @@ namespace OpenRA.Graphics
 			font = Game.Renderer.CreateFont(data);
 
 			glyphs = new Cache<Pair<char, Color>, GlyphInfo>(CreateGlyph, Pair<char, Color>.EqualityComparer);
-			contrastGlyphs = new Cache<Tuple<char, Color, int>, Sprite>(CreateContrastGlyph);
-			dilationElements = new Cache<int, float[]>(CreateCircularWeightMap);
 
 			// PERF: Cache these delegates for Measure calls.
 			Func<char, float> characterWidth = character => glyphs[Pair.New(character, Color.White)].Advance;
@@ -58,7 +55,6 @@ namespace OpenRA.Graphics
 		{
 			deviceScale = scale;
 			glyphs.Clear();
-			contrastGlyphs.Clear();
 		}
 
 		void PrecacheColor(Color c, string name)
@@ -69,78 +65,44 @@ namespace OpenRA.Graphics
 						throw new InvalidOperationException();
 		}
 
-		void DrawTextContrast(string text, float2 location, Color contrastColor, int contrastOffset)
-		{
-			// Offset from the baseline position to the top-left of the glyph for rendering
-			location += new float2(0, size);
-
-			// Calculate positions in screen pixel coordinates
-			var screenContrast = (int)(contrastOffset * deviceScale);
-			var screen = new int2((int)(location.X * deviceScale + 0.5f), (int)(location.Y * deviceScale + 0.5f));
-			var contrastVector = new float2(screenContrast, screenContrast);
-			foreach (var s in text)
-			{
-				if (s == '\n')
-				{
-					location += new float2(0, size);
-					screen = new int2((int)(location.X * deviceScale + 0.5f), (int)(location.Y * deviceScale + 0.5f));
-					continue;
-				}
-
-				var g = glyphs[Pair.New(s, Color.Black)];
-
-				// Convert screen coordinates back to UI coordinates for drawing
-				if (g.Sprite != null)
-				{
-					var contrastSprite = contrastGlyphs[Tuple.Create(s, contrastColor, screenContrast)];
-					Game.Renderer.RgbaSpriteRenderer.DrawSprite(contrastSprite,
-						(screen + g.Offset - contrastVector) / deviceScale,
-						contrastSprite.Size / deviceScale);
-				}
-
-				screen += new int2((int)(g.Advance + 0.5f), 0);
-			}
-		}
-
 		public void DrawText(string text, float2 location, Color c)
 		{
 			// Offset from the baseline position to the top-left of the glyph for rendering
 			location += new float2(0, size);
 
-			// Calculate positions in screen pixel coordinates
-			var screen = new int2((int)(location.X * deviceScale + 0.5f), (int)(location.Y * deviceScale + 0.5f));
+			var p = location;
 			foreach (var s in text)
 			{
 				if (s == '\n')
 				{
 					location += new float2(0, size);
-					screen = new int2((int)(location.X * deviceScale + 0.5f), (int)(location.Y * deviceScale + 0.5f));
+					p = location;
 					continue;
 				}
 
 				var g = glyphs[Pair.New(s, c)];
-
-				// Convert screen coordinates back to UI coordinates for drawing
 				if (g.Sprite != null)
 					Game.Renderer.RgbaSpriteRenderer.DrawSprite(g.Sprite,
-					(screen + g.Offset).ToFloat2() / deviceScale,
-					g.Sprite.Size / deviceScale);
+						new float2(
+							(int)Math.Round(p.X * deviceScale + g.Offset.X, 0) / deviceScale,
+							p.Y + g.Offset.Y / deviceScale),
+						g.Sprite.Size / deviceScale);
 
-				screen += new int2((int)(g.Advance + 0.5f), 0);
+				p += new float2(g.Advance / deviceScale, 0);
 			}
 		}
 
-		float2 Rotate(float2 v, float sina, float cosa, float2 offset)
+		float3 Rotate(float3 v, float sina, float cosa, float2 offset)
 		{
-			return new float2(
+			return new float3(
 				v.X * cosa - v.Y * sina + offset.X,
-				v.X * sina + v.Y * cosa + offset.Y);
+				v.X * sina + v.Y * cosa + offset.Y,
+				0);
 		}
 
 		public void DrawText(string text, float2 location, Color c, float angle)
 		{
 			// Offset from the baseline position to the top-left of the glyph for rendering
-			// All positions are calculated in UI coordinates
 			var offset = new float2(0, size);
 			var cosa = (float)Math.Cos(-angle);
 			var sina = (float)Math.Sin(-angle);
@@ -158,25 +120,18 @@ namespace OpenRA.Graphics
 				var g = glyphs[Pair.New(s, c)];
 				if (g.Sprite != null)
 				{
-					var tl = new float2(
-						p.X + g.Offset.X / deviceScale,
-						p.Y + g.Offset.Y / deviceScale);
-					var br = tl + g.Sprite.Size.XY / deviceScale;
-					var tr = new float2(br.X, tl.Y);
-					var bl = new float2(tl.X, br.Y);
+					var tl = new float3(
+						(int)Math.Round(p.X * deviceScale + g.Offset.X, 0) / deviceScale,
+						p.Y + g.Offset.Y / deviceScale, 0);
+					var br = tl + g.Sprite.Size / deviceScale;
+					var tr = new float3(br.X, tl.Y, 0);
+					var bl = new float3(tl.X, br.Y, 0);
 
-					var ra = Rotate(tl, sina, cosa, location);
-					var rb = Rotate(tr, sina, cosa, location);
-					var rc = Rotate(br, sina, cosa, location);
-					var rd = Rotate(bl, sina, cosa, location);
-
-					// Offset rotated glyph to align the top-left corner with the screen pixel grid
-					var screenOffset = new float2((int)(ra.X * deviceScale + 0.5f), (int)(ra.Y * deviceScale + 0.5f)) / deviceScale - ra;
 					Game.Renderer.RgbaSpriteRenderer.DrawSprite(g.Sprite,
-						ra + screenOffset,
-						rb + screenOffset,
-						rc + screenOffset,
-						rd + screenOffset);
+						Rotate(tl, sina, cosa, location),
+						Rotate(tr, sina, cosa, location),
+						Rotate(br, sina, cosa, location),
+						Rotate(bl, sina, cosa, location));
 				}
 
 				p += new float2(g.Advance / deviceScale, 0);
@@ -186,7 +141,12 @@ namespace OpenRA.Graphics
 		public void DrawTextWithContrast(string text, float2 location, Color fg, Color bg, int offset)
 		{
 			if (offset > 0)
-				DrawTextContrast(text, location, bg, offset);
+			{
+				DrawText(text, location + new float2(-offset / deviceScale, 0), bg);
+				DrawText(text, location + new float2(offset / deviceScale, 0), bg);
+				DrawText(text, location + new float2(0, -offset / deviceScale), bg);
+				DrawText(text, location + new float2(0, offset / deviceScale), bg);
+			}
 
 			DrawText(text, location, fg);
 		}
@@ -199,12 +159,7 @@ namespace OpenRA.Graphics
 		public void DrawTextWithShadow(string text, float2 location, Color fg, Color bg, int offset)
 		{
 			if (offset != 0)
-			{
-				// Shadow offsets are rounded to an integer number of screen pixels.
-				// This makes sure the shadow will be positioned consistently everywhere on the screen.
-				var screenOffset = (int)(offset * deviceScale) / deviceScale;
-				DrawText(text, location + new float2(screenOffset, screenOffset), bg);
-			}
+				DrawText(text, location + new float2(offset, offset), bg);
 
 			DrawText(text, location, fg);
 		}
@@ -217,12 +172,7 @@ namespace OpenRA.Graphics
 		public void DrawTextWithShadow(string text, float2 location, Color fg, Color bg, int offset, float angle)
 		{
 			if (offset != 0)
-			{
-				// Shadow offsets are rounded to an integer number of screen pixels.
-				// This makes sure the shadow will be positioned consistently everywhere on the screen.
-				var screenOffset = (int)(offset * deviceScale) / deviceScale;
-				DrawText(text, location + new float2(screenOffset, screenOffset), bg, angle);
-			}
+				DrawText(text, location + new float2(offset, offset), bg, angle);
 
 			DrawText(text, location, fg, angle);
 		}
@@ -289,128 +239,6 @@ namespace OpenRA.Graphics
 			return g;
 		}
 
-		float[] CreateCircularWeightMap(int r)
-		{
-			// Create circular weight maps that are used by CreateContrastGlyph for
-			// both the structuring element and to weight the resulting pixel value.
-			// The output is a 2 * r + 1 square array giving the pixel intersection
-			// with a circle of radius (r + 0.5).
-			//
-			// Example output for r=1:
-			// 0.60 1.00 0.60
-			// 1.00 1.00 1.00
-			// 0.60 1.00 0.60
-			//
-			// Example output for r=3:
-			// 0.00 0.44 0.80 1.00 0.80 0.44 0.00
-			// 0.44 1.00 1.00 1.00 1.00 1.00 0.44
-			// 0.80 1.00 1.00 1.00 1.00 1.00 0.80
-			// 1.00 1.00 1.00 1.00 1.00 1.00 1.00
-			// 0.80 1.00 1.00 1.00 1.00 1.00 0.80
-			// 0.44 1.00 1.00 1.00 1.00 1.00 0.44
-			// 0.00 0.44 0.80 1.00 0.80 0.44 0.00
-			var stride = 2 * r + 1;
-			var elem = new float[stride * stride];
-
-			for (var j = 0; j <= 2 * r; j++)
-			{
-				for (var i = 0; i <= 2 * r; i++)
-				{
-					var di = i - r;
-					var dj = j - r;
-
-					// No intersection with circle
-					if (di * di + dj * dj > (r + 1) * (r + 1))
-						continue;
-
-					// Fully contained within circle
-					if (di * di + dj * dj < (r - 1) * (r - 1))
-					{
-						elem[j * stride + i] = 1;
-						continue;
-					}
-
-					// Approximate sub-pixel intersection using a 5x5 grid
-					for (var jj = 0; jj < 5; jj++)
-					{
-						for (var ii = 0; ii < 5; ii++)
-						{
-							var si = di - (float)Math.Sign(di) * ii / 5;
-							var sj = dj - (float)Math.Sign(dj) * jj / 5;
-							if (si * si + sj * sj <= r * r)
-								elem[j * stride + i] += 0.04f;
-						}
-					}
-				}
-			}
-
-			return elem;
-		}
-
-		Sprite CreateContrastGlyph(Tuple<char, Color, int> c)
-		{
-			// Source glyph color doesn't matter, so use black
-			var glyph = glyphs[Pair.New(c.Item1, Color.Black)];
-			var color = c.Item2;
-			var r = c.Item3;
-
-			var size = new Size(glyph.Sprite.Bounds.Width + 2 * r, glyph.Sprite.Bounds.Height + 2 * r);
-
-			var s = builder.Allocate(size);
-			var dest = s.Sheet.GetData();
-			var destStride = s.Sheet.Size.Width * 4;
-
-			var glyphData = glyph.Sprite.Sheet.GetData();
-			var glyphStride = glyph.Sprite.Sheet.Size.Width * 4;
-			var glyphBounds = glyph.Sprite.Bounds;
-
-			var elem = dilationElements[r];
-			var elemStride = 2 * r + 1;
-
-			// Expand the glyph by applying the greyscale dilation operator to the source glyph's alpha channel
-			for (var j = 0; j < s.Size.Y; j++)
-			{
-				for (var i = 0; i < s.Size.X; i++)
-				{
-					// Apply the weight map to the source glyph and find the largest weighted alpha
-					var first = true;
-					var alpha = (byte)0;
-					for (var wj = 0; wj <= 2 * r; wj++)
-					{
-						for (var wi = 0; wi <= 2 * r; wi++)
-						{
-							// Ignore pixels that are outside the source glyph bounds
-							var ii = i + wi - 2 * r;
-							var jj = j + wj - 2 * r;
-							if (ii < 0 || ii >= glyphBounds.Width || jj < 0 || jj >= glyphBounds.Height)
-								continue;
-
-							// Weighted alpha for this pixel
-							var weighted = (byte)(elem[wj * elemStride + wi] * glyphData[glyphStride * (jj + glyphBounds.Top) + 4 * (ii + glyphBounds.Left) + 3]);
-							if (first || weighted > alpha)
-							{
-								alpha = weighted;
-								first = false;
-							}
-						}
-					}
-
-					if (alpha > 0)
-					{
-						var q = destStride * (j + s.Bounds.Top) + 4 * (i + s.Bounds.Left);
-						var pmc = Util.PremultiplyAlpha(Color.FromArgb(alpha, color));
-						dest[q] = pmc.B;
-						dest[q + 1] = pmc.G;
-						dest[q + 2] = pmc.R;
-						dest[q + 3] = pmc.A;
-					}
-				}
-			}
-
-			s.Sheet.CommitBufferedData();
-			return s;
-		}
-
 		static Color GetContrastColor(Color fgColor, Color bgDark, Color bgLight)
 		{
 			return fgColor == Color.White || fgColor.GetBrightness() > 0.33 ? bgDark : bgLight;

OpenRA.Game/Graphics/SpriteLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -18,8 +18,6 @@ using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
-	public enum SpriteFrameType { Indexed, BGRA }
-
 	public interface ISpriteLoader
 	{
 		bool TryParseSprite(Stream s, out ISpriteFrame[] frames, out TypeDictionary metadata);
@@ -27,8 +25,6 @@ namespace OpenRA.Graphics
 
 	public interface ISpriteFrame
 	{
-		SpriteFrameType Type { get; }
-
 		/// <summary>
 		/// Size of the frame's `Data`.
 		/// </summary>
@@ -47,7 +43,7 @@ namespace OpenRA.Graphics
 
 	public class SpriteCache
 	{
-		public readonly Cache<SpriteFrameType, SheetBuilder> SheetBuilders;
+		public readonly SheetBuilder SheetBuilder;
 		readonly ISpriteLoader[] loaders;
 		readonly IReadOnlyFileSystem fileSystem;
 
@@ -55,10 +51,9 @@ namespace OpenRA.Graphics
 		readonly Dictionary<string, ISpriteFrame[]> unloadedFrames = new Dictionary<string, ISpriteFrame[]>();
 		readonly Dictionary<string, TypeDictionary> metadata = new Dictionary<string, TypeDictionary>();
 
-		public SpriteCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders)
+		public SpriteCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders, SheetBuilder sheetBuilder)
 		{
-			SheetBuilders = new Cache<SpriteFrameType, SheetBuilder>(t => new SheetBuilder(SheetBuilder.FrameTypeToSheetType(t)));
-
+			SheetBuilder = sheetBuilder;
 			this.fileSystem = fileSystem;
 			this.loaders = loaders;
 		}
@@ -94,7 +89,7 @@ namespace OpenRA.Graphics
 					allSprites.Add(sprite);
 				}
 
-				// HACK: The sequence code relies on side-effects from getUsedFrames
+				// HACK: The sequency code relies on side-effects from getUsedFrames
 				var indices = getUsedFrames != null ? getUsedFrames(sprite.Length) :
 					Enumerable.Range(0, sprite.Length);
 
@@ -105,7 +100,7 @@ namespace OpenRA.Graphics
 					{
 						if (unloaded[i] != null)
 						{
-							sprite[i] = SheetBuilders[unloaded[i].Type].Add(unloaded[i]);
+							sprite[i] = SheetBuilder.Add(unloaded[i]);
 							unloaded[i] = null;
 						}
 					}

OpenRA.Game/Graphics/SpriteRenderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -64,10 +64,8 @@ namespace OpenRA.Graphics
 
 		public void RenderDebugGeometry(WorldRenderer wr)
 		{
-			var pos = ScreenPosition(wr) + sprite.Offset;
-			var tl = wr.Viewport.WorldToViewPx(pos);
-			var br = wr.Viewport.WorldToViewPx(pos + sprite.Size);
-			Game.Renderer.RgbaColorRenderer.DrawRect(tl, br, 1, 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)

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -155,27 +155,22 @@ namespace OpenRA.Graphics
 			shader.SetTexture("Palette", palette);
 		}
 
-		public void SetViewportParams(Size screen, float depthScale, float depthOffset, int2 scroll)
+		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",
-				2f / screen.Width,
-				2f / screen.Height,
-				-depthScale / screen.Height);
-			shader.SetVec("r2", -1, -1, 1 - depthOffset);
+				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 / screen.Height);
+			shader.SetVec("DepthTextureScale", 128 * depthScale * zoom / screen.Height);
 		}
 
 		public void SetDepthPreviewEnabled(bool enabled)
 		{
 			shader.SetBool("EnableDepthPreview", enabled);
 		}
-
-		public void SetAntialiasingPixelsPerTexel(float pxPerTx)
-		{
-			shader.SetVec("AntialiasPixelsPerTexel", pxPerTx);
-		}
 	}
 }

OpenRA.Game/Graphics/TargetLineRenderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -46,11 +46,12 @@ namespace OpenRA.Graphics
 			if (!waypoints.Any())
 				return;
 
-			var first = wr.Viewport.WorldToViewPx(wr.Screen3DPosition(waypoints.First()));
+			var sw = width / wr.Viewport.Zoom;
+			var first = wr.Screen3DPosition(waypoints.First());
 			var a = first;
-			foreach (var b in waypoints.Skip(1).Select(pos => wr.Viewport.WorldToViewPx(wr.Screen3DPosition(pos))))
+			foreach (var b in waypoints.Skip(1).Select(pos => wr.Screen3DPosition(pos)))
 			{
-				Game.Renderer.RgbaColorRenderer.DrawLine(a, b, width, color);
+				Game.Renderer.WorldRgbaColorRenderer.DrawLine(a, b, sw, color);
 				DrawTargetMarker(wr, color, b, markerSize);
 				a = b;
 			}
@@ -58,12 +59,13 @@ namespace OpenRA.Graphics
 			DrawTargetMarker(wr, color, first);
 		}
 
-		public static void DrawTargetMarker(WorldRenderer wr, Color color, int2 screenPos, int size = 1)
+		public static void DrawTargetMarker(WorldRenderer wr, Color color, float3 location, int size = 1)
 		{
-			var offset = new int2(size, size);
-			var tl = screenPos - offset;
-			var br = screenPos + offset;
-			Game.Renderer.RgbaColorRenderer.FillRect(tl, br, color);
+			var sw = size / wr.Viewport.Zoom;
+			var offset = new float2(sw, sw);
+			var tl = location - offset;
+			var br = location + offset;
+			Game.Renderer.WorldRgbaColorRenderer.FillRect(tl, br, color);
 		}
 
 		public void RenderDebugGeometry(WorldRenderer wr) { }

OpenRA.Game/Graphics/TerrainSpriteLayer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Graphics/Theater.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -11,7 +11,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using OpenRA.Primitives;
 using OpenRA.Support;
@@ -35,7 +34,7 @@ namespace OpenRA.Graphics
 	public sealed class Theater : IDisposable
 	{
 		readonly Dictionary<ushort, TheaterTemplate> templates = new Dictionary<ushort, TheaterTemplate>();
-		SheetBuilder sheetBuilder;
+		readonly SheetBuilder sheetBuilder;
 		readonly Sprite missingTile;
 		readonly MersenneTwister random;
 		TileSet tileset;
@@ -54,6 +53,7 @@ namespace OpenRA.Graphics
 				return new Sheet(SheetType.Indexed, new Size(tileset.SheetSize, tileset.SheetSize));
 			};
 
+			sheetBuilder = new SheetBuilder(SheetType.Indexed, allocate);
 			random = new MersenneTwister();
 
 			var frameCache = new FrameCache(Game.ModData.DefaultFileSystem, Game.ModData.SpriteLoaders);
@@ -75,15 +75,6 @@ namespace OpenRA.Graphics
 						var zOffset = tile != null ? -tile.ZOffset : 0;
 						var zRamp = tile != null ? tile.ZRamp : 1f;
 						var offset = new float3(f.Offset, zOffset);
-						var type = SheetBuilder.FrameTypeToSheetType(f.Type);
-
-						// Defer SheetBuilder creation until we know what type of frames we are loading!
-						// TODO: Support mixed indexed and BGRA frames
-						if (sheetBuilder == null)
-							sheetBuilder = new SheetBuilder(SheetBuilder.FrameTypeToSheetType(f.Type), allocate);
-						else if (type != sheetBuilder.Type)
-							throw new InvalidDataException("Sprite type mismatch. Terrain sprites must all be either Indexed or RGBA.");
-
 						var s = sheetBuilder.Allocate(f.Size, zRamp, offset);
 						Util.FastCopyIntoChannel(s, f.Data);
 
@@ -111,7 +102,7 @@ namespace OpenRA.Graphics
 			}
 
 			// 1x1px transparent tile
-			missingTile = sheetBuilder.Add(new byte[sheetBuilder.Type == SheetType.BGRA ? 4 : 1], new Size(1, 1));
+			missingTile = sheetBuilder.Add(new byte[1], new Size(1, 1));
 
 			Sheet.ReleaseBuffer();
 		}

OpenRA.Game/Graphics/UISpriteRenderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Graphics/Util.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -61,56 +61,23 @@ namespace OpenRA.Graphics
 
 		public static void FastCopyIntoChannel(Sprite dest, byte[] src)
 		{
-			var destData = dest.Sheet.GetData();
-			var width = dest.Bounds.Width;
+			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];
+			var destSkip = destStride - 4 * srcStride;
 			var height = dest.Bounds.Height;
 
-			if (dest.Channel == TextureChannel.RGBA)
+			var srcOffset = 0;
+			for (var j = 0; j < height; j++)
 			{
-				var destStride = dest.Sheet.Size.Width;
-				unsafe
+				for (var i = 0; i < srcStride; i++, srcOffset++)
 				{
-					// Cast the data to an int array so we can copy the src data directly
-					fixed (byte* bd = &destData[0])
-					{
-						var data = (int*)bd;
-						var x = dest.Bounds.Left;
-						var y = dest.Bounds.Top;
-
-						var k = 0;
-						for (var j = 0; j < height; j++)
-						{
-							for (var i = 0; i < width; i++)
-							{
-								var r = src[k++];
-								var g = src[k++];
-								var b = src[k++];
-								var a = src[k++];
-								var cc = Color.FromArgb(a, r, g, b);
-
-								data[(y + j) * destStride + x + i] = PremultiplyAlpha(cc).ToArgb();
-							}
-						}
-					}
+					data[destOffset] = src[srcOffset];
+					destOffset += 4;
 				}
-			}
-			else
-			{
-				var destStride = dest.Sheet.Size.Width * 4;
-				var destOffset = destStride * dest.Bounds.Top + dest.Bounds.Left * 4 + ChannelMasks[(int)dest.Channel];
-				var destSkip = destStride - 4 * width;
 
-				var srcOffset = 0;
-				for (var j = 0; j < height; j++)
-				{
-					for (var i = 0; i < width; i++, srcOffset++)
-					{
-						destData[destOffset] = src[srcOffset];
-						destOffset += 4;
-					}
-
-					destOffset += destSkip;
-				}
+				destOffset += destSkip;
 			}
 		}
 

OpenRA.Game/Graphics/Vertex.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Graphics/Viewport.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -19,11 +19,6 @@ namespace OpenRA.Graphics
 	[Flags]
 	public enum ScrollDirection { None = 0, Up = 1, Left = 2, Down = 4, Right = 8 }
 
-	public interface INotifyViewportZoomExtentsChanged
-	{
-		void ViewportZoomExtentsChanged(float minZoom, float maxZoom);
-	}
-
 	public static class ViewportExts
 	{
 		public static bool Includes(this ScrollDirection d, ScrollDirection s)
@@ -41,8 +36,6 @@ namespace OpenRA.Graphics
 	public class Viewport
 	{
 		readonly WorldRenderer worldRenderer;
-		readonly WorldViewportSizes viewportSizes;
-		readonly GraphicSettings graphicSettings;
 
 		// Map bounds (world-px)
 		readonly Rectangle mapBounds;
@@ -53,7 +46,6 @@ namespace OpenRA.Graphics
 
 		public WPos CenterPosition { get { return worldRenderer.ProjectedPosition(CenterLocation); } }
 
-		public Rectangle Rectangle { get { return new Rectangle(TopLeft, new Size(viewportSize.X, viewportSize.Y)); } }
 		public int2 TopLeft { get { return CenterLocation - viewportSize / 2; } }
 		public int2 BottomRight { get { return CenterLocation + viewportSize / 2; } }
 		int2 viewportSize;
@@ -62,16 +54,14 @@ namespace OpenRA.Graphics
 
 		ProjectedCellRegion allCells;
 		bool allCellsDirty = true;
-
-		WorldViewport lastViewportDistance;
+		readonly float[] availableZoomSteps = new[] { 2f, 1f, 0.5f, 0.25f };
 
 		float zoom = 1f;
-		float minZoom = 1f;
-		float maxZoom = 2f;
 
-		bool unlockMinZoom;
-		float unlockedMinZoomScale;
-		float unlockedMinZoom = 1f;
+		public float[] AvailableZoomSteps
+		{
+			get { return availableZoomSteps; }
+		}
 
 		public float Zoom
 		{
@@ -80,39 +70,16 @@ namespace OpenRA.Graphics
 				return zoom;
 			}
 
-			private set
+			set
 			{
-				zoom = value;
-				viewportSize = (1f / zoom * new float2(Game.Renderer.NativeResolution)).ToInt2();
+				var newValue = ClosestTo(AvailableZoomSteps, value);
+				zoom = newValue;
+				viewportSize = (1f / zoom * new float2(Game.Renderer.Resolution)).ToInt2();
 				cellsDirty = true;
 				allCellsDirty = true;
 			}
 		}
 
-		public float MinZoom { get { return minZoom; } }
-
-		public void AdjustZoom(float dz)
-		{
-			// Exponential ensures that equal positive and negative steps have the same effect
-			Zoom = (zoom * (float)Math.Exp(dz)).Clamp(unlockMinZoom ? unlockedMinZoom : minZoom, maxZoom);
-		}
-
-		public void ToggleZoom()
-		{
-			// Unlocked zooms always reset to the default zoom
-			if (zoom < minZoom)
-				Zoom = minZoom;
-			else
-				Zoom = zoom > minZoom ? minZoom : maxZoom;
-		}
-
-		public void UnlockMinimumZoom(float scale)
-		{
-			unlockMinZoom = true;
-			unlockedMinZoomScale = scale;
-			UpdateViewportZooms(false);
-		}
-
 		public static long LastMoveRunTime = 0;
 		public static int2 LastMousePos;
 
@@ -152,8 +119,6 @@ namespace OpenRA.Graphics
 		{
 			worldRenderer = wr;
 			var grid = Game.ModData.Manifest.Get<MapGrid>();
-			viewportSizes = Game.ModData.Manifest.Get<WorldViewportSizes>();
-			graphicSettings = Game.Settings.Graphics;
 
 			// Calculate map bounds in world-px
 			if (wr.World.Type == WorldType.Editor)
@@ -175,78 +140,8 @@ namespace OpenRA.Graphics
 				CenterLocation = (tl + br) / 2;
 			}
 
+			Zoom = Game.Settings.Graphics.PixelDouble ? 2 : 1;
 			tileSize = grid.TileSize;
-
-			UpdateViewportZooms();
-		}
-
-		public void Tick()
-		{
-			if (lastViewportDistance != graphicSettings.ViewportDistance)
-				UpdateViewportZooms();
-		}
-
-		float CalculateMinimumZoom(float minHeight, float maxHeight)
-		{
-			var h = Game.Renderer.NativeResolution.Height;
-
-			// Check the easy case: the native resolution is within the maximum limit
-			// Also catches the case where the user may force a resolution smaller than the minimum window size
-			if (h <= maxHeight)
-				return 1;
-
-			// Find a clean fraction that brings us within the desired range to reduce aliasing
-			var step = 1f;
-			while (true)
-			{
-				var testZoom = 1f;
-				while (true)
-				{
-					var nextZoom = testZoom + step;
-					if (h < minHeight * nextZoom)
-						break;
-
-					testZoom = nextZoom;
-				}
-
-				if (h < maxHeight * testZoom)
-					return testZoom;
-
-				step /= 2;
-			}
-		}
-
-		void UpdateViewportZooms(bool resetCurrentZoom = true)
-		{
-			lastViewportDistance = graphicSettings.ViewportDistance;
-
-			var vd = graphicSettings.ViewportDistance;
-			if (viewportSizes.AllowNativeZoom && vd == WorldViewport.Native)
-				minZoom = 1;
-			else
-			{
-				var range = viewportSizes.GetSizeRange(vd);
-				minZoom = CalculateMinimumZoom(range.X, range.Y);
-			}
-
-			maxZoom = Math.Min(minZoom * viewportSizes.MaxZoomScale, Game.Renderer.NativeResolution.Height * 1f / viewportSizes.MaxZoomWindowHeight);
-
-			if (unlockMinZoom)
-			{
-				// Specators and the map editor support zooming out by an extra factor of two.
-				// TODO: Allow zooming out until the full map is visible
-				// We need to improve our viewport scroll handling to center the map as we zoom out
-				// before this will work well enough to enable
-				unlockedMinZoom = minZoom * unlockedMinZoomScale;
-			}
-
-			if (resetCurrentZoom)
-				Zoom = minZoom;
-			else
-				Zoom = Zoom.Clamp(minZoom, maxZoom);
-
-			foreach (var t in worldRenderer.World.WorldActor.TraitsImplementing<INotifyViewportZoomExtentsChanged>())
-				t.ViewportZoomExtentsChanged(minZoom, maxZoom);
 		}
 
 		public CPos ViewToWorld(int2 view)
@@ -314,9 +209,8 @@ namespace OpenRA.Graphics
 					yield return new MPos(u, v);
 		}
 
-		public int2 ViewToWorldPx(int2 view) { return (graphicSettings.UIScale / Zoom * view.ToFloat2()).ToInt2() + TopLeft; }
-		public int2 WorldToViewPx(int2 world) { return ((Zoom / graphicSettings.UIScale) * (world - TopLeft).ToFloat2()).ToInt2(); }
-		public int2 WorldToViewPx(float3 world) { return ((Zoom / graphicSettings.UIScale) * (world - TopLeft).XY).ToInt2(); }
+		public int2 ViewToWorldPx(int2 view) { return (1f / Zoom * view.ToFloat2()).ToInt2() + TopLeft; }
+		public int2 WorldToViewPx(int2 world) { return (Zoom * (world - TopLeft).ToFloat2()).ToInt2(); }
 
 		public void Center(IEnumerable<Actor> actors)
 		{
@@ -345,6 +239,7 @@ namespace OpenRA.Graphics
 		}
 
 		// Rectangle (in viewport coords) that contains things to be drawn
+		static readonly Rectangle ScreenClip = Rectangle.FromLTRB(0, 0, Game.Renderer.Resolution.Width, Game.Renderer.Resolution.Height);
 		public Rectangle GetScissorBounds(bool insideBounds)
 		{
 			// Visible rectangle in world coordinates (expanded to the corners of the cells)
@@ -354,12 +249,12 @@ namespace OpenRA.Graphics
 			var cbr = map.CenterOfCell(((MPos)bounds.BottomRight).ToCPos(map)) + new WVec(512, 512, 0);
 
 			// Convert to screen coordinates
-			var tl = worldRenderer.ScreenPxPosition(ctl - new WVec(0, 0, ctl.Z)) - TopLeft;
-			var br = worldRenderer.ScreenPxPosition(cbr - new WVec(0, 0, cbr.Z)) - TopLeft;
+			var tl = WorldToViewPx(worldRenderer.ScreenPxPosition(ctl - new WVec(0, 0, ctl.Z))).Clamp(ScreenClip);
+			var br = WorldToViewPx(worldRenderer.ScreenPxPosition(cbr - new WVec(0, 0, cbr.Z))).Clamp(ScreenClip);
 
-			// Add an extra half-cell fudge to avoid clipping isometric tiles
-			return Rectangle.FromLTRB(tl.X - tileSize.Width / 2, tl.Y - tileSize.Height / 2,
-				br.X + tileSize.Width / 2, br.Y + tileSize.Height / 2);
+			// Add an extra one cell fudge in each direction for safety
+			return Rectangle.FromLTRB(tl.X - tileSize.Width, tl.Y - tileSize.Height,
+				br.X + tileSize.Width, br.Y + tileSize.Height);
 		}
 
 		ProjectedCellRegion CalculateVisibleCells(bool insideBounds)

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -39,10 +39,6 @@ namespace OpenRA.Graphics
 		readonly Func<string, PaletteReference> createPaletteReference;
 		readonly bool enableDepthBuffer;
 
-		readonly List<IFinalizedRenderable> preparedRenderables = new List<IFinalizedRenderable>();
-		readonly List<IFinalizedRenderable> preparedOverlayRenderables = new List<IFinalizedRenderable>();
-		readonly List<IFinalizedRenderable> preparedAnnotationRenderables = new List<IFinalizedRenderable>();
-
 		bool lastDepthPreviewEnabled;
 
 		internal WorldRenderer(ModData modData, World world)
@@ -107,7 +103,7 @@ namespace OpenRA.Graphics
 				palettes[name].Palette = pal;
 		}
 
-		IEnumerable<IFinalizedRenderable> GenerateRenderables()
+		List<IFinalizedRenderable> GenerateRenderables()
 		{
 			var actors = onScreenActors.Append(World.WorldActor);
 			if (World.RenderPlayer != null)
@@ -126,74 +122,42 @@ namespace OpenRA.Graphics
 
 			worldRenderables = worldRenderables.OrderBy(RenderableScreenZPositionComparisonKey);
 
-			return worldRenderables.Select(r => r.PrepareRender(this));
+			Game.Renderer.WorldModelRenderer.BeginFrame();
+			var renderables = worldRenderables.Select(r => r.PrepareRender(this)).ToList();
+			Game.Renderer.WorldModelRenderer.EndFrame();
+
+			return renderables;
 		}
 
-		IEnumerable<IFinalizedRenderable> GenerateOverlayRenderables()
+		List<IFinalizedRenderable> GenerateOverlayRenderables()
 		{
-			var actors = World.ActorsWithTrait<IRenderAboveShroud>()
+			var aboveShroud = World.ActorsWithTrait<IRenderAboveShroud>()
 				.Where(a => a.Actor.IsInWorld && !a.Actor.Disposed && (!a.Trait.SpatiallyPartitionable || onScreenActors.Contains(a.Actor)))
 					.SelectMany(a => a.Trait.RenderAboveShroud(a.Actor, this));
 
-			var selected = World.Selection.Actors.Where(a => a.IsInWorld && !a.Disposed)
+			var aboveShroudSelected = World.Selection.Actors.Where(a => a.IsInWorld && !a.Disposed)
 				.SelectMany(a => a.TraitsImplementing<IRenderAboveShroudWhenSelected>()
 					.Where(t => !t.SpatiallyPartitionable || onScreenActors.Contains(a))
 					.SelectMany(t => t.RenderAboveShroud(a, this)));
 
-			var effects = World.Effects.Select(e => e as IEffectAboveShroud)
+			var aboveShroudEffects = World.Effects.Select(e => e as IEffectAboveShroud)
 				.Where(e => e != null)
 				.SelectMany(e => e.RenderAboveShroud(this));
 
-			var orderGenerator = SpriteRenderable.None;
+			var aboveShroudOrderGenerator = SpriteRenderable.None;
 			if (World.OrderGenerator != null)
-				orderGenerator = World.OrderGenerator.RenderAboveShroud(this, World);
+				aboveShroudOrderGenerator = World.OrderGenerator.RenderAboveShroud(this, World);
 
-			return actors
-				.Concat(selected)
-				.Concat(effects)
-				.Concat(orderGenerator)
-				.Select(r => r.PrepareRender(this));
-		}
+			var overlayRenderables = aboveShroud
+				.Concat(aboveShroudSelected)
+				.Concat(aboveShroudEffects)
+				.Concat(aboveShroudOrderGenerator);
 
-		IEnumerable<IFinalizedRenderable> GenerateAnnotationRenderables()
-		{
-			var actors = World.ActorsWithTrait<IRenderAnnotations>()
-				.Where(a => a.Actor.IsInWorld && !a.Actor.Disposed && (!a.Trait.SpatiallyPartitionable || onScreenActors.Contains(a.Actor)))
-				.SelectMany(a => a.Trait.RenderAnnotations(a.Actor, this));
+			Game.Renderer.WorldModelRenderer.BeginFrame();
+			var finalOverlayRenderables = overlayRenderables.Select(r => r.PrepareRender(this)).ToList();
+			Game.Renderer.WorldModelRenderer.EndFrame();
 
-			var selected = World.Selection.Actors.Where(a => a.IsInWorld && !a.Disposed)
-				.SelectMany(a => a.TraitsImplementing<IRenderAnnotationsWhenSelected>()
-					.Where(t => !t.SpatiallyPartitionable || onScreenActors.Contains(a))
-					.SelectMany(t => t.RenderAnnotations(a, this)));
-
-			var effects = World.Effects.Select(e => e as IEffectAnnotation)
-				.Where(e => e != null)
-				.SelectMany(e => e.RenderAnnotation(this));
-
-			var orderGenerator = SpriteRenderable.None;
-			if (World.OrderGenerator != null)
-				orderGenerator = World.OrderGenerator.RenderAnnotations(this, World);
-
-			return actors
-				.Concat(selected)
-				.Concat(effects)
-				.Concat(orderGenerator)
-				.Select(r => r.PrepareRender(this));
-		}
-
-		public void PrepareRenderables()
-		{
-			if (World.WorldActor.Disposed)
-				return;
-
-			RefreshPalette();
-
-			// PERF: Reuse collection to avoid allocations.
-			onScreenActors.UnionWith(World.ScreenMap.RenderableActorsInBox(Viewport.TopLeft, Viewport.BottomRight));
-			preparedRenderables.AddRange(GenerateRenderables());
-			preparedOverlayRenderables.AddRange(GenerateOverlayRenderables());
-			preparedAnnotationRenderables.AddRange(GenerateAnnotationRenderables());
-			onScreenActors.Clear();
+			return finalOverlayRenderables;
 		}
 
 		public void Draw()
@@ -207,6 +171,10 @@ namespace OpenRA.Graphics
 				Game.Renderer.WorldSpriteRenderer.SetDepthPreviewEnabled(lastDepthPreviewEnabled);
 			}
 
+			RefreshPalette();
+
+			onScreenActors.UnionWith(World.ScreenMap.RenderableActorsInBox(Viewport.TopLeft, Viewport.BottomRight));
+			var renderables = GenerateRenderables();
 			var bounds = Viewport.GetScissorBounds(World.Type != WorldType.Editor);
 			Game.Renderer.EnableScissor(bounds);
 
@@ -218,8 +186,8 @@ namespace OpenRA.Graphics
 
 			Game.Renderer.Flush();
 
-			for (var i = 0; i < preparedRenderables.Count; i++)
-				preparedRenderables[i].Render(this);
+			for (var i = 0; i < renderables.Count; i++)
+				renderables[i].Render(this);
 
 			if (enableDepthBuffer)
 				Game.Renderer.ClearDepthBuffer();
@@ -228,70 +196,56 @@ namespace OpenRA.Graphics
 				if (a.Actor.IsInWorld && !a.Actor.Disposed)
 					a.Trait.RenderAboveWorld(a.Actor, this);
 
+			var renderShroud = World.RenderPlayer != null ? World.RenderPlayer.Shroud : null;
+
 			if (enableDepthBuffer)
 				Game.Renderer.ClearDepthBuffer();
 
 			foreach (var a in World.ActorsWithTrait<IRenderShroud>())
-				a.Trait.RenderShroud(this);
+				a.Trait.RenderShroud(renderShroud, this);
 
 			if (enableDepthBuffer)
 				Game.Renderer.Context.DisableDepthBuffer();
 
 			Game.Renderer.DisableScissor();
 
+			var finalOverlayRenderables = GenerateOverlayRenderables();
+
 			// HACK: Keep old grouping behaviour
-			var groupedOverlayRenderables = preparedOverlayRenderables.GroupBy(prs => prs.GetType());
+			var groupedOverlayRenderables = finalOverlayRenderables.GroupBy(prs => prs.GetType());
 			foreach (var g in groupedOverlayRenderables)
 				foreach (var r in g)
 					r.Render(this);
 
-			Game.Renderer.Flush();
-		}
-
-		public void DrawAnnotations()
-		{
-			Game.Renderer.EnableAntialiasingFilter();
-			for (var i = 0; i < preparedAnnotationRenderables.Count; i++)
-				preparedAnnotationRenderables[i].Render(this);
-			Game.Renderer.DisableAntialiasingFilter();
-
-			// Engine debugging overlays
 			if (debugVis.Value != null && debugVis.Value.RenderGeometry)
 			{
-				for (var i = 0; i < preparedRenderables.Count; i++)
-					preparedRenderables[i].RenderDebugGeometry(this);
+				for (var i = 0; i < renderables.Count; i++)
+					renderables[i].RenderDebugGeometry(this);
 
-				for (var i = 0; i < preparedOverlayRenderables.Count; i++)
-					preparedOverlayRenderables[i].RenderDebugGeometry(this);
-
-				for (var i = 0; i < preparedAnnotationRenderables.Count; i++)
-					preparedAnnotationRenderables[i].RenderDebugGeometry(this);
+				foreach (var g in groupedOverlayRenderables)
+					foreach (var r in g)
+						r.RenderDebugGeometry(this);
 			}
 
 			if (debugVis.Value != null && debugVis.Value.ScreenMap)
 			{
 				foreach (var r in World.ScreenMap.RenderBounds(World.RenderPlayer))
-				{
-					var tl = Viewport.WorldToViewPx(new float2(r.Left, r.Top));
-					var br = Viewport.WorldToViewPx(new float2(r.Right, r.Bottom));
-					Game.Renderer.RgbaColorRenderer.DrawRect(tl, br, 1, Color.MediumSpringGreen);
-				}
+					Game.Renderer.WorldRgbaColorRenderer.DrawRect(
+						new float3(r.Left, r.Top, r.Bottom),
+						new float3(r.Right, r.Bottom, r.Bottom),
+						1 / Viewport.Zoom, Color.MediumSpringGreen);
 
-				foreach (var b in World.ScreenMap.MouseBounds(World.RenderPlayer))
-				{
-					var points = b.Vertices
-						.Select(p => Viewport.WorldToViewPx(p).ToFloat2())
-						.ToArray();
-
-					Game.Renderer.RgbaColorRenderer.DrawPolygon(points, 1, Color.OrangeRed);
-				}
+				foreach (var r in World.ScreenMap.MouseBounds(World.RenderPlayer))
+					Game.Renderer.WorldRgbaColorRenderer.DrawRect(
+						new float3(r.Left, r.Top, r.Bottom),
+						new float3(r.Right, r.Bottom, r.Bottom),
+						1 / Viewport.Zoom, Color.OrangeRed);
 			}
 
 			Game.Renderer.Flush();
 
-			preparedRenderables.Clear();
-			preparedOverlayRenderables.Clear();
-			preparedAnnotationRenderables.Clear();
+			// PERF: Reuse collection to avoid allocations.
+			onScreenActors.Clear();
 		}
 
 		public void RefreshPalette()

OpenRA.Game/HotkeyDefinition.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -20,7 +20,6 @@ namespace OpenRA
 		public readonly Hotkey Default = Hotkey.Invalid;
 		public readonly string Description = "";
 		public readonly HashSet<string> Types = new HashSet<string>();
-		public bool HasDuplicates { get; internal set; }
 
 		public HotkeyDefinition(string name, MiniYaml node)
 		{

OpenRA.Game/HotkeyManager.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -38,9 +38,6 @@ namespace OpenRA
 				if (definitions.ContainsKey(kv.Key))
 					keys[kv.Key] = kv.Value;
 			}
-
-			foreach (var hd in definitions)
-				hd.Value.HasDuplicates = GetFirstDuplicate(hd.Value.Name, this[hd.Value.Name].GetValue(), hd.Value) != null;
 		}
 
 		internal Func<Hotkey> GetHotkeyReference(string name)
@@ -68,20 +65,6 @@ namespace OpenRA
 				settings[name] = value;
 			else
 				settings.Remove(name);
-
-			var hadDuplicates = definition.HasDuplicates;
-			definition.HasDuplicates = GetFirstDuplicate(definition.Name, this[definition.Name].GetValue(), definition) != null;
-
-			if (hadDuplicates || definition.HasDuplicates)
-			{
-				foreach (var hd in definitions)
-				{
-					if (hd.Value == definition)
-						continue;
-
-					hd.Value.HasDuplicates = GetFirstDuplicate(hd.Value.Name, this[hd.Value.Name].GetValue(), hd.Value) != null;
-				}
-			}
 		}
 
 		public HotkeyDefinition GetFirstDuplicate(string name, Hotkey value, HotkeyDefinition definition)

OpenRA.Game/IUtilityCommand.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Input/Hotkey.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -9,11 +9,9 @@
  */
 #endregion
 
-using System;
-
 namespace OpenRA
 {
-	public struct Hotkey : IEquatable<Hotkey>
+	public struct Hotkey
 	{
 		public static Hotkey Invalid = new Hotkey(Keycode.UNKNOWN, Modifiers.None);
 		public bool IsValid()
@@ -76,11 +74,6 @@ namespace OpenRA
 
 		public override int GetHashCode() { return Key.GetHashCode() ^ Modifiers.GetHashCode(); }
 
-		public bool Equals(Hotkey other)
-		{
-			return other == this;
-		}
-
 		public override bool Equals(object obj)
 		{
 			var o = obj as Hotkey?;

OpenRA.Game/Input/HotkeyReference.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Input/IInputHandler.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Input/InputHandler.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Input/Keycode.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/InstalledMods.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -26,12 +26,16 @@ namespace OpenRA
 		readonly Dictionary<string, Manifest> mods;
 		readonly SheetBuilder sheetBuilder;
 
+		readonly Dictionary<string, Sprite> icons = new Dictionary<string, Sprite>();
+		public readonly IReadOnlyDictionary<string, Sprite> Icons;
+
 		/// <summary>Initializes the collection of locally installed mods.</summary>
 		/// <param name="searchPaths">Filesystem paths to search for mod packages.</param>
 		/// <param name="explicitPaths">Filesystem paths to additional mod packages.</param>
 		public InstalledMods(IEnumerable<string> searchPaths, IEnumerable<string> explicitPaths)
 		{
 			sheetBuilder = new SheetBuilder(SheetType.BGRA, 256);
+			Icons = new ReadOnlyDictionary<string, Sprite>(icons);
 			mods = GetInstalledMods(searchPaths, explicitPaths);
 		}
 
@@ -72,7 +76,20 @@ namespace OpenRA
 
 				package = new Folder(path);
 				if (package.Contains("mod.yaml"))
-					return new Manifest(id, package);
+				{
+					var manifest = new Manifest(id, package);
+
+					if (package.Contains("icon.png"))
+					{
+						using (var stream = package.GetStream("icon.png"))
+							if (stream != null)
+								icons[id] = sheetBuilder.Add(new Png(stream));
+					}
+					else if (!manifest.Metadata.Hidden)
+						Log.Write("debug", "Mod '{0}' is missing 'icon.png'.".F(path));
+
+					return manifest;
+				}
 			}
 			catch (Exception e)
 			{

OpenRA.Game/LocalPlayerProfile.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/LogProxy.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/MPos.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Manifest.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Map/ActorInitializer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Map/ActorReference.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -71,14 +71,5 @@ namespace OpenRA
 		// for initialization syntax
 		public void Add(object o) { InitDict.Add(o); }
 		public IEnumerator GetEnumerator() { return InitDict.GetEnumerator(); }
-
-		public ActorReference Clone()
-		{
-			var clone = new ActorReference(Type);
-			foreach (var init in InitDict)
-				clone.InitDict.Add(init);
-
-			return clone;
-		}
 	}
 }

OpenRA.Game/Map/CellLayer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Map/CellRegion.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Map/Map.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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
@@ -824,14 +824,6 @@ namespace OpenRA
 			return new WDist(delta.Z);
 		}
 
-		public WVec Offset(CVec delta, int dz)
-		{
-			if (Grid.Type == MapGridType.Rectangular)
-				return new WVec(1024 * delta.X, 1024 * delta.Y, 0);
-
-			return new WVec(724 * (delta.X - delta.Y), 724 * (delta.X + delta.Y), 724 * dz);
-		}
-
 		/// <summary>
 		/// The size of the map Height step in world units
 		/// </summary>

OpenRA.Game/Map/MapCache.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Map/MapCoordsRegion.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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

OpenRA.Game/Map/MapGrid.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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