Enable itch app auto updates on Windows.

As well as overlay font.

.editorconfig

@@ -1,16 +1,106 @@
 ; Top-most http://editorconfig.org/ file
 root = true
+charset=utf-8
 
 ; Unix-style newlines
 [*]
 end_of_line = LF
+insert_final_newline = true
+trim_trailing_whitespace = true
 
-; 4-column tab indentation
+; 4-column tab indentation and .NET coding conventions
 [*.cs]
 indent_style = tab
 indent_size = 4
 
+dotnet_separate_import_directive_groups = false
+dotnet_sort_system_directives_first = true
+
+csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+
+csharp_prefer_braces = when_multiline:suggestion
+csharp_using_directive_placement = outside_namespace:suggestion
+csharp_new_line_before_open_brace = all
+csharp_space_around_binary_operators = before_and_after
+
+#### Naming styles ####
+
+dotnet_naming_style.camel_case.capitalization = camel_case
+
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+# Symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal
+
+dotnet_naming_symbols.const_private_field.applicable_kinds = field
+dotnet_naming_symbols.const_private_field.required_modifiers = const
+dotnet_naming_symbols.const_private_field.applicable_accessibilities = private
+
+dotnet_naming_symbols.internal_field.applicable_kinds = field
+dotnet_naming_symbols.internal_field.applicable_accessibilities = internal
+
+dotnet_naming_symbols.static_private_or_internal_field.required_modifiers = static
+dotnet_naming_symbols.static_private_or_internal_field.applicable_accessibilities = internal, private
+
+dotnet_naming_symbols.private_or_internal_field.applicable_kinds = field
+dotnet_naming_symbols.private_or_internal_field.applicable_accessibilities = internal, private
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal
+
+# Naming rules
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = warning
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+
+dotnet_naming_rule.static_private_or_internal_field_should_be_pascal_case.severity = none
+dotnet_naming_rule.static_private_or_internal_field_should_be_pascal_case.symbols = static_private_or_internal_field
+dotnet_naming_rule.static_private_or_internal_field_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.const_private_field_should_be_pascal_case.severity = warning
+dotnet_naming_rule.const_private_field_should_be_pascal_case.symbols = const_private_field
+dotnet_naming_rule.const_private_field_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.const_private_or_internal_field_should_be_pascal_case.severity = warning
+dotnet_naming_rule.const_private_or_internal_field_should_be_pascal_case.symbols = internal_field
+dotnet_naming_rule.const_private_or_internal_field_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.private_or_internal_field_should_be_camel_case.severity = warning
+dotnet_naming_rule.private_or_internal_field_should_be_camel_case.symbols = private_or_internal_field
+dotnet_naming_rule.private_or_internal_field_should_be_camel_case.style = camel_case
+
+# Naming rules
+
+#require a space before the colon for bases or interfaces in a type declaration
+csharp_space_after_colon_in_inheritance_clause = true
+#require a space after a keyword in a control flow statement such as a for loop
+csharp_space_after_keywords_in_control_flow_statements = true
+#require a space before the colon for bases or interfaces in a type declaration
+csharp_space_before_colon_in_inheritance_clause = true
+
+#Formatting - wrapping options
+
+#leave code block on single line
+csharp_preserve_single_line_blocks = true
+#leave statements and member declarations on the same line
+csharp_preserve_single_line_statements = true
+
+#prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+
 ; 4-column tab indentation
 [*.yaml]
 indent_style = tab
-indent_size = 4
+indent_size = 4

.gitattributes

@@ -1,12 +1,10 @@
 # Enforce LF normalization on Windows
 *.yaml eol=lf
 *.lua eol=lf
+*.cs eol=lf
+*.csproj eol=lf
+*.sln eol=lf
 * text=lf
 
 # Custom for Visual Studio
 *.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,33 @@
+---
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,35 @@
+---
+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

@@ -0,0 +1,35 @@
+---
+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

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+Thank you for your contribution to OpenRA!
+
+Please be aware that we do not have enough project maintainers to match the rate of contributions, so it may take several days before somebody is able to respond to your Pull Request.
+
+You can help speed up the review process by following a few steps:
+
+* Make sure that you have read and understand the OpenRA Coding Standard (see https://github.com/OpenRA/OpenRA/wiki/Coding-Standard).
+* Write quality commit messages (see https://chris.beams.io/posts/git-commit/).
+* Only commit changes that directly relate to your Pull Request.  Use your Git interface to unstage any unrelated changes to project files, line endings, whitespace, or other files.
+* Review the code diff view below to double check that your changes satisfy the above three points.
+* Use the `make test` and `make check` commands to check for (and fix!) any issues that are reported by our automated tests.
+* If you are changing shared mod or engine code, make sure that you have tested your changes in all four default mods.
+* Respond to review comments as soon as you reasonably can.  Reviewers will usually prioritize Pull Requests that are still fresh in their minds.  Make sure to leave a comment when you push new changes, otherwise GitHub does not automatically notify reviewers!
+* Leave a polite comment asking for reviews if a week or more has passed without feedback.
+
+If you need any help you can ask in the #openra IRC channel on freenode (most active during European evenings).

.gitignore

@@ -1,81 +1,69 @@
-# Visual Studio
-Release
-bin
-obj
-*.ncb
-*.vcproj*
-*.suo
-*.user
-*.sln.cache
-*.manifest
-*.CodeAnalysisLog.xml
-*.lastcodeanalysissucceeded
-_ReSharper.*/
-
-# movies
-*.vqa
-
-# archives
-*.mix
-
-# binaries
-mods/*/*.dll
-mods/*/*.mdb
-mods/*/*.pdb
-/*.dll
-/*.dll.config
-/*.so
-/*.dylib
-/*.pdb
-/*.mdb
-/*.exe
-thirdparty/download/*
-*.mmdb.gz
-
-# backup files by various editors
-*~
-*.orig
-\#*
-.*.sw?
-
-# Monodevelop
-*.pidb
-*.userprefs
-
-# Mac OS X
-.DS_Store
-
-# XCode
-packaging/osx/launcher/build/
-packaging/osx/launcher/OpenRA.xcodeproj/*.pbxuser
-packaging/osx/launcher/OpenRA.xcodeproj/*.perspectivev3
-packaging/osx/launcher/OpenRA.xcodeproj/*.mode1v3
-temp.c
-temp.o
-temp.s
-OpenRA.Launcher.Mac/build/
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.pbxuser
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.perspectivev3
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
-*.resources
-
-# auto-generated documentation
-DOCUMENTATION.md
-Lua-API.md
-*.html
-openra.6
-
-# StyleCop
-*.Cache
-StyleCopViolations.xml
-
-# SublimeText
-*.sublime-project
-*.sublime-workspace
-
-# NUnit
-/TestResult.xml
-/lib/
-
-# Support directory
-/Support
+# Visual Studio
+Release
+bin
+obj
+*.ncb
+*.vcproj*
+*.suo
+*.user
+*.sln.cache
+*.manifest
+*.CodeAnalysisLog.xml
+*.lastcodeanalysissucceeded
+_ReSharper.*/
+/.vs
+
+# binaries
+mods/*/*.dll
+mods/*/*.mdb
+mods/*/*.pdb
+/*.dll
+/*.dll.config
+/*.so
+/*.dylib
+/*.pdb
+/*.mdb
+/*.exe
+/*.exe.config
+thirdparty/download/*
+IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP
+
+# backup files by various editors
+*~
+*.orig
+\#*
+.*.sw?
+
+# Monodevelop
+*.pidb
+*.userprefs
+
+# Mac OS X
+.DS_Store
+
+# auto-generated documentation
+DOCUMENTATION.md
+WEAPONS.md
+Lua-API.md
+Settings.md
+*.html
+openra.6
+update.log
+
+# StyleCop
+*.Cache
+StyleCopViolations.xml
+
+# SublimeText
+*.sublime-project
+*.sublime-workspace
+
+# NUnit
+/TestResult.xml
+/lib/
+
+# Support directory
+/Support
+
+# IntelliJ files
+.idea

.travis.yml

@@ -2,23 +2,25 @@
 # see travis-ci.org for details
 
 language: csharp
-mono: 4.6.1
+mono: 6.4.0
+os: linux
+dist: xenial
 
-# http://docs.travis-ci.com/user/migrating-from-legacy
-sudo: false
-
-cache:
-  directories:
-  - thirdparty/download
+jobs:
+  include:
+    - os: linux
+      dist: xenial
+    - os: osx
+      if: tag IS present
+      osx_image: xcode10
 
 addons:
   apt:
     packages:
     - lua5.1
-    - nsis
-    - nsis-common
     - dpkg
-    - markdown
+    - zsync
+    - imagemagick
 
 # Environment variables
 env:
@@ -30,29 +32,28 @@ env:
 # call OpenRA to check for YAML errors
 # Run the NUnit tests
 script:
- - travis_retry make all-dependencies
- - make all SDK="-sdk:4.5"
- - make check
- - make check-scripts
- - make test
- - make nunit
-
-# Automatically update the trait documentation and Lua API
-after_success:
- - test $TRAVIS_PULL_REQUEST == "false" && make docs && cd packaging && ./update-wiki.sh $TRAVIS_BRANCH; cd ..
+ - make all
+ - |
+   if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+      make check || travis_terminate 1;
+      make check-scripts || travis_terminate 1;
+      make test || travis_terminate 1;
+      mono ~/.nuget/packages/nunit.consolerunner/3.11.1/tools/nunit3-console.exe --noresult OpenRA.Test.dll || travis_terminate 1;
+   fi
 
 # Only watch the development branch and tagged release.
 branches:
  only:
    - /^release-.*$/
    - /^playtest-.*$/
-   - /^pkgtest-.*$/
+   - /^devtest-.*$/
    - /^prep-.*$/
    - bleed
 
 # Notify developers when build passed/failed.
 notifications:
   irc:
+    if: repo = OpenRA/OpenRA
     template:
       - "%{repository}#%{build_number} %{commit} %{author}: %{message} %{build_url}"
     channels:
@@ -61,21 +62,31 @@ notifications:
     skip_join: true
 
 before_deploy:
- - export PATH=$PATH:$HOME/usr/bin
+ - 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;
+     echo ${TRAVIS_REPO_SLUG};
+     if [[ "${TRAVIS_REPO_SLUG}" == "OpenRA/OpenRA" ]]; then
+       cd packaging && ./update-wiki.sh ${TRAVIS_TAG} && cd ..;
+     fi;
+   fi
+ - export PATH=${PATH}:${HOME}/usr/bin
  - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"`
  - cd packaging
  - mkdir build
  - ./package-all.sh ${TRAVIS_TAG} ${PWD}/build/
+ - if [[ "${TRAVIS_REPO_SLUG}" == "OpenRA/OpenRA" ]]; then
+     ./upload-itch.sh ${TRAVIS_TAG} ${PWD}/build/;
+   fi
+
 deploy:
   provider: releases
-  api_key:
-    secure: "g/LU11f+mjqv+lj0sR1UliHwogXL4ofJUwoG5Dbqlvdf5UTLWytw/OWSCv8RGyuh10miyWeaoqHh1cn2C1IFhUEqN1sSeKKKOWOTvJ2FR5mzi9uH3d/MOBzG5icQ7Qh0fZ1YPz5RaJJhYu6bmfvA/1gD49GoaX2kxQL4J5cEBgg="
-  file:
-    - build/OpenRA-${TRAVIS_TAG}.exe
-    - build/OpenRA-${TRAVIS_TAG}.zip
-    - build/openra_${DOTVERSION}_all.deb
+  token: ${GH_DEPLOY_API_KEY}
+  file_glob: true
+  file: build/*
   skip_cleanup: true
   on:
     all_branches: true
     tags: true
-    repo: OpenRA/OpenRA

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+	"recommendations": [
+		"ms-dotnettools.csharp",
+		"EditorConfig.EditorConfig",
+		"ms-vscode.mono-debug"
+	]
+}

.vscode/launch.json

@@ -0,0 +1,61 @@
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Launch (TD)",
+			"type": "clr",
+			"linux": {
+				"type": "mono"
+			},
+			"osx": {
+				"type": "mono"
+			},
+			"request": "launch",
+			"program": "${workspaceRoot}/OpenRA.Game.exe",
+			"cwd": "${workspaceRoot}",
+			"args": ["Game.Mod=cnc"]
+		},
+		{
+			"name": "Launch (RA)",
+			"type": "clr",
+			"linux": {
+				"type": "mono"
+			},
+			"osx": {
+				"type": "mono"
+			},
+			"request": "launch",
+			"program": "${workspaceRoot}/OpenRA.Game.exe",
+			"cwd": "${workspaceRoot}",
+			"args": ["Game.Mod=ra"]
+		},
+		{
+			"name": "Launch (D2k)",
+			"type": "clr",
+			"linux": {
+				"type": "mono"
+			},
+			"osx": {
+				"type": "mono"
+			},
+			"request": "launch",
+			"program": "${workspaceRoot}/OpenRA.Game.exe",
+			"cwd": "${workspaceRoot}",
+			"args": ["Game.Mod=d2k"]
+		},
+		{
+			"name": "Launch (TS)",
+			"type": "clr",
+			"linux": {
+				"type": "mono"
+			},
+			"osx": {
+				"type": "mono"
+			},
+			"request": "launch",
+			"program": "${workspaceRoot}/OpenRA.Game.exe",
+			"cwd": "${workspaceRoot}",
+			"args": ["Game.Mod=ts"]
+		},
+	]
+}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+	"omnisharp.enableRoslynAnalyzers": true
+}

.vscode/tasks.json

@@ -0,0 +1,13 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "build",
+			"command": "make",
+			"args": ["all"],
+			"windows": {
+				"command": "make.cmd"
+			}
+		}
+	]
+}

AUTHORS

@@ -3,26 +3,27 @@ hard work of many contributors.
 
 The OpenRA developers are:
     * Chris Forbes (chrisf)
-    * Igor Popov (ihptru)
     * Lukas Franke (abcdefg30)
-    * Matthias Mailänder (Mailaender)
-    * 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)
@@ -38,12 +39,16 @@ Also thanks to:
     * Bellator
     * Biofreak
     * Braxton Williams (Buddytex)
+    * Brendan Gluth (Mechanical_Man)
+    * Brent Gardner (bggardner)
     * Bryan Wilbur
     * Bugra Cuhadaroglu (BugraC)
-    * Christer Ulfsparre (Holloweye)
+    * Chris Cameron (Vesuvian)
     * Chris Grant (Unit158)
+    * Christer Ulfsparre (Holloweye)
     * clem
     * Cody Brittain (Generalcamo)
+    * Constantin Helmig (CH4Code)
     * D2k Sardaukar
     * D'Arcy Rush (r34ch)
     * Daniel Derejvanik (Harisson)
@@ -52,6 +57,7 @@ Also thanks to:
     * David Russell (DavidARussell)
     * DeadlySurprise
     * Dmitri Suvorov (suvjunmd)
+    * dtluna
     * Erasmus Schroder (rasco)
     * Eric Bajumpaa (SteelPhase)
     * Evgeniy Sergeev (evgeniysergeev)
@@ -59,24 +65,26 @@ Also thanks to:
     * Florian Wiesbauer (FiveAces)
     * Frank Razenberg (zzattack)
     * Gareth Needham (Ripley`)
-    * Glen Anderson (GlenLife)
+    * Glen Anderson (glen7)
     * Glenn Martin Jensen (Baxxster)
     * Gordon Martin (Happy0)
     * Guido Lipke (LipkeGu)
-    * Gyula Zimmermann (Graion Dilach)
     * Hervé Matysiak (Herve-M)
     * Huw Pascoe
     * Ian T. Jacobsen (Smilex)
     * Imago
     * Iran
+    * Ishan Bhargava (ishantheperson)
     * Jacob Dufault (jacobdufault)
     * James Dunne (jsd)
     * James Gilbert (DSUK)
     * Jan-Willem Buurlage (jwbuurlage)
     * Jason (atlimit8)
     * Jeff Harris (jeff_1amstudios)
+    * Jefri Sevkin (Arular)
     * Jes
     * Joakim Lindberg (booom3)
+    * Joe Alam (joealam)
     * John Turner (whinis)
     * Jonas A. Lind (SoScared)
     * Joppy Furr
@@ -84,21 +92,29 @@ Also thanks to:
     * Kenny Hoxworth (hoxworth)
     * Kevin Azzam (ChaoticMind)
     * Krishnakanth Mallik
+    * Kyle Smith (Smitty)
     * Kyrre Soerensen (zypres)
     * Lawrence Wang
     * Lesueur Benjamin (Valkirie)
     * Maarten Meuris (Nyerguds)
+    * Manuel Geiger (Ectras)
     * Mark Olson (markolson)
+    * Markus Hartung (hartmark)
     * Matija Hustic (matija-hustic)
     * Matthew Gatland (mgatland)
     * Matthew Uzzell (MUzzell)
     * Matthijs Benschop (Nerdie)
     * Max621
     * Max Ugrumov (katzsmile)
+    * Mazar Farran (mazarf)
     * Michael Rätzel
+    * Michael Silber (frühstück)
     * Michael Sztolcman (s1w_)
+    * Mike Gagné (AngryBirdz)
+    * Muh
     * Mustafa Alperen Seki (MustaphaTR)
     * Neil Shivkar (havok13888)
+    * Nikolay Fomin (netnazgul)
     * Nooze
     * Nukem
     * Okunev Yu Dmitry (xaionaro)
@@ -107,8 +123,9 @@ Also thanks to:
     * Paul Dovydaitis (pdovy)
     * Pavlos Touboulidis (pav)
     * Pedro Ferreira Ramos (bateramos)
+    * Peter Amrehn (jongleur1983)
     * Pizzaoverhead
-    * Piët Delport (pjdelport)
+    * Pi Delport (pjdelport)
     * Psydev
     * Raphael Vogt (TheRaffy, Yellow)
     * Raymond Bedrossian (Squiggles211)
@@ -121,14 +138,18 @@ Also thanks to:
     * Sebastien Kerguen (xanax)
     * Shawn Collins (UberWaffe)
     * Simon Verbeke (Saticmotion)
+    * Stuart McHattie (SDJMcHattie)
     * Taryn Hill (Phrohdoh)
     * Teemu Nieminen (Temeez)
     * Tim Mylemans (gecko)
     * Tirili
+    * Tomas Einarsson (Mesacer)
+    * Tom van Leth (tovl)
     * Tristan Keating (Kilkakon)
     * Tristan Mühlbacher (MicroBit)
     * UnknownProgrammer
     * Vladimir Komarov (VrKomarov)
+    * Wojciech Walaszek (Voidwalker)
     * Wuschel
 
 Using GNU FreeFont distributed under the GNU GPL
@@ -142,15 +163,6 @@ 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 SharpFont created by Robert Rouhani and
-distributed under the MIT license.
-
 Using SDL2-CS and OpenAL-CS created by Ethan
 Lee and released under the zlib license.
 
@@ -167,9 +179,17 @@ under the MIT license.
 Using ICSharpCode.SharpZipLib initially by Mike
 Krueger and distributed under the GNU GPL terms.
 
-Using SmartIrc4Net developed by Mirco Bauer
-distributed under the LGPL version 2.1 or later.
+Using rix0rrr.BeaconLib developed by Rico Huijbers
+distributed under MIT License.
 
+Using DiscordRichPresence developed by Lachee
+distributed under MIT License.
+
+Using Json.NET developed by James Newton-King
+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

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by private-messaging a project team member (users with a + in front
+of their name) via our IRC channel (#openra on freenode –
+[webchat](http://webchat.freenode.net/?channels=openra)). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -1,5 +1,8 @@
 # OpenRA Contributing Guidelines
 
+## Participating
+Help us keep OpenRA open and inclusive. Please read and follow our [Code of Conduct](https://github.com/OpenRA/OpenRA/blob/bleed/CODE_OF_CONDUCT.md).
+
 ## Bug reports
 
 * Have you read the [FAQ](https://github.com/OpenRA/OpenRA/wiki/FAQ)?

INSTALL.md

@@ -6,78 +6,106 @@ The following lists per-platform dependencies required to build from source.
 Windows
 =======
 
-* [Windows PowerShell >= 4.0](http://microsoft.com/powershell)
-* [.NET Framework >= 4.5 (Client Profile)](http://www.microsoft.com/en-us/download/details.aspx?id=30653)
-* [SDL 2](http://www.libsdl.org/download-2.0.php) (included)
-* [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm) (included)
-* [zlib](http://gnuwin32.sourceforge.net/packages/zlib.htm) (included)
-* [OpenAL](http://kcat.strangesoft.net/openal.html) (included)
-* [liblua 5.1](http://luabinaries.sourceforge.net/download.html) (included)
+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 Core 2.2 SDK](https://dotnet.microsoft.com/download/dotnet-core/2.2) (or via Visual Studio 2017)
 
-You need to fetch the thirdparty dependencies using [NuGet](http://www.nuget.org) and place them at the appropriate places by typing `make dependencies` in a command terminal.
 
 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.
 
-Run the game with `OpenRA.Game.exe Game.Mod=ra` for Red Alert or `OpenRA.Game.exe Game.Mod=cnc` for Tiberian Dawn.
+Run the game with `launch-game.cmd`. It can be handed arguments that specify the exact mod one wishes to run, for example, run `launch-game.cmd Game.Mod=ra` to launch Red Alert, `launch-game.cmd Game.Mod=cnc` to start Tiberian dawn or `launch-game.cmd Game.Mod=d2k` to launch Dune 2000.
 
 Linux
 =====
 
-Use `make dependencies` to map the native libraries to your system, fetch the remaining CLI dependencies using [NuGet](http://www.nuget.org) and place them at the appropriate places.
+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.
 
-To compile OpenRA, run `make all` from the command line.
+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.
 
-Run with either `launch-game.sh` or `mono --debug OpenRA.Game.exe`.
+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`.
 
-Type `sudo make install-all` for system wide installation. Run `make install-linux-shortcuts` to get startup scripts, icons and desktop files. You can then run from the `openra` shortcut.
+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)
+
+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`.
+
+Arch Linux
+----------
+
+It is important to note there is an unofficial [`openra-git`](https://aur.archlinux.org/packages/openra-git) package in the Arch User Repository (AUR) of Arch Linux. If manually compiling is the way you wish to go the build and runtime dependencies can be installed with:
+
+```
+sudo pacman -S mono openal libgl freetype2 sdl2 lua51 xdg-utils zenity
+```
 
 Debian/Ubuntu
 -------------
 
-* nuget
-* mono-devel
-* libfreetype6
-* libopenal1
-* liblua5.1-0
-* libsdl2-2.0-0
-* xdg-utils
-* zenity
-* curl
+:warning: The `mono` packages in the Ubuntu < 19.04 and Debian < 10 repositories are too old to support OpenRA. :warning:
 
-openSUSE
---------
+See the instructions under the *Linux* section above to upgrade `mono` using the upstream releases if needed.
 
-* mono-devel
-* nuget
-* openal
-* freetype2
-* SDL2
-* lua51
-* xdg-utils
-* zenity
-* curl
+```
+sudo apt install mono-devel libfreetype6 libopenal1 liblua5.1-0 libsdl2-2.0-0 xdg-utils zenity wget
+```
+
+Fedora
+------
+
+:warning: The `mono` packages in the Fedora repositories are too old to support OpenRA. :warning:
+
+See the instructions under the *Linux* section above to upgrade `mono` using the upstream releases.
+
+
+```
+sudo dnf install "pkgconfig(mono)" SDL2 freetype "lua = 5.1" openal-soft xdg-utils zenity
+```
 
 Gentoo
 ------
 
-* dev-lang/mono
-* dev-dotnet/libgdiplus
-* dev-dotnet/nuget
-* media-libs/freetype:2
-* media-libs/libsdl2
-* media-libs/openal
-* virtual/jpeg
-* virtual/opengl
-* dev-lang/lua-5.1.5
-* x11-misc/xdg-utils
-* gnome-extra/zenity
-* net-misc/curl
+```
+sudo emerge -av dev-lang/mono dev-dotnet/libgdiplus media-libs/freetype:2 media-libs/libsdl2 media-libs/openal virtual/jpeg virtual/opengl '=dev-lang/lua-5.1.5*' x11-misc/xdg-utils gnome-extra/zenity
+```
 
-OSX
+Mageia
+------
+
+```
+sudo dnf install "pkgconfig(mono)" SDL2 freetype "lib*lua5.1" "lib*freetype2" "lib*sdl2.0_0" openal-soft xdg-utils zenity
+```
+
+openSUSE
+--------
+
+```
+sudo zypper in mono-devel openal-soft freetype2 SDL2 lua51 xdg-utils zenity
+```
+
+Red Hat Enterprise Linux (and rebuilds, e.g. CentOS)
+----------------------------------------------------
+
+The EPEL repository is required in order for the following command to run properly.
+
+```
+sudo yum install "pkgconfig(mono)" SDL2 freetype "lua = 5.1" openal-soft xdg-utils zenity
+```
+
+macOS
 =====
 
-Use `make dependencies` to map the native libraries to your system.
+Before compiling OpenRA you must install the following dependencies:
+* [Mono >= 5.18](https://www.mono-project.com/download/stable/#download-mac)
 
-To compile OpenRA, run `make` from the command line.
+To compile OpenRA, run `make` from the command line. Run with `./launch-game.sh`.
+
+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`)
 
-Run with `mono --debug OpenRA.Game.exe`.

Makefile

@@ -1,34 +1,28 @@
 ############################# INSTRUCTIONS #############################
 #
 # to compile, run:
-#   make [DEBUG=false]
+#   make [DEBUG=true]
 #
-# to compile with development tools, run:
-#   make all [DEBUG=false]
+# 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 official mod dlls for StyleCop violations, run:
+# to check the engine and official mod dlls for code style violations, run:
 #   make check
 #
-# to generate documentation aimed at modders, run:
-#   make docs
-#
 # to install, run:
 #   make [prefix=/foo] [bindir=/bar/bin] install
 #
-# to install with development tools, run:
-#   make [prefix=/foo] [bindir=/bar/bin] install-all
-#
 # to install Linux startup scripts, desktop files and icons:
 #   make install-linux-shortcuts [DEBUG=false]
 #
+# 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:
 #   make uninstall
 #
@@ -38,28 +32,22 @@
 # to start the game, run:
 #   openra
 
-
-
 ############################## TOOLCHAIN ###############################
 #
-SDK         ?=
-CSC         = mcs $(SDK)
-CSFLAGS     = -nologo -warn:4 -codepage:utf8 -unsafe -warnaserror
-DEFINE      = TRACE
-COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/Eluant.dll thirdparty/download/SmarIrc4net.dll
+# List of .NET assemblies that we can guarantee exist
+# OpenRA.Game.dll is a harmless false positive that we can ignore
+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 DiscordRPC.dll Newtonsoft.Json.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
+
 NUNIT_LIBS_PATH :=
 NUNIT_LIBS  := $(NUNIT_LIBS_PATH)nunit.framework.dll
 
-DEBUG = true
-ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
-CSFLAGS   += -debug:pdbonly -optimize+
-else
-CSFLAGS   += -debug:full -optimize-
-DEFINE    := DEBUG;$(DEFINE)
-endif
-
-
-
 ######################### UTILITIES/SETTINGS ###########################
 #
 # install locations
@@ -86,83 +74,29 @@ INSTALL_DIR = $(INSTALL) -d
 INSTALL_PROGRAM = $(INSTALL) -m755
 INSTALL_DATA = $(INSTALL) -m644
 
-# program targets
-CORE = pdefault game utility server
-TOOLS = gamemonitor
-VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
+# Toolchain
+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)
-os-dependencies = osx-dependencies
+TARGETPLATFORM = osx-x64
 else
-os-dependencies = linux-dependencies
+ifeq ($(UNAME_M),x86_64)
+TARGETPLATFORM = linux-x64
+else
+TARGETPLATFORM = unix-generic
+endif
+endif
 endif
 
-
-
-######################## PROGRAM TARGET RULES ##########################
-#
-# Core binaries
-
-game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
-game_TARGET = OpenRA.Game.exe
-game_KIND = winexe
-game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/download/SharpFont.dll thirdparty/download/Open.Nat.dll
-game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
-PROGRAMS += game
-game: $(game_TARGET)
-
-# Platform dlls
-pdefault_SRCS := $(shell find OpenRA.Platforms.Default/ -iname '*.cs')
-pdefault_TARGET = OpenRA.Platforms.Default.dll
-pdefault_KIND = library
-pdefault_DEPS = $(game_TARGET)
-pdefault_LIBS = $(COMMON_LIBS) thirdparty/download/SDL2-CS.dll thirdparty/download/OpenAL-CS.dll $(pdefault_DEPS)
-PROGRAMS += pdefault
-platforms: $(pdefault_TARGET)
-
-# Mods Common
-mod_common_SRCS := $(shell find OpenRA.Mods.Common/ -iname '*.cs')
-mod_common_TARGET = mods/common/OpenRA.Mods.Common.dll
-mod_common_KIND = library
-mod_common_DEPS = $(game_TARGET)
-mod_common_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) thirdparty/download/StyleCop.dll thirdparty/download/StyleCop.CSharp.dll thirdparty/download/StyleCop.CSharp.Rules.dll
-PROGRAMS += mod_common
-mod_common: $(mod_common_TARGET)
-
-# NUnit testing
-test_dll_SRCS := $(shell find OpenRA.Test/ -iname '*.cs')
-test_dll_TARGET = OpenRA.Test.dll
-test_dll_KIND = library
-test_dll_DEPS = $(game_TARGET) $(mod_common_TARGET)
-test_dll_FLAGS = -warn:1
-test_dll_LIBS = $(COMMON_LIBS) $(game_TARGET) $(mod_common_TARGET) $(NUNIT_LIBS)
-PROGRAMS += test_dll
-test_dll: $(test_dll_TARGET)
-
-##### Official Mods #####
-
-STD_MOD_LIBS	= $(game_TARGET)
-STD_MOD_DEPS	= $(STD_MOD_LIBS)
-
-# Command and Conquer
-mod_cnc_SRCS := $(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
-mod_cnc_TARGET = mods/common/OpenRA.Mods.Cnc.dll
-mod_cnc_KIND = library
-mod_cnc_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
-mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
-PROGRAMS += mod_cnc
-mod_cnc: $(mod_cnc_TARGET)
-
-# Dune 2000
-mod_d2k_SRCS := $(shell find OpenRA.Mods.D2k/ -iname '*.cs')
-mod_d2k_TARGET = mods/d2k/OpenRA.Mods.D2k.dll
-mod_d2k_KIND = library
-mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
-mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
-PROGRAMS += mod_d2k
-mod_d2k: $(mod_d2k_TARGET)
+# program targets
+VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
 
 check-scripts:
 	@echo
@@ -170,58 +104,21 @@ check-scripts:
 	@luac -p $(shell find mods/*/maps/* -iname '*.lua')
 	@luac -p $(shell find lua/* -iname '*.lua')
 
-check: utility mods
+check:
+	@echo
+	@echo "Compiling in debug mode..."
+	@$(MSBUILD) -t:build -p:Configuration=Debug
+	@echo
+	@echo "Checking runtime assemblies..."
+	@mono --debug OpenRA.Utility.exe all --check-runtime-assemblies $(WHITELISTED_OPENRA_ASSEMBLIES) $(WHITELISTED_THIRDPARTY_ASSEMBLIES) $(WHITELISTED_CORE_ASSEMBLIES)
 	@echo
 	@echo "Checking for explicit interface violations..."
 	@mono --debug OpenRA.Utility.exe all --check-explicit-interfaces
 	@echo
-	@echo "Checking for code style violations in OpenRA.Game..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Game
-	@echo
-	@echo "Checking for code style violations in OpenRA.Platforms.Default..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Platforms.Default
-	@echo
-	@echo "Checking for code style violations in OpenRA.GameMonitor..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.GameMonitor
-	@echo
-	@echo "Checking for code style violations in OpenRA.Mods.Common..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Common
-	@echo
-	@echo "Checking for code style violations in OpenRA.Mods.Cnc..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Cnc
-	@echo
-	@echo "Checking for code style violations in OpenRA.Mods.D2k..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.D2k
-	@echo
-	@echo "Checking for code style violations in OpenRA.Utility..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Utility
-	@echo
-	@echo "Checking for code style violations in OpenRA.Test..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Test
-	@echo
-	@echo "Checking for code style violations in OpenRA.Server..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Server
+	@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: test_dll
-	@echo
-	@echo "Checking unit tests..."
-	@if [ "$(NUNIT_CONSOLE)" = "" ] ; then \
-		echo 'nunit[3|2]-console not found!'; \
-		echo 'Was "make dependencies" called or is NUnit installed?'>&2; \
-		echo 'See "make help".'; \
-		exit 1; \
-	fi
-	@if $(NUNIT_CONSOLE) --help | head -n 1 | grep -E "NUnit version (1|2\.[0-5])";then \
-		echo 'NUnit version >= 2.6 required'>&2; \
-		echo 'Try "make dependencies" first to use NUnit from NuGet.'>&2; \
-		echo 'See "make help".'; \
-		exit 1; \
-	fi
-	@$(NUNIT_CONSOLE) --noresult OpenRA.Test.nunit
-
-test: utility mods
+test: core
 	@echo
 	@echo "Testing Tiberian Sun mod MiniYAML..."
 	@mono --debug OpenRA.Utility.exe ts --check-yaml
@@ -235,146 +132,75 @@ test: utility mods
 	@echo "Testing Red Alert mod MiniYAML..."
 	@mono --debug OpenRA.Utility.exe ra --check-yaml
 
-
-##### Launchers / Utilities #####
-
-gamemonitor_SRCS := $(shell find OpenRA.GameMonitor/ -iname '*.cs')
-gamemonitor_TARGET = OpenRA.exe
-gamemonitor_KIND = winexe
-gamemonitor_DEPS = $(game_TARGET)
-gamemonitor_LIBS = $(COMMON_LIBS) $(gamemonitor_DEPS) System.Windows.Forms.dll
-gamemonitor_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
-PROGRAMS += gamemonitor
-gamemonitor: $(gamemonitor_TARGET)
-
-# Backend for the launcher apps - queries game/mod info and applies actions to an install
-utility_SRCS := $(shell find OpenRA.Utility/ -iname '*.cs')
-utility_TARGET = OpenRA.Utility.exe
-utility_KIND = exe
-utility_DEPS = $(game_TARGET)
-utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/download/ICSharpCode.SharpZipLib.dll
-PROGRAMS += utility
-utility: $(utility_TARGET)
-
-# Dedicated server
-server_SRCS := $(shell find OpenRA.Server/ -iname '*.cs')
-server_TARGET = OpenRA.Server.exe
-server_KIND = exe
-server_DEPS = $(game_TARGET)
-server_LIBS = $(COMMON_LIBS) $(server_DEPS)
-PROGRAMS += server
-server: $(server_TARGET)
-
-# Patches binary headers to work around a mono bug
-fixheader.exe: packaging/fixheader.cs
-	@command -v $(CSC) >/dev/null || (echo "Mono is not installed. Please install Mono from http://www.mono-project.com/download/ before building OpenRA."; exit 1)
-	@echo CSC fixheader.exe
-	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
-
-# Generate build rules for each target defined above in PROGRAMS
-define BUILD_ASSEMBLY
-
-$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader.exe
-	@echo CSC $$(@)
-	@$(CSC) $$($(1)_LIBS:%=-r:%) \
-		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
-		-define:"$(DEFINE)" \
-		-t:"$$($(1)_KIND)" \
-		$$($(1)_EXTRA) \
-		$$($(1)_SRCS)
-	@mono fixheader.exe $$(@) > /dev/null
-	@test `echo $$(@) | sed 's/^.*\.//'` = "dll" && chmod a-x $$(@) || ``
-	@$$($(1)_EXTRA_CMDS)
-endef
-
-$(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
-
-
-
 ########################## MAKE/INSTALL RULES ##########################
 #
-default: core
+all: core
 
-core: dependencies game platforms mods utility server
-
-tools: gamemonitor
-
-package: all-dependencies core tools docs version
-
-mods: mod_common mod_cnc mod_d2k
-
-all: dependencies core tools
+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
+endif
+	@./fetch-geoip.sh
 
 clean:
-	@-$(RM_F) *.exe *.dll *.dylib *.dll.config ./OpenRA*/*.dll ./OpenRA*/*.mdb *.mdb mods/**/*.dll mods/**/*.mdb *.resources
+	@-$(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
-	@-$(RM_RF) ./thirdparty/download
+	@ $(MSBUILD) -t:clean
 
-distclean: clean
-
-cli-dependencies:
-	@./thirdparty/fetch-thirdparty-deps.sh
-	@ $(CP_R) thirdparty/download/*.dll .
-	@ $(CP_R) thirdparty/download/*.dll.config .
-
-linux-dependencies: cli-dependencies linux-native-dependencies
-
-linux-native-dependencies:
-	@./thirdparty/configure-native-deps.sh
-
-windows-dependencies:
-	@./thirdparty/fetch-thirdparty-deps-windows.sh
-
-osx-dependencies: cli-dependencies
-	@./thirdparty/fetch-thirdparty-deps-osx.sh
-	@ $(CP_R) thirdparty/download/osx/*.dylib .
-	@ $(CP_R) thirdparty/download/osx/*.dll.config .
-
-dependencies: $(os-dependencies)
-	@./thirdparty/fetch-geoip-db.sh
-	@ $(CP) thirdparty/download/GeoLite2-Country.mmdb.gz .
-
-all-dependencies: cli-dependencies windows-dependencies osx-dependencies
-
-version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modchooser/mod.yaml mods/all/mod.yaml
+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
 	@for i in $? ; do \
 		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
-		awk '{sub("\tmodchooser:.*$$","\tmodchooser: $(VERSION)"); print $0}' $${i}.tmp > $${i}.tmp2 && \
-		awk '{sub("/[^/]*: User$$", "/$(VERSION): User"); print $0}' $${i}.tmp2 > $${i} && \
-		rm $${i}.tmp $${i}.tmp2; \
+		awk '{sub("/[^/]*: User$$", "/$(VERSION): User"); print $0}' $${i}.tmp > $${i} && \
+		rm $${i}.tmp; \
 	done
 
-docs: utility mods version
-	@mono --debug OpenRA.Utility.exe all --docs > DOCUMENTATION.md
-	@mono --debug OpenRA.Utility.exe all --lua-docs > Lua-API.md
-
-man-page: utility mods
-	@mono --debug OpenRA.Utility.exe all --man-page > openra.6
-
-install: install-core
-
-install-all: install-core install-tools
+install: core install-engine install-common-mod-files install-default-mods
+	@$(CP) *.sh "$(DATA_INSTALL_DIR)"
 
 install-linux-shortcuts: install-linux-scripts install-linux-icons install-linux-desktop
 
-install-core: default
-	@-echo "Installing OpenRA to $(DATA_INSTALL_DIR)"
-	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods"
-	@$(CP_R) mods/common "$(DATA_INSTALL_DIR)/mods/"
-	@$(INSTALL_PROGRAM) $(mod_common_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
-	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
-	@$(CP_R) mods/cnc "$(DATA_INSTALL_DIR)/mods/"
-	@$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/"
-	@$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/"
-	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k"
-	@$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/"
+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_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat"
-	@$(INSTALL_DATA) "GeoLite2-Country.mmdb.gz" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb.gz"
+install-engine:
+	@-echo "Installing OpenRA engine to $(DATA_INSTALL_DIR)"
+	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) OpenRA.Game.exe "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) OpenRA.Server.exe "$(DATA_INSTALL_DIR)"
+	@$(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) 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)"
@@ -383,136 +209,163 @@ install-core: default
 	@$(CP) Eluant* "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) FuzzyLogicLibrary.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) SharpFont.dll "$(DATA_INSTALL_DIR)"
-	@$(CP) SharpFont.dll.config "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) Open.Nat.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) MaxMind.Db.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) SmarIrc4net.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) BeaconLib.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) DiscordRPC.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) Newtonsoft.Json.dll "$(DATA_INSTALL_DIR)"
 
-ifneq ($(UNAME_S),Darwin)
-	@$(CP) *.sh "$(DATA_INSTALL_DIR)"
-endif
+install-common-mod-files:
+	@-echo "Installing OpenRA common mod files to $(DATA_INSTALL_DIR)"
+	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods"
+	@$(CP_R) mods/common "$(DATA_INSTALL_DIR)/mods/"
+	@$(INSTALL_PROGRAM) mods/common/OpenRA.Mods.Common.dll "$(DATA_INSTALL_DIR)/mods/common"
+	@$(INSTALL_PROGRAM) mods/common/OpenRA.Mods.Cnc.dll "$(DATA_INSTALL_DIR)/mods/common"
+	@$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat"
 
-install-tools: tools
-	@-echo "Installing OpenRA tools to $(DATA_INSTALL_DIR)"
-	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) $(foreach prog,$(TOOLS),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
+install-default-mods:
+	@-echo "Installing OpenRA default mods to $(DATA_INSTALL_DIR)"
+	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods"
+	@$(CP_R) mods/cnc "$(DATA_INSTALL_DIR)/mods/"
+	@$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/"
+	@$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/"
+	@$(INSTALL_PROGRAM) mods/d2k/OpenRA.Mods.D2k.dll "$(DATA_INSTALL_DIR)/mods/d2k"
+	@$(CP_R) mods/modcontent "$(DATA_INSTALL_DIR)/mods/"
 
 install-linux-icons:
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
-	@$(CP_R) packaging/linux/hicolor "$(DESTDIR)$(datadir)/icons/"
+	for SIZE in 16x16 32x32 48x48 64x64 128x128; do \
+		$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps"; \
+		$(INSTALL_DATA) packaging/artwork/ra_$$SIZE.png "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-ra.png"; \
+		$(INSTALL_DATA) packaging/artwork/cnc_$$SIZE.png "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-cnc.png"; \
+		$(INSTALL_DATA) packaging/artwork/d2k_$$SIZE.png "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-d2k.png"; \
+	done
+	$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps"
+	$(INSTALL_DATA) packaging/artwork/ra_scalable.svg "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-ra.svg"
+	$(INSTALL_DATA) packaging/artwork/cnc_scalable.svg "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-cnc.svg"
 
 install-linux-desktop:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
+	@sed 's/{MODID}/ra/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Red Alert/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-ra.desktop
+	@$(INSTALL_DATA) packaging/linux/openra-ra.desktop "$(DESTDIR)$(datadir)/applications"
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Tiberian Dawn/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-cnc.desktop
+	@$(INSTALL_DATA) packaging/linux/openra-cnc.desktop "$(DESTDIR)$(datadir)/applications"
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Dune 2000/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-d2k.desktop
+	@$(INSTALL_DATA) packaging/linux/openra-d2k.desktop "$(DESTDIR)$(datadir)/applications"
+	@-$(RM) packaging/linux/openra-ra.desktop packaging/linux/openra-cnc.desktop packaging/linux/openra-d2k.desktop
 
 install-linux-mime:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/mime/packages/"
-	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
-
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra-replays.desktop "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra-launch-mod.desktop "$(DESTDIR)$(datadir)/applications"
+	@sed 's/{MODID}/ra/g' packaging/linux/openra-mimeinfo.xml.in | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-mimeinfo.xml
+	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra-ra.xml"
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra-mimeinfo.xml.in | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-mimeinfo.xml
+	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra-cnc.xml"
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra-mimeinfo.xml.in | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-mimeinfo.xml
+	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra-d2k.xml"
 
 install-linux-appdata:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/appdata/"
-	@$(INSTALL_DATA) packaging/linux/openra.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+	@sed 's/{MODID}/ra/g' packaging/linux/openra.appdata.xml.in | sed 's/{MOD_NAME}/Red Alert/g' | sed 's/{SCREENSHOT_RA}/ type="default"/g' | sed 's/{SCREENSHOT_CNC}//g' | sed 's/{SCREENSHOT_D2K}//g'> packaging/linux/openra-ra.appdata.xml
+	@$(INSTALL_DATA) packaging/linux/openra-ra.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra.appdata.xml.in | sed 's/{MOD_NAME}/Tiberian Dawn/g' | sed 's/{SCREENSHOT_RA}//g' | sed 's/{SCREENSHOT_CNC}/ type="default"/g' | sed 's/{SCREENSHOT_D2K}//g'> packaging/linux/openra-cnc.appdata.xml
+	@$(INSTALL_DATA) packaging/linux/openra-cnc.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra.appdata.xml.in | sed 's/{MOD_NAME}/Dune 2000/g' | sed 's/{SCREENSHOT_RA}//g' | sed 's/{SCREENSHOT_CNC}//g' | sed 's/{SCREENSHOT_D2K}/ type="default"/g'> packaging/linux/openra-d2k.appdata.xml
+	@$(INSTALL_DATA) packaging/linux/openra-d2k.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+	@-$(RM) packaging/linux/openra-ra.appdata.xml packaging/linux/openra-cnc.appdata.xml packaging/linux/openra-d2k.appdata.xml
 
-install-man-page: man-page
+install-man-page:
 	@$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man6/"
+	@mono --debug OpenRA.Utility.exe all --man-page > openra.6
 	@$(INSTALL_DATA) openra.6 "$(DESTDIR)$(mandir)/man6/"
+	@-$(RM) openra.6
 
 install-linux-scripts:
-	@echo "#!/bin/sh" > openra
-	@echo 'cd "$(gameinstalldir)"' >> openra
-# Note: this relies on the non-standard -f flag implemented by gnu readlink
 ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
-	@echo 'mono OpenRA.Game.exe Engine.LaunchPath="$$(readlink -f $$0)" "$$@"' >> openra
+	@sed 's/{DEBUG}//' packaging/linux/openra.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra.debug.in
+	@sed 's/{DEBUG}//' packaging/linux/openra-server.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra-server.debug.in
 else
-	@echo 'mono --debug OpenRA.Game.exe Engine.LaunchPath="$$(readlink -f $$0)" "$$@"' >> openra
-endif
-	@echo 'if [ $$? != 0 -a $$? != 1 ]' >> openra
-	@echo 'then' >> openra
-	@echo 'ZENITY=`which zenity` || echo "OpenRA needs zenity installed to display a graphical error dialog. See ~/.openra. for log files."' >> openra
-	@echo '$$ZENITY --question --title "OpenRA" --text "OpenRA has encountered a fatal error.\nLog Files are available in ~/.openra." --ok-label "Quit" --cancel-label "View FAQ" || xdg-open https://github.com/OpenRA/OpenRA/wiki/FAQ' >> openra
-	@echo 'exit 1' >> openra
-	@echo 'fi' >> openra
-
-	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) -m +rx openra "$(BIN_INSTALL_DIR)"
-	@-$(RM) openra
-
-	@echo "#!/bin/sh" > openra-server
-	@echo 'cd "$(gameinstalldir)"' >> openra-server
-ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
-	@echo 'mono OpenRA.Server.exe "$$@"' >> openra-server
-else
-	@echo 'mono --debug OpenRA.Server.exe "$$@"' >> openra-server
+	@sed 's/{DEBUG}/--debug/' packaging/linux/openra.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra.debug.in
+	@sed 's/{DEBUG}/--debug/' packaging/linux/openra-server.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra-server.debug.in
 endif
 
+	@sed 's/{MODID}/ra/g' packaging/linux/openra.debug.in  | sed 's/{TAG}/$(VERSION)/g' | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra.debug.in | sed 's/{TAG}/$(VERSION)/g' | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra.debug.in | sed 's/{TAG}/$(VERSION)/g' | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k
+
 	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) -m +rx openra-server "$(BIN_INSTALL_DIR)"
-	@-$(RM) openra-server
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-ra "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-cnc "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-d2k "$(BIN_INSTALL_DIR)"
+	@-$(RM) packaging/linux/openra-ra packaging/linux/openra-cnc packaging/linux/openra-d2k packaging/linux/openra.debug.in
+
+	@sed 's/{MODID}/ra/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra-server
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc-server
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k-server
+
+	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-ra-server "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-cnc-server "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-d2k-server "$(BIN_INSTALL_DIR)"
+	@-$(RM) packaging/linux/openra-ra-server packaging/linux/openra-cnc-server packaging/linux/openra-d2k-server packaging/linux/openra-server.debug.in
 
 uninstall:
 	@-$(RM_R) "$(DATA_INSTALL_DIR)"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-server"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-join-servers.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-launch-mod.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-join-servers.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra.appdata.xml"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-ra"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-ra-server"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-cnc"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-cnc-server"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-d2k"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-d2k-server"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-ra.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-cnc.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-d2k.desktop"
+	@-for SIZE in 16x16 32x32 48x48 64x64 128x128; do \
+		$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-ra.png"; \
+		$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-cnc.png"; \
+		$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-d2k.png"; \
+	done
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-ra.svg"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-cnc.svg"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra-ra.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra-cnc.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra-d2k.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra-ra.appdata.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra-cnc.appdata.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra-d2k.appdata.xml"
 	@-$(RM_F) "$(DESTDIR)$(mandir)/man6/openra.6"
 
 help:
 	@echo 'to compile, run:'
-	@echo '  make [DEBUG=false]'
+	@echo '  make [DEBUG=true]'
 	@echo
-	@echo 'to compile with development tools, run:'
-	@echo '  make all [DEBUG=false]'
-	@echo
-	@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 'to compile using system libraries for native dependencies, run:'
+	@echo '  make [DEBUG=true] TARGETPLATFORM=unix-generic'
 	@echo
 	@echo 'to check the official mods for erroneous yaml files, run:'
 	@echo '  make test'
 	@echo
-	@echo 'to generate documentation aimed at modders, run:'
-	@echo '  make docs'
+	@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 with development tools, run:'
-	@echo '  make [prefix=/foo] [bindir=/bar/bin] install-all'
-	@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
 	@echo 'to start the game, run:'
 	@echo '  openra'
 
-
-
-
 ########################### MAKEFILE SETTINGS ##########################
 #
-.DEFAULT_GOAL := default
+.DEFAULT_GOAL := all
 
 .SUFFIXES:
 
-.PHONY: core tools package all mods clean distclean dependencies version $(PROGRAMS) nunit
+.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-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-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -12,183 +12,156 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Graphics;
+using OpenRA.Primitives;
 using OpenRA.Traits;
 
 namespace OpenRA.Activities
 {
-	public enum ActivityState { Queued, Active, Done, Canceled }
+	public enum ActivityState { Queued, Active, Canceling, Done }
+
+	public class TargetLineNode
+	{
+		public readonly Target Target;
+		public readonly Color Color;
+		public readonly Sprite Tile;
+
+		public TargetLineNode(Target target, Color color, Sprite tile = null)
+		{
+			// Note: Not all activities are drawable. In that case, pass Target.Invalid as target,
+			// if "yield break" in TargetLineNode(Actor self) is not feasible.
+			Target = target;
+			Color = color;
+			Tile = tile;
+		}
+	}
 
 	/*
-	 * Activities are actions carried out by actors during each tick.
-	 *
-	 * Activities exist in a graph data structure built up amongst themselves. Each activity has a parent activity,
-	 * optionally child activities, and usually a next activity. An actor's CurrentActivity is a pointer into that graph
-	 * and moves through it as activities run.
-	 *
-	 * There are two kinds of activities, the base activity and composite activities. They differ in the way their children
-	 * are run: while a base activity is responsible for running its children itself, a composite activity relies on the actor's
-	 * activity-running code. Therefore, the actor's CurrentActivity stays on the base activity while it runs its children. With
-	 * composite activities however, the CurrentActivity moves through the list of children as they run.
-	 *
-	 *
 	 * Things to be aware of when writing activities:
 	 *
-	 * - Use "return NextActivity" at least once somewhere in the tick method.
-	 * - Do not use "return new SomeActivity()" as that will break the graph. Queue the new activity and use "return NextActivity" instead.
-	 * - Do not "reuse" (with "SequenceActivities", for example) activity objects that have already finished running.
+	 * - 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.
 	 *   Queue a new instance instead.
 	 * - Avoid calling actor.CancelActivity(). It is almost always a bug. Call activity.Cancel() instead.
-	 * - A composite activity will run at least twice. The first time when it returns its children,
-	 *   the second time when its last child returns its Parent.
-	 * - Do not return the Parent explicitly unless you have an extremly good reason. "return NextActivity"
-	 *   will do the right thing in all circumstances.
-	 * - You do not need to care about the ChildActivity pointer advancing through the list of children,
-	 *   the activity code already takes care of that.
-	 * - If you want to check whether there are any follow-up activities queued, check against "NextInQueue"
-	 *   in favour of "NextActivity" to avoid checking against the Parent activity.
-	 *
-	 *
-	 * Guide when to use which kind of activity:
-	 *
-	 * - The activity does not have any children -> base activity
-	 * - The activity needs to run preparatory steps during each tick before its children can be run -> base activity
-	 * - The activity or the actor is left in a bogus state when one of the child activities is canceled -> base activity
-	 * - The activity's children are self-contained and can run independently of the parent -> composite activity
-	 * - The activity does not have any or little logic of its own, but is just composed of sub-steps -> composite activity
-	*/
-	public abstract class Activity
+	 * - 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; }
 
-		/// <summary>
-		/// Returns the top-most activity *from the point of view of the calling activity*. Note that the root activity
-		/// can and likely will have next activities of its own, which would in turn be the root for their children.
-		/// </summary>
-		public Activity RootActivity
-		{
-			get
-			{
-				var p = this;
-				while (p.ParentActivity != null)
-					p = p.ParentActivity;
-
-				return p;
-			}
-		}
-
-		Activity parentActivity;
-		public Activity ParentActivity
-		{
-			get
-			{
-				return parentActivity;
-			}
-
-			protected set
-			{
-				parentActivity = value;
-
-				var next = NextInQueue;
-				if (next != null)
-					next.ParentActivity = parentActivity;
-			}
-		}
-
 		Activity childActivity;
 		protected Activity ChildActivity
 		{
-			get
-			{
-				return childActivity != null && childActivity.State < ActivityState.Done ? childActivity : null;
-			}
-
-			set
-			{
-				if (value == this || value == ParentActivity || value == NextInQueue)
-					childActivity = null;
-				else
-				{
-					childActivity = value;
-
-					if (childActivity != null)
-						childActivity.ParentActivity = this;
-				}
-			}
+			get { return SkipDoneActivities(childActivity); }
+			private set { childActivity = value; }
 		}
 
 		Activity nextActivity;
-
-		/// <summary>
-		/// The getter will return either the next activity or, if there is none, the parent one.
-		/// </summary>
-		public virtual Activity NextActivity
+		public Activity NextActivity
 		{
-			get
-			{
-				return nextActivity != null ? nextActivity : ParentActivity;
-			}
-
-			set
-			{
-				if (value == this || value == ParentActivity || (value != null && value.ParentActivity == this))
-					nextActivity = null;
-				else
-				{
-					nextActivity = value;
-
-					if (nextActivity != null)
-						nextActivity.ParentActivity = ParentActivity;
-				}
-			}
+			get { return SkipDoneActivities(nextActivity); }
+			private set { nextActivity = value; }
 		}
 
-		/// <summary>
-		/// The getter will return the next activity on the same level _only_, in contrast to NextActivity.
-		/// Use this to check whether there are any follow-up activities queued.
-		/// </summary>
-		public Activity NextInQueue
+		internal static Activity SkipDoneActivities(Activity first)
 		{
-			get { return nextActivity; }
-			set { NextActivity = value; }
+			// 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;
 		}
 
 		public bool IsInterruptible { get; protected set; }
-		public bool IsCanceled { get { return State == ActivityState.Canceled; } }
+		public bool ChildHasPriority { get; protected set; }
+		public bool IsCanceling { get { return State == ActivityState.Canceling; } }
+		bool finishing;
+		bool firstRunCompleted;
+		bool lastRun;
 
 		public Activity()
 		{
 			IsInterruptible = true;
+			ChildHasPriority = true;
 		}
 
 		public Activity TickOuter(Actor self)
 		{
-			if (State == ActivityState.Done && Game.Settings.Debug.StrictActivityChecking)
-				throw new InvalidOperationException("Actor {0} attempted to tick activity {1} after it had already completed.".F(self, this.GetType()));
+			if (State == ActivityState.Done)
+				throw new InvalidOperationException("Actor {0} attempted to tick activity {1} after it had already completed.".F(self, GetType()));
 
 			if (State == ActivityState.Queued)
 			{
 				OnFirstRun(self);
+				firstRunCompleted = true;
 				State = ActivityState.Active;
 			}
 
-			var ret = Tick(self);
-			if (ret == null || (ret != this && ret.ParentActivity != this))
+			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)
 			{
-				// Make sure that the Parent's ChildActivity pointer is moved forwards as the child queue advances.
-				// The Child's ParentActivity will be set automatically during assignment.
-				if (ParentActivity != null && ParentActivity != ret)
-					ParentActivity.ChildActivity = ret;
-
-				if (State != ActivityState.Canceled)
-					State = ActivityState.Done;
-
-				OnLastRun(self);
+				lastRun = TickChild(self) && (finishing || Tick(self));
+				finishing |= lastRun;
 			}
 
-			return ret;
+			// The parent determines whether the child gets a chance at ticking.
+			else
+				lastRun = Tick(self);
+
+			// Avoid a single tick delay if the childactivity was just queued.
+			if (ChildActivity != null && ChildActivity.State == ActivityState.Queued)
+			{
+				if (ChildHasPriority)
+					lastRun = TickChild(self) && finishing;
+				else
+					TickChild(self);
+			}
+
+			if (lastRun)
+			{
+				State = ActivityState.Done;
+				OnLastRun(self);
+				return NextActivity;
+			}
+
+			return this;
 		}
 
-		public abstract Activity Tick(Actor self);
+		protected bool TickChild(Actor self)
+		{
+			ChildActivity = ActivityUtils.RunActivity(self, ChildActivity);
+			return ChildActivity == null;
+		}
+
+		/// <summary>
+		/// Called every tick to run activity logic. Returns false if the activity should
+		/// remain active, or true if it is complete. Cancelled activities must ensure they
+		/// return the actor to a consistent state before returning true.
+		///
+		/// Child activities can be queued using QueueChild, and these will be ticked
+		/// instead of the parent while they are active. Activities that need to run logic
+		/// in parallel with child activities should set ChildHasPriority to false and
+		/// manually call TickChildren.
+		///
+		/// Queuing one or more child activities and returning true is valid, and causes
+		/// the activity to be completed immediately (without ticking again) once the
+		/// children have completed.
+		/// </summary>
+		public virtual bool Tick(Actor self)
+		{
+			return true;
+		}
 
 		/// <summary>
 		/// Runs once immediately before the first Tick() execution.
@@ -200,30 +173,46 @@ namespace OpenRA.Activities
 		/// </summary>
 		protected virtual void OnLastRun(Actor self) { }
 
-		public virtual bool Cancel(Actor self)
+		/// <summary>
+		/// Runs once on Actor.Dispose() (through OnActorDisposeOuter) and can be used to perform activity clean-up on actor death/disposal,
+		/// for example by force-triggering OnLastRun (which would otherwise be skipped).
+		/// </summary>
+		protected virtual void OnActorDispose(Actor self) { }
+
+		/// <summary>
+		/// Runs once on Actor.Dispose().
+		/// Main purpose is to ensure ChildActivity.OnActorDispose runs as well (which isn't otherwise accessible due to protection level).
+		/// </summary>
+		internal void OnActorDisposeOuter(Actor self)
 		{
+			ChildActivity?.OnActorDisposeOuter(self);
+
+			OnActorDispose(self);
+		}
+
+		public virtual void Cancel(Actor self, bool keepQueue = false)
+		{
+			if (!keepQueue)
+				NextActivity = null;
+
 			if (!IsInterruptible)
-				return false;
+				return;
 
-			if (ChildActivity != null && !ChildActivity.Cancel(self))
-				return false;
+			ChildActivity?.Cancel(self);
 
-			State = ActivityState.Canceled;
-			NextActivity = null;
-			ChildActivity = null;
-
-			return true;
+			// Directly mark activities that are queued and therefore didn't run yet as done
+			State = State == ActivityState.Queued ? ActivityState.Done : ActivityState.Canceling;
 		}
 
-		public virtual void Queue(Activity activity)
+		public void Queue(Activity activity)
 		{
-			if (NextInQueue != null)
-				NextInQueue.Queue(activity);
+			if (NextActivity != null)
+				NextActivity.Queue(activity);
 			else
-				NextInQueue = activity;
+				NextActivity = activity;
 		}
 
-		public virtual void QueueChild(Activity activity)
+		public void QueueChild(Activity activity)
 		{
 			if (ChildActivity != null)
 				ChildActivity.Queue(activity);
@@ -232,30 +221,29 @@ namespace OpenRA.Activities
 		}
 
 		/// <summary>
-		/// Prints the activity tree, starting from the root or optionally from a given origin.
+		/// Prints the activity tree, starting from the top or optionally from a given origin.
 		///
 		/// Call this method from any place that's called during a tick, such as the Tick() method itself or
 		/// the Before(First|Last)Run() methods. The origin activity will be marked in the output.
 		/// </summary>
-		/// <param name="origin">Activity from which to start traversing, and which to mark. If null, mark the calling activity, and start traversal from the root.</param>
+		/// <param name="self">The actor performing this activity.</param>
+		/// <param name="origin">Activity from which to start traversing, and which to mark. If null, mark the calling activity, and start traversal from the top.</param>
 		/// <param name="level">Initial level of indentation.</param>
-		protected void PrintActivityTree(Activity origin = null, int level = 0)
+		protected void PrintActivityTree(Actor self, Activity origin = null, int level = 0)
 		{
 			if (origin == null)
-				RootActivity.PrintActivityTree(this);
+				self.CurrentActivity.PrintActivityTree(self, this);
 			else
 			{
 				Console.Write(new string(' ', level * 2));
 				if (origin == this)
 					Console.Write("*");
 
-				Console.WriteLine(this.GetType().ToString().Split('.').Last());
+				Console.WriteLine(GetType().ToString().Split('.').Last());
 
-				if (ChildActivity != null)
-					ChildActivity.PrintActivityTree(origin, level + 1);
+				ChildActivity?.PrintActivityTree(self, origin, level + 1);
 
-				if (NextInQueue != null)
-					NextInQueue.PrintActivityTree(origin, level);
+				NextActivity?.PrintActivityTree(self, origin, level);
 			}
 		}
 
@@ -263,39 +251,34 @@ namespace OpenRA.Activities
 		{
 			yield break;
 		}
-	}
 
-	/// <summary>
-	/// In contrast to the base activity class, which is responsible for running its children itself,
-	/// composite activities rely on the actor's activity-running logic for their children.
-	/// </summary>
-	public abstract class CompositeActivity : Activity
-	{
-		/// <summary>
-		/// The getter will return the first non-null value of either child, next or parent activity, in that order, or ultimately null.
-		/// </summary>
-		public override Activity NextActivity
+		public virtual IEnumerable<TargetLineNode> TargetLineNodes(Actor self)
 		{
-			get
+			yield break;
+		}
+
+		public IEnumerable<string> DebugLabelComponents()
+		{
+			var act = this;
+			while (act != null)
 			{
-				if (ChildActivity != null)
-					return ChildActivity;
-				else if (NextInQueue != null)
-					return NextInQueue;
-				else
-					return ParentActivity;
+				yield return act.GetType().Name;
+				act = act.ChildActivity;
 			}
 		}
-	}
 
-	public static class ActivityExts
-	{
-		public static IEnumerable<Target> GetTargetQueue(this Actor self)
+		public IEnumerable<T> ActivitiesImplementing<T>(bool includeChildren = true) where T : IActivityInterface
 		{
-			return self.CurrentActivity
-				.Iterate(u => u.NextActivity)
-				.TakeWhile(u => u != null)
-				.SelectMany(u => u.GetTargets(self));
+			if (includeChildren && ChildActivity != null)
+				foreach (var a in ChildActivity.ActivitiesImplementing<T>())
+					yield return a;
+
+			if (this is T)
+				yield return (T)(object)this;
+
+			if (NextActivity != null)
+				foreach (var a in NextActivity.ActivitiesImplementing<T>())
+					yield return a;
 		}
 	}
 }

OpenRA.Game/Activities/CallFunc.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -24,10 +24,10 @@ namespace OpenRA.Activities
 
 		Action a;
 
-		public override Activity Tick(Actor self)
+		public override bool Tick(Actor self)
 		{
-			if (a != null) a();
-			return NextActivity;
+			a?.Invoke();
+			return true;
 		}
 	}
 }

OpenRA.Game/Actor.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -11,7 +11,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
+using System.IO;
 using System.Linq;
 using Eluant;
 using Eluant.ObjectBinding;
@@ -28,8 +28,9 @@ namespace OpenRA
 		internal struct SyncHash
 		{
 			public readonly ISync Trait;
-			public readonly int Hash;
-			public SyncHash(ISync trait, int hash) { Trait = trait; Hash = hash; }
+			readonly Func<object, int> hashFunction;
+			public SyncHash(ISync trait) { Trait = trait; hashFunction = Sync.GetHashFunction(trait); }
+			public int Hash() { return hashFunction(Trait); }
 		}
 
 		public readonly ActorInfo Info;
@@ -41,15 +42,19 @@ namespace OpenRA
 		public Player Owner { get; internal set; }
 
 		public bool IsInWorld { get; internal set; }
+		public bool WillDispose { get; private set; }
 		public bool Disposed { get; private set; }
 
-		public Activity CurrentActivity { get; private set; }
+		Activity currentActivity;
+		public Activity CurrentActivity
+		{
+			get { return Activity.SkipDoneActivities(currentActivity); }
+			private set { currentActivity = value; }
+		}
 
-		public Group Group;
 		public int Generation;
+		public Actor ReplacedByActor;
 
-		public Rectangle Bounds { get; private set; }
-		public Rectangle VisualBounds { get; private set; }
 		public IEffectiveOwner EffectiveOwner { get; private set; }
 		public IOccupySpace OccupiesSpace { get; private set; }
 		public ITargetable[] Targetables { get; private set; }
@@ -64,30 +69,67 @@ namespace OpenRA
 		{
 			get
 			{
-				// TODO: Support non-zero pitch/roll in IFacing (IOrientation?)
-				var facingValue = facing != null ? facing.Facing : 0;
-				return new WRot(WAngle.Zero, WAngle.Zero, WAngle.FromFacing(facingValue));
+				return facing != null ? facing.Orientation : WRot.None;
 			}
 		}
 
-		internal IEnumerable<SyncHash> SyncHashes { get; private set; }
+		/// <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;
 		readonly IHealth health;
 		readonly IRenderModifier[] renderModifiers;
 		readonly IRender[] renders;
-		readonly IDisable[] disables;
+		readonly IMouseBounds[] mouseBounds;
 		readonly IVisibilityModifier[] visibilityModifiers;
 		readonly IDefaultVisibility defaultVisibility;
+		readonly INotifyBecomingIdle[] becomingIdles;
+		readonly INotifyIdle[] tickIdles;
+		readonly ITargetablePositions[] targetablePositions;
+		WPos[] staticTargetablePositions;
+		bool created;
 
 		internal Actor(World world, string name, TypeDictionary initDict)
 		{
+			var duplicateInit = initDict.WithInterface<ISingleInstanceInit>().GroupBy(i => i.GetType())
+				.FirstOrDefault(i => i.Count() > 1);
+
+			if (duplicateInit != null)
+				throw new InvalidDataException("Duplicate initializer '{0}'".F(duplicateInit.Key.Name));
+
 			var init = new ActorInitializer(this, initDict);
 
+			readOnlyConditionCache = new ReadOnlyDictionary<string, int>(conditionCache);
+
 			World = world;
 			ActorID = world.NextAID();
-			if (initDict.Contains<OwnerInit>())
-				Owner = init.Get<OwnerInit, Player>();
+			var ownerInit = init.GetOrDefault<OwnerInit>();
+			if (ownerInit != null)
+				Owner = ownerInit.Value(world);
 
 			if (name != null)
 			{
@@ -111,51 +153,87 @@ namespace OpenRA
 			// PERF: Cache all these traits as soon as the actor is created. This is a fairly cheap one-off cost per
 			// actor that allows us to provide some fast implementations of commonly used methods that are relied on by
 			// performance-sensitive parts of the core game engine, such as pathfinding, visibility and rendering.
-			Bounds = DetermineBounds();
-			VisualBounds = DetermineVisualBounds();
 			EffectiveOwner = TraitOrDefault<IEffectiveOwner>();
 			facing = TraitOrDefault<IFacing>();
 			health = TraitOrDefault<IHealth>();
 			renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
 			renders = TraitsImplementing<IRender>().ToArray();
-			disables = TraitsImplementing<IDisable>().ToArray();
+			mouseBounds = TraitsImplementing<IMouseBounds>().ToArray();
 			visibilityModifiers = TraitsImplementing<IVisibilityModifier>().ToArray();
 			defaultVisibility = Trait<IDefaultVisibility>();
+			becomingIdles = TraitsImplementing<INotifyBecomingIdle>().ToArray();
+			tickIdles = TraitsImplementing<INotifyIdle>().ToArray();
 			Targetables = TraitsImplementing<ITargetable>().ToArray();
+			targetablePositions = TraitsImplementing<ITargetablePositions>().ToArray();
+			world.AddFrameEndTask(w =>
+			{
+				// Caching this in a AddFrameEndTask, because trait construction order might cause problems if done directly at creation time.
+				// All actors that can move or teleport should have IPositionable, if not it's pretty safe to assume the actor is completely immobile and
+				// all targetable positions can be cached if all ITargetablePositions have no conditional requirements.
+				if (!Info.HasTraitInfo<IPositionableInfo>() && targetablePositions.Any() && targetablePositions.All(tp => tp.AlwaysEnabled))
+					staticTargetablePositions = targetablePositions.SelectMany(tp => tp.TargetablePositions(this)).ToArray();
+			});
 
-			SyncHashes =
-				TraitsImplementing<ISync>()
-				.Select(sync => Pair.New(sync, Sync.GetHashFunction(sync)))
-				.ToArray()
-				.Select(pair => new SyncHash(pair.First, pair.Second(pair.First)));
+			SyncHashes = TraitsImplementing<ISync>().Select(sync => new SyncHash(sync)).ToArray();
 		}
 
-		Rectangle DetermineBounds()
+		internal void Initialize(bool addToWorld = true)
 		{
-			var si = Info.TraitInfoOrDefault<SelectableInfo>();
-			var size = (si != null && si.Bounds != null) ? new int2(si.Bounds[0], si.Bounds[1]) :
-				TraitsImplementing<IAutoSelectionSize>().Select(x => x.SelectionSize(this)).FirstOrDefault();
+			created = true;
 
-			var offset = -size / 2;
-			if (si != null && si.Bounds != null && si.Bounds.Length > 2)
-				offset += new int2(si.Bounds[2], si.Bounds[3]);
+			// Make sure traits are usable for condition notifiers
+			foreach (var t in TraitsImplementing<INotifyCreated>())
+				t.Created(this);
 
-			return new Rectangle(offset.X, offset.Y, size.X, size.Y);
-		}
+			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);
 
-		Rectangle DetermineVisualBounds()
-		{
-			var sd = Info.TraitInfoOrDefault<ISelectionDecorationsInfo>();
-			if (sd == null || sd.SelectionBoxBounds == null)
-				return Bounds;
+						// 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;
+					}
+				}
+			}
 
-			var size = new int2(sd.SelectionBoxBounds[0], sd.SelectionBoxBounds[1]);
+			// Update all traits with their initial condition state
+			foreach (var notify in allObserverNotifiers)
+				notify(this, readOnlyConditionCache);
 
-			var offset = -size / 2;
-			if (sd.SelectionBoxBounds.Length > 2)
-				offset += new int2(sd.SelectionBoxBounds[2], sd.SelectionBoxBounds[3]);
+			// TODO: Some traits may need initialization after being notified of initial condition state.
 
-			return new Rectangle(offset.X, offset.Y, size.X, size.Y);
+			// 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;
+			}
+
+			if (addToWorld)
+				World.Add(this);
 		}
 
 		public void Tick()
@@ -164,8 +242,18 @@ namespace OpenRA
 			CurrentActivity = ActivityUtils.RunActivity(this, CurrentActivity);
 
 			if (!wasIdle && IsIdle)
-				foreach (var n in TraitsImplementing<INotifyBecomingIdle>())
+			{
+				foreach (var n in becomingIdles)
 					n.OnBecomingIdle(this);
+
+				// If IsIdle is true, it means the last CurrentActivity.Tick returned null.
+				// If a next activity has been queued via OnBecomingIdle, we need to start running it now,
+				// to avoid an 'empty' null tick where the actor will (visibly, if moving) do nothing.
+				CurrentActivity = ActivityUtils.RunActivity(this, CurrentActivity);
+			}
+			else if (wasIdle)
+				foreach (var tickIdle in tickIdles)
+					tickIdle.TickIdle(this);
 		}
 
 		public IEnumerable<IRenderable> Render(WorldRenderer wr)
@@ -191,27 +279,57 @@ namespace OpenRA
 					yield return renderable;
 		}
 
+		public IEnumerable<Rectangle> ScreenBounds(WorldRenderer wr)
+		{
+			var bounds = Bounds(wr);
+			foreach (var modifier in renderModifiers)
+				bounds = modifier.ModifyScreenBounds(this, wr, bounds);
+			return bounds;
+		}
+
+		IEnumerable<Rectangle> Bounds(WorldRenderer wr)
+		{
+			// PERF: Avoid LINQ. See comments for Renderables
+			foreach (var render in renders)
+				foreach (var r in render.ScreenBounds(this, wr))
+					if (!r.IsEmpty)
+						yield return r;
+		}
+
+		public Polygon MouseBounds(WorldRenderer wr)
+		{
+			foreach (var mb in mouseBounds)
+			{
+				var bounds = mb.MouseoverBounds(this, wr);
+				if (!bounds.IsEmpty)
+					return bounds;
+			}
+
+			return Polygon.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
-				CurrentActivity.RootActivity.Queue(nextActivity);
+				CurrentActivity.Queue(nextActivity);
 		}
 
-		public bool CancelActivity()
+		public void CancelActivity()
 		{
-			if (CurrentActivity != null)
-				return CurrentActivity.RootActivity.Cancel(this);
-
-			return true;
+			CurrentActivity?.Cancel(this);
 		}
 
 		public override int GetHashCode()
@@ -261,6 +379,13 @@ namespace OpenRA
 
 		public void Dispose()
 		{
+			// If CurrentActivity isn't null, run OnActorDisposeOuter in case some cleanups are needed.
+			// This should be done before the FrameEndTask to avoid dependency issues.
+			CurrentActivity?.OnActorDisposeOuter(this);
+
+			// Allow traits/activities to prevent a race condition when they depend on disposing the actor (e.g. Transforms)
+			WillDispose = true;
+
 			World.AddFrameEndTask(w =>
 			{
 				if (Disposed)
@@ -275,35 +400,43 @@ namespace OpenRA
 				World.TraitDict.RemoveActor(this);
 				Disposed = true;
 
-				if (luaInterface != null)
-					luaInterface.Value.OnActorDestroyed();
+				luaInterface?.Value.OnActorDestroyed();
 			});
 		}
 
 		// TODO: move elsewhere.
 		public void ChangeOwner(Player newOwner)
 		{
-			World.AddFrameEndTask(w =>
-			{
-				if (Disposed)
-					return;
+			World.AddFrameEndTask(_ => ChangeOwnerSync(newOwner));
+		}
 
-				var oldOwner = Owner;
-				var wasInWorld = IsInWorld;
+		/// <summary>
+		/// Change the actors owner without queuing a FrameEndTask.
+		/// This must only be called from inside an existing FrameEndTask.
+		/// </summary>
+		public void ChangeOwnerSync(Player newOwner)
+		{
+			if (Disposed)
+				return;
 
-				// momentarily remove from world so the ownership queries don't get confused
-				if (wasInWorld)
-					w.Remove(this);
+			var oldOwner = Owner;
+			var wasInWorld = IsInWorld;
 
-				Owner = newOwner;
-				Generation++;
+			// momentarily remove from world so the ownership queries don't get confused
+			if (wasInWorld)
+				World.Remove(this);
 
-				foreach (var t in TraitsImplementing<INotifyOwnerChanged>())
-					t.OnOwnerChanged(this, oldOwner, newOwner);
+			Owner = newOwner;
+			Generation++;
 
-				if (wasInWorld)
-					w.Add(this);
-			});
+			foreach (var t in TraitsImplementing<INotifyOwnerChanged>())
+				t.OnOwnerChanged(this, oldOwner, newOwner);
+
+			foreach (var t in World.WorldActor.TraitsImplementing<INotifyOwnerChanged>())
+				t.OnOwnerChanged(this, oldOwner, newOwner);
+
+			if (wasInWorld)
+				World.Add(this);
 		}
 
 		public DamageState GetDamageState()
@@ -322,21 +455,12 @@ namespace OpenRA
 			health.InflictDamage(this, attacker, damage, false);
 		}
 
-		public void Kill(Actor attacker)
+		public void Kill(Actor attacker, BitSet<DamageType> damageTypes = default(BitSet<DamageType>))
 		{
 			if (Disposed || health == null)
 				return;
 
-			health.Kill(this, attacker);
-		}
-
-		public bool IsDisabled()
-		{
-			// PERF: Avoid LINQ.
-			foreach (var disable in disables)
-				if (disable.Disabled)
-					return true;
-			return false;
+			health.Kill(this, attacker, damageTypes);
 		}
 
 		public bool CanBeViewedByPlayer(Player player)
@@ -349,21 +473,23 @@ namespace OpenRA
 			return defaultVisibility.IsVisible(this, player);
 		}
 
-		public IEnumerable<string> GetAllTargetTypes()
+		public BitSet<TargetableType> GetAllTargetTypes()
 		{
 			// PERF: Avoid LINQ.
+			var targetTypes = default(BitSet<TargetableType>);
 			foreach (var targetable in Targetables)
-				foreach (var targetType in targetable.TargetTypes)
-					yield return targetType;
+				targetTypes = targetTypes.Union(targetable.TargetTypes);
+			return targetTypes;
 		}
 
-		public IEnumerable<string> GetEnabledTargetTypes()
+		public BitSet<TargetableType> GetEnabledTargetTypes()
 		{
 			// PERF: Avoid LINQ.
+			var targetTypes = default(BitSet<TargetableType>);
 			foreach (var targetable in Targetables)
 				if (targetable.IsTraitEnabled())
-					foreach (var targetType in targetable.TargetTypes)
-						yield return targetType;
+					targetTypes = targetTypes.Union(targetable.TargetTypes);
+			return targetTypes;
 		}
 
 		public bool IsTargetableBy(Actor byActor)
@@ -376,6 +502,77 @@ namespace OpenRA
 			return false;
 		}
 
+		public IEnumerable<WPos> GetTargetablePositions()
+		{
+			if (staticTargetablePositions != null)
+				return staticTargetablePositions;
+
+			var enabledTargetablePositionTraits = targetablePositions.Where(Exts.IsTraitEnabled);
+			if (enabledTargetablePositionTraits.Any())
+				return enabledTargetablePositionTraits.SelectMany(tp => tp.TargetablePositions(this));
+
+			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 if it is valid.
+		/// Otherwise, just returns InvalidConditionToken.
+		/// </summary>
+		/// <returns>The token that is used to revoke this condition.</returns>
+		public int GrantCondition(string condition)
+		{
+			if (string.IsNullOrEmpty(condition))
+				return InvalidConditionToken;
+
+			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)
+		{
+			if (!conditionTokens.TryGetValue(token, out var 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;
@@ -393,8 +590,7 @@ namespace OpenRA
 
 		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
-			Actor a, b;
-			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
+			if (!left.TryGetClrValue(out Actor a) || !right.TryGetClrValue(out Actor b))
 				return false;
 
 			return a == b;

OpenRA.Game/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <runtime>
-    <loadFromRemoteSources enabled="true" />
-  </runtime>
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <runtime>
+    <loadFromRemoteSources enabled="true" />
+  </runtime>
 </configuration>

OpenRA.Game/CPos.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -18,11 +18,29 @@ namespace OpenRA
 {
 	public struct CPos : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CPos>
 	{
-		public readonly int X, Y;
-		public readonly byte Layer;
+		// Coordinates are packed in a 32 bit signed int
+		// X and Y are 12 bits (signed): -2048...2047
+		// Layer is an unsigned byte
+		// Packing is XXXX XXXX XXXX YYYY YYYY YYYY LLLL LLLL
+		public readonly int Bits;
+
+		// X is padded to MSB, so bit shift does the correct sign extension
+		public int X { get { return Bits >> 20; } }
+
+		// Align Y with a short, cast, then shift the rest of the way
+		// The signed short bit shift does the correct sign extension
+		public int Y { get { return ((short)(Bits >> 4)) >> 4; } }
+
+		public byte Layer { get { return (byte)Bits; } }
+
+		public CPos(int bits) { Bits = bits; }
+		public CPos(int x, int y)
+			: this(x, y, 0) { }
+		public CPos(int x, int y, byte layer)
+		{
+			Bits = (x & 0xFFF) << 20 | (y & 0xFFF) << 8 | layer;
+		}
 
-		public CPos(int x, int y) { X = x; Y = y; Layer = 0; }
-		public CPos(int x, int y, byte layer) { X = x; Y = y; Layer = layer; }
 		public static readonly CPos Zero = new CPos(0, 0, 0);
 
 		public static explicit operator CPos(int2 a) { return new CPos(a.X, a.Y); }
@@ -32,12 +50,12 @@ namespace OpenRA
 		public static CPos operator -(CPos a, CVec b) { return new CPos(a.X - b.X, a.Y - b.Y, a.Layer); }
 		public static CVec operator -(CPos a, CPos b) { return new CVec(a.X - b.X, a.Y - b.Y); }
 
-		public static bool operator ==(CPos me, CPos other) { return me.X == other.X && me.Y == other.Y && me.Layer == other.Layer; }
+		public static bool operator ==(CPos me, CPos other) { return me.Bits == other.Bits; }
 		public static bool operator !=(CPos me, CPos other) { return !(me == other); }
 
-		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode() ^ Layer.GetHashCode(); }
+		public override int GetHashCode() { return Bits.GetHashCode(); }
 
-		public bool Equals(CPos other) { return X == other.X && Y == other.Y && Layer == other.Layer; }
+		public bool Equals(CPos other) { return Bits == other.Bits; }
 		public override bool Equals(object obj) { return obj is CPos && Equals((CPos)obj); }
 
 		public override string ToString() { return X + "," + Y; }
@@ -71,9 +89,7 @@ namespace OpenRA
 
 		public LuaValue Add(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
-			CPos a;
-			CVec b;
-			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
+			if (!left.TryGetClrValue(out CPos a) || !right.TryGetClrValue(out CVec b))
 				throw new LuaException("Attempted to call CPos.Add(CPos, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
 
 			return new LuaCustomClrObject(a + b);
@@ -81,21 +97,18 @@ namespace OpenRA
 
 		public LuaValue Subtract(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
-			CPos a;
 			var rightType = right.WrappedClrType();
-			if (!left.TryGetClrValue(out a))
+			if (!left.TryGetClrValue(out CPos a))
 				throw new LuaException("Attempted to call CPos.Subtract(CPos, (CPos|CVec)) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, rightType.Name));
 
 			if (rightType == typeof(CPos))
 			{
-				CPos b;
-				right.TryGetClrValue(out b);
+				right.TryGetClrValue(out CPos b);
 				return new LuaCustomClrObject(a - b);
 			}
 			else if (rightType == typeof(CVec))
 			{
-				CVec b;
-				right.TryGetClrValue(out b);
+				right.TryGetClrValue(out CVec b);
 				return new LuaCustomClrObject(a - b);
 			}
 
@@ -104,8 +117,7 @@ namespace OpenRA
 
 		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
-			CPos a, b;
-			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
+			if (!left.TryGetClrValue(out CPos a) || !right.TryGetClrValue(out CPos b))
 				return false;
 
 			return a == b;
@@ -132,4 +144,4 @@ namespace OpenRA
 
 		#endregion
 	}
-}
+}

OpenRA.Game/CVec.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -10,9 +10,9 @@
 #endregion
 
 using System;
-using System.Drawing;
 using Eluant;
 using Eluant.ObjectBinding;
+using OpenRA.Primitives;
 using OpenRA.Scripting;
 
 namespace OpenRA
@@ -75,8 +75,7 @@ namespace OpenRA
 
 		public LuaValue Add(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
-			CVec a, b;
-			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
+			if (!left.TryGetClrValue(out CVec a) || !right.TryGetClrValue(out CVec b))
 				throw new LuaException("Attempted to call CVec.Add(CVec, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
 
 			return new LuaCustomClrObject(a + b);
@@ -84,8 +83,7 @@ namespace OpenRA
 
 		public LuaValue Subtract(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
-			CVec a, b;
-			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
+			if (!left.TryGetClrValue(out CVec a) || !right.TryGetClrValue(out CVec b))
 				throw new LuaException("Attempted to call CVec.Subtract(CVec, CVec) with invalid arguments ({0}, {1})".F(left.WrappedClrType().Name, right.WrappedClrType().Name));
 
 			return new LuaCustomClrObject(a - b);
@@ -98,8 +96,7 @@ namespace OpenRA
 
 		public LuaValue Equals(LuaRuntime runtime, LuaValue left, LuaValue right)
 		{
-			CVec a, b;
-			if (!left.TryGetClrValue(out a) || !right.TryGetClrValue(out b))
+			if (!left.TryGetClrValue(out CVec a) || !right.TryGetClrValue(out CVec b))
 				return false;
 
 			return a == b;

OpenRA.Game/CacheStorage.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -17,4 +17,4 @@ namespace OpenRA
 		void Store(string key, T data);
 		T Retrieve(string key);
 	}
-}
+}

OpenRA.Game/CryptoUtil.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -9,6 +9,7 @@
  */
 #endregion
 
+using System;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
@@ -18,6 +19,228 @@ namespace OpenRA
 {
 	public static class CryptoUtil
 	{
+		// Fixed byte pattern for the OID header
+		static readonly byte[] OIDHeader = { 0x30, 0xD, 0x6, 0x9, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0xD, 0x1, 0x1, 0x1, 0x5, 0x0 };
+
+		public static string PublicKeyFingerprint(RSAParameters parameters)
+		{
+			// Public key fingerprint is defined as the SHA1 of the modulus + exponent bytes
+			return SHA1Hash(parameters.Modulus.Append(parameters.Exponent).ToArray());
+		}
+
+		public static string EncodePEMPublicKey(RSAParameters parameters)
+		{
+			var data = Convert.ToBase64String(EncodePublicKey(parameters));
+			var output = new StringBuilder();
+			output.AppendLine("-----BEGIN PUBLIC KEY-----");
+			for (var i = 0; i < data.Length; i += 64)
+				output.AppendLine(data.Substring(i, Math.Min(64, data.Length - i)));
+			output.Append("-----END PUBLIC KEY-----");
+
+			return output.ToString();
+		}
+
+		public static RSAParameters DecodePEMPublicKey(string key)
+		{
+			try
+			{
+				// Reconstruct original key data
+				var lines = key.Split('\n');
+				var data = Convert.FromBase64String(lines.Skip(1).Take(lines.Length - 2).JoinWith(""));
+
+				// Pull the modulus and exponent bytes out of the ASN.1 tree
+				// Expect this to blow up if the key is not correctly formatted
+				using (var s = new MemoryStream(data))
+				{
+					// SEQUENCE
+					s.ReadByte();
+					ReadTLVLength(s);
+
+					// SEQUENCE -> fixed header junk
+					s.ReadByte();
+					var headerLength = ReadTLVLength(s);
+					s.Position += headerLength;
+
+					// SEQUENCE -> BIT_STRING
+					s.ReadByte();
+					ReadTLVLength(s);
+					s.ReadByte();
+
+					// SEQUENCE -> BIT_STRING -> SEQUENCE
+					s.ReadByte();
+					ReadTLVLength(s);
+
+					// SEQUENCE -> BIT_STRING -> SEQUENCE -> INTEGER (modulus)
+					s.ReadByte();
+					var modulusLength = ReadTLVLength(s);
+					s.ReadByte();
+					var modulus = s.ReadBytes(modulusLength - 1);
+
+					// SEQUENCE -> BIT_STRING -> SEQUENCE -> INTEGER (exponent)
+					s.ReadByte();
+					var exponentLength = ReadTLVLength(s);
+					s.ReadByte();
+					var exponent = s.ReadBytes(exponentLength - 1);
+
+					return new RSAParameters
+					{
+						Modulus = modulus,
+						Exponent = exponent
+					};
+				}
+			}
+			catch (Exception e)
+			{
+				throw new InvalidDataException("Invalid PEM public key", e);
+			}
+		}
+
+		static byte[] EncodePublicKey(RSAParameters parameters)
+		{
+			using (var stream = new MemoryStream())
+			{
+				var writer = new BinaryWriter(stream);
+
+				var modExpLength = TripletFullLength(parameters.Modulus.Length + 1) + TripletFullLength(parameters.Exponent.Length + 1);
+				var bitStringLength = TripletFullLength(modExpLength + 1);
+				var sequenceLength = TripletFullLength(bitStringLength + OIDHeader.Length);
+
+				// SEQUENCE
+				writer.Write((byte)0x30);
+				WriteTLVLength(writer, sequenceLength);
+
+				// SEQUENCE -> fixed header junk
+				writer.Write(OIDHeader);
+
+				// SEQUENCE -> BIT_STRING
+				writer.Write((byte)0x03);
+				WriteTLVLength(writer, bitStringLength);
+				writer.Write((byte)0x00);
+
+				// SEQUENCE -> BIT_STRING -> SEQUENCE
+				writer.Write((byte)0x30);
+				WriteTLVLength(writer, modExpLength);
+
+				// SEQUENCE -> BIT_STRING -> SEQUENCE -> INTEGER
+				// Modulus is padded with a zero to avoid issues with the sign bit
+				writer.Write((byte)0x02);
+				WriteTLVLength(writer, parameters.Modulus.Length + 1);
+				writer.Write((byte)0);
+				writer.Write(parameters.Modulus);
+
+				// SEQUENCE -> BIT_STRING -> SEQUENCE -> INTEGER
+				// Exponent is padded with a zero to avoid issues with the sign bit
+				writer.Write((byte)0x02);
+				WriteTLVLength(writer, parameters.Exponent.Length + 1);
+				writer.Write((byte)0);
+				writer.Write(parameters.Exponent);
+
+				return stream.ToArray();
+			}
+		}
+
+		static void WriteTLVLength(BinaryWriter writer, int length)
+		{
+			if (length < 0x80)
+			{
+				// Length < 128 is stored in a single byte
+				writer.Write((byte)length);
+			}
+			else
+			{
+				// If 128 <= length < 256**128 first byte encodes number of bytes required to hold the length
+				// High-bit is set as a flag to use this long-form encoding
+				var lengthBytes = BitConverter.GetBytes(length).Reverse().SkipWhile(b => b == 0).ToArray();
+				writer.Write((byte)(0x80 | lengthBytes.Length));
+				writer.Write(lengthBytes);
+			}
+		}
+
+		static int ReadTLVLength(Stream s)
+		{
+			var length = s.ReadByte();
+			if (length < 0x80)
+				return length;
+
+			var data = new byte[4];
+			s.ReadBytes(data, 0, Math.Min(length & 0x7F, 4));
+			return BitConverter.ToInt32(data.ToArray(), 0);
+		}
+
+		static int TripletFullLength(int dataLength)
+		{
+			if (dataLength < 0x80)
+				return 2 + dataLength;
+
+			return 2 + dataLength + BitConverter.GetBytes(dataLength).Reverse().SkipWhile(b => b == 0).Count();
+		}
+
+		public static string DecryptString(RSAParameters parameters, string data)
+		{
+			try
+			{
+				using (var rsa = new RSACryptoServiceProvider())
+				{
+					rsa.ImportParameters(parameters);
+					return Encoding.UTF8.GetString(rsa.Decrypt(Convert.FromBase64String(data), false));
+				}
+			}
+			catch (Exception e)
+			{
+				Log.Write("debug", "Failed to decrypt string with exception: {0}", e);
+				Console.WriteLine("String decryption failed: {0}", e);
+				return null;
+			}
+		}
+
+		public static string Sign(RSAParameters parameters, string data)
+		{
+			return Sign(parameters, Encoding.UTF8.GetBytes(data));
+		}
+
+		public static string Sign(RSAParameters parameters, byte[] data)
+		{
+			try
+			{
+				using (var rsa = new RSACryptoServiceProvider())
+				{
+					rsa.ImportParameters(parameters);
+					using (var csp = SHA1.Create())
+						return Convert.ToBase64String(rsa.SignHash(csp.ComputeHash(data), CryptoConfig.MapNameToOID("SHA1")));
+				}
+			}
+			catch (Exception e)
+			{
+				Log.Write("debug", "Failed to sign string with exception: {0}", e);
+				Console.WriteLine("String signing failed: {0}", e);
+				return null;
+			}
+		}
+
+		public static bool VerifySignature(RSAParameters parameters, string data, string signature)
+		{
+			return VerifySignature(parameters, Encoding.UTF8.GetBytes(data), signature);
+		}
+
+		public static bool VerifySignature(RSAParameters parameters, byte[] data, string signature)
+		{
+			try
+			{
+				using (var rsa = new RSACryptoServiceProvider())
+				{
+					rsa.ImportParameters(parameters);
+					using (var csp = SHA1.Create())
+						return rsa.VerifyHash(csp.ComputeHash(data), CryptoConfig.MapNameToOID("SHA1"), Convert.FromBase64String(signature));
+				}
+			}
+			catch (Exception e)
+			{
+				Log.Write("debug", "Failed to verify signature with exception: {0}", e);
+				Console.WriteLine("Signature validation failed: {0}", e);
+				return false;
+			}
+		}
+
 		public static string SHA1Hash(Stream data)
 		{
 			using (var csp = SHA1.Create())

OpenRA.Game/DefaultPlayer.cs

@@ -0,0 +1,20 @@
+#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-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -43,8 +43,19 @@ namespace OpenRA
 			}
 		}
 
+		void EnableTLS12OnWindows()
+		{
+			// Enable TLS 1.2 on Windows: .NET 4.7 on Windows 10 only supports obsolete protocols by default
+			// SecurityProtocolType.Tls12 is not defined in the .NET 4.5 reference dlls used by mono,
+			// so we must use the enum's constant value directly
+			if (Platform.CurrentPlatform == PlatformType.Windows)
+				ServicePointManager.SecurityProtocol |= (SecurityProtocolType)3072;
+		}
+
 		public Download(string url, string path, Action<DownloadProgressChangedEventArgs> onProgress, Action<AsyncCompletedEventArgs> onComplete)
 		{
+			EnableTLS12OnWindows();
+
 			lock (syncObject)
 			{
 				wc = new WebClient { Proxy = null };
@@ -56,6 +67,8 @@ namespace OpenRA
 
 		public Download(string url, Action<DownloadProgressChangedEventArgs> onProgress, Action<DownloadDataCompletedEventArgs> onComplete)
 		{
+			EnableTLS12OnWindows();
+
 			lock (syncObject)
 			{
 				wc = new WebClient { Proxy = null };
@@ -77,8 +90,7 @@ namespace OpenRA
 		public void CancelAsync()
 		{
 			lock (syncObject)
-				if (wc != null)
-					wc.CancelAsync();
+				wc?.CancelAsync();
 		}
 	}
 }

OpenRA.Game/Effects/AsyncAction.cs

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

OpenRA.Game/Effects/DelayedAction.cs

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

OpenRA.Game/Effects/DelayedImpact.cs

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

OpenRA.Game/Effects/IEffect.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -20,5 +20,9 @@ namespace OpenRA.Effects
 		IEnumerable<IRenderable> Render(WorldRenderer r);
 	}
 
+	// Identifier interface for effects that are added to ScreenMap
+	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-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -12,14 +12,17 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Linq;
+using OpenRA.FileFormats;
 using OpenRA.Graphics;
 using OpenRA.Primitives;
 
 namespace OpenRA
 {
+	[Flags]
+	enum ModRegistration { User = 1, System = 2 }
+
 	public class ExternalMod
 	{
 		public readonly string Id;
@@ -28,6 +31,8 @@ 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); }
@@ -38,110 +43,209 @@ namespace OpenRA
 	{
 		readonly Dictionary<string, ExternalMod> mods = new Dictionary<string, ExternalMod>();
 		readonly SheetBuilder sheetBuilder;
-		readonly string launchPath;
 
-		public ExternalMods(string launchPath)
+		Sheet CreateSheet()
 		{
-			// Process.Start requires paths to not be quoted, even if they contain spaces
-			if (launchPath.First() == '"' && launchPath.Last() == '"')
-				launchPath = launchPath.Substring(1, launchPath.Length - 2);
+			var sheet = new Sheet(SheetType.BGRA, new Size(512, 512));
 
-			this.launchPath = launchPath;
-			sheetBuilder = new SheetBuilder(SheetType.BGRA, 256);
+			// 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;
 
-			// Load registered mods
-			var supportPath = Platform.ResolvePath(Path.Combine("^", "ModMetadata"));
-			if (!Directory.Exists(supportPath))
+			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);
+
+			// 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)
+			{
+				var metadataPath = Path.Combine(source, "ModMetadata");
+				if (!Directory.Exists(metadataPath))
+					continue;
+
+				foreach (var path in Directory.GetFiles(metadataPath, "*.yaml"))
+				{
+					try
+					{
+						var yaml = MiniYaml.FromStream(File.OpenRead(path), path).First().Value;
+						LoadMod(yaml, path);
+					}
+					catch (Exception e)
+					{
+						Log.Write("debug", "Failed to parse mod metadata file '{0}'", path);
+						Log.Write("debug", e.ToString());
+					}
+				}
+			}
+		}
+
+		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))
+					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);
+			}
+
+			// Avoid possibly overwriting a valid mod with an obviously bogus one
+			var key = ExternalMod.MakeKey(mod);
+			if ((forceRegistration || File.Exists(mod.LaunchPath)) && (path == null || Path.GetFileNameWithoutExtension(path) == key))
+				mods[key] = mod;
+		}
+
+		internal void Register(Manifest mod, string launchPath, ModRegistration registration)
+		{
+			if (mod.Metadata.Hidden)
 				return;
 
-			foreach (var path in Directory.GetFiles(supportPath, "*.yaml"))
+			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)
+			}));
+
+			using (var stream = mod.Package.GetStream("icon.png"))
+				if (stream != null)
+					yaml.Value.Nodes.Add(new MiniYamlNode("Icon", 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 sources = new List<string>();
+			if (registration.HasFlag(ModRegistration.System))
+				sources.Add(Platform.GetSupportDir(SupportDirType.System));
+
+			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);
+			}
+
+			// Make sure the mod is available for this session, even if saving it fails
+			LoadMod(yaml.Value, forceRegistration: true);
+
+			var lines = new List<MiniYamlNode> { yaml }.ToLines().ToArray();
+			foreach (var source in sources.Distinct())
+			{
+				var metadataPath = Path.Combine(source, "ModMetadata");
+
 				try
 				{
-					var yaml = MiniYaml.FromStream(File.OpenRead(path), path).First().Value;
-					LoadMod(yaml);
+					Directory.CreateDirectory(metadataPath);
+					File.WriteAllLines(Path.Combine(metadataPath, key + ".yaml"), lines);
 				}
 				catch (Exception e)
 				{
-					Log.Write("debug", "Failed to parse mod metadata file '{0}'", path);
+					Log.Write("debug", "Failed to register current mod metadata");
 					Log.Write("debug", e.ToString());
 				}
 			}
 		}
 
-		void LoadMod(MiniYaml yaml)
+		/// <summary>
+		/// Removes invalid mod registrations:
+		/// * LaunchPath no longer exists
+		/// * LaunchPath and mod id matches the active mod, but the version is different
+		/// * Filename doesn't match internal key
+		/// * Fails to parse as a mod registration
+		/// </summary>
+		internal void ClearInvalidRegistrations(ExternalMod activeMod, ModRegistration registration)
 		{
-			var mod = FieldLoader.Load<ExternalMod>(yaml);
-			var iconNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Icon");
-			if (iconNode != null && !string.IsNullOrEmpty(iconNode.Value.Value))
+			var sources = new List<string>();
+			if (registration.HasFlag(ModRegistration.System))
+				sources.Add(Platform.GetSupportDir(SupportDirType.System));
+
+			if (registration.HasFlag(ModRegistration.User))
 			{
-				using (var stream = new MemoryStream(Convert.FromBase64String(iconNode.Value.Value)))
-				using (var bitmap = new Bitmap(stream))
-					mod.Icon = sheetBuilder.Add(bitmap);
+				// 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));
 			}
 
-			mods.Add(ExternalMod.MakeKey(mod), mod);
-		}
-
-		internal void Register(Manifest mod)
-		{
-			if (mod.Metadata.Hidden)
-				return;
-
-			var iconData = "";
-			using (var stream = mod.Package.GetStream("icon.png"))
-				if (stream != null)
-					iconData = Convert.ToBase64String(stream.ReadAllBytes());
-
-			var key = ExternalMod.MakeKey(mod);
-			var yaml = new List<MiniYamlNode>()
+			var activeModKey = ExternalMod.MakeKey(activeMod);
+			foreach (var source in sources.Distinct())
 			{
-				new MiniYamlNode("Registration", new MiniYaml("", new List<MiniYamlNode>()
+				var metadataPath = Path.Combine(source, "ModMetadata");
+				if (!Directory.Exists(metadataPath))
+					continue;
+
+				foreach (var path in Directory.GetFiles(metadataPath, "*.yaml"))
 				{
-					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)
-				}))
-			};
+					string modKey = null;
+					try
+					{
+						var yaml = MiniYaml.FromStream(File.OpenRead(path), path).First().Value;
+						var m = FieldLoader.Load<ExternalMod>(yaml);
+						modKey = ExternalMod.MakeKey(m);
 
-			var supportPath = Platform.ResolvePath(Path.Combine("^", "ModMetadata"));
+						// Continue to the next entry if it is the active mod (even if the LaunchPath is bogus)
+						if (modKey == activeModKey)
+							continue;
 
-			try
-			{
-				// Make sure the mod is available for this session, even if saving it fails
-				LoadMod(yaml.First().Value);
+						// Continue to the next entry if this one is valid
+						if (File.Exists(m.LaunchPath) && Path.GetFileNameWithoutExtension(path) == modKey &&
+							!(activeMod != null && m.LaunchPath == activeMod.LaunchPath && m.Id == activeMod.Id && m.Version != activeMod.Version))
+							continue;
+					}
+					catch (Exception e)
+					{
+						Log.Write("debug", "Failed to parse mod metadata file '{0}'", path);
+						Log.Write("debug", e.ToString());
+					}
 
-				Directory.CreateDirectory(supportPath);
-				File.WriteAllLines(Path.Combine(supportPath, key + ".yaml"), yaml.ToLines(false).ToArray());
-			}
-			catch (Exception e)
-			{
-				Log.Write("debug", "Failed to register currrent mod metadata");
-				Log.Write("debug", e.ToString());
-			}
+					// Remove from the ingame mod switcher
+					if (Path.GetFileNameWithoutExtension(path) == modKey)
+						mods.Remove(modKey);
 
-			// Clean up stale mod registrations:
-			//  - LaunchPath no longer exists (uninstalled)
-			//  - LaunchPath and mod match the current mod, but version differs (newer version installed on top)
-			List<string> toRemove = null;
-			foreach (var kv in mods)
-			{
-				var k = kv.Key;
-				var m = kv.Value;
-				if (!File.Exists(m.LaunchPath) || (m.LaunchPath == launchPath && m.Id == mod.Id && k != key))
-				{
-					Log.Write("debug", "Removing stale mod metadata entry '{0}'", k);
-					if (toRemove == null)
-						toRemove = new List<string>();
-
-					toRemove.Add(k);
-					var path = Path.Combine(supportPath, k + ".yaml");
+					// Remove stale or corrupted metadata
 					try
 					{
 						File.Delete(path);
+						Log.Write("debug", "Removed invalid mod metadata file '{0}'", path);
 					}
 					catch (Exception e)
 					{
@@ -150,10 +254,40 @@ namespace OpenRA
 					}
 				}
 			}
+		}
 
-			if (toRemove != null)
-				foreach (var r in toRemove)
-					mods.Remove(r);
+		internal void Unregister(Manifest mod, ModRegistration registration)
+		{
+			var sources = new List<string>();
+			if (registration.HasFlag(ModRegistration.System))
+				sources.Add(Platform.GetSupportDir(SupportDirType.System));
+
+			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));
+			}
+
+			var key = ExternalMod.MakeKey(mod);
+			mods.Remove(key);
+
+			foreach (var source in sources.Distinct())
+			{
+				var path = Path.Combine(source, "ModMetadata", key + ".yaml");
+				try
+				{
+					if (File.Exists(path))
+						File.Delete(path);
+				}
+				catch (Exception e)
+				{
+					Log.Write("debug", "Failed to remove mod metadata file '{0}'", path);
+					Log.Write("debug", e.ToString());
+				}
+			}
 		}
 
 		public ExternalMod this[string key] { get { return mods[key]; } }

OpenRA.Game/Exts.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -11,11 +11,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Traits;
 
@@ -79,19 +78,9 @@ namespace OpenRA
 				return val;
 		}
 
-		public static bool Contains(this Rectangle r, int2 p)
-		{
-			return r.Contains(p.ToPoint());
-		}
-
-		public static bool Contains(this RectangleF r, int2 p)
-		{
-			return r.Contains(p.ToPointF());
-		}
-
 		static int WindingDirectionTest(int2 v0, int2 v1, int2 p)
 		{
-			return (v1.X - v0.X) * (p.Y - v0.Y) - (p.X - v0.X) * (v1.Y - v0.Y);
+			return Math.Sign((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)
@@ -112,6 +101,16 @@ 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.
@@ -126,8 +125,7 @@ namespace OpenRA
 
 		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k, Func<K, V> createFn)
 		{
-			V ret;
-			if (!d.TryGetValue(k, out ret))
+			if (!d.TryGetValue(k, out var ret))
 				d.Add(k, ret = createFn(k));
 			return ret;
 		}
@@ -162,6 +160,26 @@ 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);
@@ -175,7 +193,11 @@ namespace OpenRA
 
 		public static IEnumerable<T> Iterate<T>(this T t, Func<T, T> f)
 		{
-			for (;;) { yield return t; t = f(t); }
+			while (true)
+			{
+				yield return t;
+				t = f(t);
+			}
 		}
 
 		public static T MinBy<T, U>(this IEnumerable<T> ts, Func<T, U> selector)
@@ -330,8 +352,7 @@ namespace OpenRA
 
 		public static int IntegerDivisionRoundingAwayFromZero(int dividend, int divisor)
 		{
-			int remainder;
-			var quotient = Math.DivRem(dividend, divisor, out remainder);
+			var quotient = Math.DivRem(dividend, divisor, out var remainder);
 			if (remainder == 0)
 				return quotient;
 			return quotient + (Math.Sign(dividend) == Math.Sign(divisor) ? 1 : -1);
@@ -375,11 +396,14 @@ namespace OpenRA
 				var key = keySelector(item);
 				var element = elementSelector(item);
 
+				// Discard elements with null keys
+				if (!typeof(TKey).IsValueType && key == null)
+					continue;
+
 				// Check for a key conflict:
 				if (d.ContainsKey(key))
 				{
-					List<string> dupKeyMessages;
-					if (!dupKeys.TryGetValue(key, out dupKeyMessages))
+					if (!dupKeys.TryGetValue(key, out var dupKeyMessages))
 					{
 						// Log the initial conflicting value already inserted:
 						dupKeyMessages = new List<string>();
@@ -444,27 +468,6 @@ namespace OpenRA
 			return result;
 		}
 
-		public static Rectangle Bounds(this Bitmap b) { return new Rectangle(0, 0, b.Width, b.Height); }
-
-		public static Bitmap CloneWith32bbpArgbPixelFormat(this Bitmap original)
-		{
-			// Note: We would use original.Clone(original.Bounds(), PixelFormat.Format32bppArgb)
-			// but this doesn't work on mono.
-			var clone = new Bitmap(original.Width, original.Height, PixelFormat.Format32bppArgb);
-			try
-			{
-				using (var g = System.Drawing.Graphics.FromImage(clone))
-					g.DrawImage(original, original.Bounds());
-			}
-			catch (Exception)
-			{
-				clone.Dispose();
-				throw;
-			}
-
-			return clone;
-		}
-
 		public static int ToBits(this IEnumerable<bool> bits)
 		{
 			var i = 0;
@@ -484,6 +487,11 @@ namespace OpenRA
 			return int.Parse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo);
 		}
 
+		public static byte ParseByte(string s)
+		{
+			return byte.Parse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo);
+		}
+
 		public static bool TryParseIntegerInvariant(string s, out int i)
 		{
 			return int.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);
@@ -494,14 +502,30 @@ namespace OpenRA
 			return long.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);
 		}
 
-		public static bool IsTraitEnabled(this object trait)
+		public static bool IsTraitEnabled<T>(this T trait)
 		{
-			return trait as IDisabledTrait == null || !(trait as IDisabledTrait).IsTraitDisabled;
+			var disabledTrait = trait as IDisabledTrait;
+			return disabledTrait == null || !disabledTrait.IsTraitDisabled;
 		}
 
-		public static bool IsTraitEnabled<T>(T t)
+		public static T FirstEnabledTraitOrDefault<T>(this IEnumerable<T> ts)
 		{
-			return IsTraitEnabled(t as object);
+			// PERF: Avoid LINQ.
+			foreach (var t in ts)
+				if (t.IsTraitEnabled())
+					return t;
+
+			return default(T);
+		}
+
+		public static T FirstEnabledTraitOrDefault<T>(this T[] ts)
+		{
+			// PERF: Avoid LINQ.
+			foreach (var t in ts)
+				if (t.IsTraitEnabled())
+					return t;
+
+			return default(T);
 		}
 	}
 

OpenRA.Game/FieldLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -12,15 +12,12 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Text.RegularExpressions;
-using OpenRA.Graphics;
 using OpenRA.Primitives;
 using OpenRA.Support;
 
@@ -42,7 +39,8 @@ namespace OpenRA
 				}
 			}
 
-			public MissingFieldsException(string[] missing, string header = null, string headerSingle = null) : base(null)
+			public MissingFieldsException(string[] missing, string header = null, string headerSingle = null)
+				: base(null)
 			{
 				Header = missing.Length > 1 ? header : headerSingle ?? header;
 				Missing = missing;
@@ -71,6 +69,11 @@ namespace OpenRA
 		static readonly ConcurrentCache<MemberInfo, bool> MemberHasTranslateAttribute =
 			new ConcurrentCache<MemberInfo, bool>(member => member.HasAttribute<TranslateAttribute>());
 
+		static readonly ConcurrentCache<string, BooleanExpression> BooleanExpressionCache =
+			new ConcurrentCache<string, BooleanExpression>(expression => new BooleanExpression(expression));
+		static readonly ConcurrentCache<string, IntegerExpression> IntegerExpressionCache =
+			new ConcurrentCache<string, IntegerExpression>(expression => new IntegerExpression(expression));
+
 		static readonly object TranslationsLock = new object();
 		static Dictionary<string, string> translations;
 
@@ -118,8 +121,7 @@ namespace OpenRA
 		{
 			ret = null;
 
-			MiniYaml yaml;
-			if (!md.TryGetValue(yamlName, out yaml))
+			if (!md.TryGetValue(yamlName, out var yaml))
 				return false;
 
 			ret = GetValue(field.Name, field.FieldType, yaml, field);
@@ -177,42 +179,36 @@ namespace OpenRA
 
 		public static object GetValue(string fieldName, Type fieldType, MiniYaml yaml, MemberInfo field)
 		{
-			var value = yaml.Value;
-			if (value != null) value = value.Trim();
+			var value = yaml.Value?.Trim();
 
 			if (fieldType == typeof(int))
 			{
-				int res;
-				if (Exts.TryParseIntegerInvariant(value, out res))
+				if (Exts.TryParseIntegerInvariant(value, out var res))
 					return res;
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(ushort))
 			{
-				ushort res;
-				if (ushort.TryParse(value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out res))
+				if (ushort.TryParse(value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out var res))
 					return res;
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
 
 			if (fieldType == typeof(long))
 			{
-				long res;
-				if (long.TryParse(value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out res))
+				if (long.TryParse(value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out var res))
 					return res;
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(float))
 			{
-				float res;
-				if (value != null && float.TryParse(value.Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
+				if (value != null && float.TryParse(value.Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out var res))
 					return res * (value.Contains('%') ? 0.01f : 1f);
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(decimal))
 			{
-				decimal res;
-				if (value != null && decimal.TryParse(value.Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
+				if (value != null && decimal.TryParse(value.Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out var res))
 					return res * (value.Contains('%') ? 0.01m : 1m);
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
@@ -224,59 +220,25 @@ namespace OpenRA
 			}
 			else if (fieldType == typeof(Color))
 			{
-				Color color;
-				if (value != null && HSLColor.TryParseRGB(value, out color))
+				if (value != null && Color.TryParse(value, out var color))
 					return color;
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-			else if (fieldType == typeof(Color[]))
-			{
-				if (value != null)
-				{
-					var parts = value.Split(',');
-					var colors = new Color[parts.Length];
-
-					for (var i = 0; i < colors.Length; i++)
-						if (!HSLColor.TryParseRGB(parts[i], out colors[i]))
-							return InvalidValueAction(value, fieldType, fieldName);
-
-					return colors;
-				}
-
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
-			else if (fieldType == typeof(HSLColor))
-			{
-				if (value != null)
-				{
-					Color rgb;
-					if (HSLColor.TryParseRGB(value, out rgb))
-						return new HSLColor(rgb);
-
-					// Allow old HSLColor/ColorRamp formats to be parsed as HSLColor
-					var parts = value.Split(',');
-					if (parts.Length == 3 || parts.Length == 4)
-						return new HSLColor(
-							(byte)Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
-							(byte)Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
-							(byte)Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255));
-				}
-
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
 			else if (fieldType == typeof(Hotkey))
 			{
-				Hotkey res;
-				if (Hotkey.TryParse(value, out res))
+				if (Hotkey.TryParse(value, out var res))
 					return res;
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
+			else if (fieldType == typeof(HotkeyReference))
+			{
+				return Game.ModData.Hotkeys[value];
+			}
 			else if (fieldType == typeof(WDist))
 			{
-				WDist res;
-				if (WDist.TryParse(value, out res))
+				if (WDist.TryParse(value, out var res))
 					return res;
 
 				return InvalidValueAction(value, fieldType, fieldName);
@@ -288,8 +250,7 @@ namespace OpenRA
 					var parts = value.Split(',');
 					if (parts.Length == 3)
 					{
-						WDist rx, ry, rz;
-						if (WDist.TryParse(parts[0], out rx) && WDist.TryParse(parts[1], out ry) && WDist.TryParse(parts[2], out rz))
+						if (WDist.TryParse(parts[0], out var rx) && WDist.TryParse(parts[1], out var ry) && WDist.TryParse(parts[2], out var rz))
 							return new WVec(rx, ry, rz);
 					}
 				}
@@ -309,8 +270,7 @@ namespace OpenRA
 
 					for (var i = 0; i < vecs.Length; ++i)
 					{
-						WDist rx, ry, rz;
-						if (WDist.TryParse(parts[3 * i], out rx) && WDist.TryParse(parts[3 * i + 1], out ry) && WDist.TryParse(parts[3 * i + 2], out rz))
+						if (WDist.TryParse(parts[3 * i], out var rx) && WDist.TryParse(parts[3 * i + 1], out var ry) && WDist.TryParse(parts[3 * i + 2], out var rz))
 							vecs[i] = new WVec(rx, ry, rz);
 					}
 
@@ -326,8 +286,7 @@ namespace OpenRA
 					var parts = value.Split(',');
 					if (parts.Length == 3)
 					{
-						WDist rx, ry, rz;
-						if (WDist.TryParse(parts[0], out rx) && WDist.TryParse(parts[1], out ry) && WDist.TryParse(parts[2], out rz))
+						if (WDist.TryParse(parts[0], out var rx) && WDist.TryParse(parts[1], out var ry) && WDist.TryParse(parts[2], out var rz))
 							return new WPos(rx, ry, rz);
 					}
 				}
@@ -336,8 +295,7 @@ namespace OpenRA
 			}
 			else if (fieldType == typeof(WAngle))
 			{
-				int res;
-				if (Exts.TryParseIntegerInvariant(value, out res))
+				if (Exts.TryParseIntegerInvariant(value, out var res))
 					return new WAngle(res);
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
@@ -348,8 +306,7 @@ namespace OpenRA
 					var parts = value.Split(',');
 					if (parts.Length == 3)
 					{
-						int rr, rp, ry;
-						if (Exts.TryParseIntegerInvariant(value, out rr) && Exts.TryParseIntegerInvariant(value, out rp) && Exts.TryParseIntegerInvariant(value, out ry))
+						if (Exts.TryParseIntegerInvariant(parts[0], out var rr) && Exts.TryParseIntegerInvariant(parts[1], out var rp) && Exts.TryParseIntegerInvariant(parts[2], out var ry))
 							return new WRot(new WAngle(rr), new WAngle(rp), new WAngle(ry));
 					}
 				}
@@ -388,8 +345,7 @@ namespace OpenRA
 					var vecs = new CVec[parts.Length / 2];
 					for (var i = 0; i < vecs.Length; i++)
 					{
-						int rx, ry;
-						if (int.TryParse(parts[2 * i], out rx) && int.TryParse(parts[2 * i + 1], out ry))
+						if (int.TryParse(parts[2 * i], out var rx) && int.TryParse(parts[2 * i + 1], out var ry))
 							vecs[i] = new CVec(rx, ry);
 					}
 
@@ -398,13 +354,29 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-			else if (fieldType == typeof(ConditionExpression))
+			else if (fieldType == typeof(BooleanExpression))
 			{
 				if (value != null)
 				{
 					try
 					{
-						return new ConditionExpression(value);
+						return BooleanExpressionCache[value];
+					}
+					catch (InvalidDataException e)
+					{
+						throw new YamlException(e.Message);
+					}
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
+			else if (fieldType == typeof(IntegerExpression))
+			{
+				if (value != null)
+				{
+					try
+					{
+						return IntegerExpressionCache[value];
 					}
 					catch (InvalidDataException e)
 					{
@@ -425,31 +397,30 @@ namespace OpenRA
 					return InvalidValueAction(value, fieldType, fieldName);
 				}
 			}
-			else if (fieldType == typeof(ImageFormat))
+			else if (fieldType == typeof(bool))
+			{
+				if (bool.TryParse(value.ToLowerInvariant(), out var result))
+					return result;
+
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
+			else if (fieldType == typeof(int2[]))
 			{
 				if (value != null)
 				{
-					switch (value.ToLowerInvariant())
-					{
-					case "bmp":
-						return ImageFormat.Bmp;
-					case "gif":
-						return ImageFormat.Gif;
-					case "jpg":
-					case "jpeg":
-						return ImageFormat.Jpeg;
-					case "tif":
-					case "tiff":
-						return ImageFormat.Tiff;
-					default:
-						return ImageFormat.Png;
-					}
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					if (parts.Length % 2 != 0)
+						return InvalidValueAction(value, fieldType, fieldName);
+
+					var ints = new int2[parts.Length / 2];
+					for (var i = 0; i < ints.Length; i++)
+						ints[i] = new int2(Exts.ParseIntegerInvariant(parts[2 * i]), Exts.ParseIntegerInvariant(parts[2 * i + 1]));
+
+					return ints;
 				}
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-			else if (fieldType == typeof(bool))
-				return ParseYesNo(value, fieldType, fieldName);
 			else if (fieldType.IsArray && fieldType.GetArrayRank() == 1)
 			{
 				if (value == null)
@@ -506,6 +477,9 @@ namespace OpenRA
 				if (value != null)
 				{
 					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					if (parts.Length != 2)
+						return InvalidValueAction(value, fieldType, fieldName);
+
 					return new int2(Exts.ParseIntegerInvariant(parts[0]), Exts.ParseIntegerInvariant(parts[1]));
 				}
 
@@ -518,8 +492,7 @@ namespace OpenRA
 					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
 					float xx = 0;
 					float yy = 0;
-					float res;
-					if (float.TryParse(parts[0].Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
+					if (float.TryParse(parts[0].Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out var res))
 						xx = res * (parts[0].Contains('%') ? 0.01f : 1f);
 					if (float.TryParse(parts[1].Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
 						yy = res * (parts[1].Contains('%') ? 0.01f : 1f);
@@ -533,13 +506,11 @@ namespace OpenRA
 				if (value != null)
 				{
 					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-					float x = 0;
-					float y = 0;
-					float z = 0;
-					float.TryParse(parts[0], NumberStyles.Float, NumberFormatInfo.InvariantInfo, out x);
-					float.TryParse(parts[1], NumberStyles.Float, NumberFormatInfo.InvariantInfo, out y);
+					float.TryParse(parts[0], NumberStyles.Float, NumberFormatInfo.InvariantInfo, out var x);
+					float.TryParse(parts[1], NumberStyles.Float, NumberFormatInfo.InvariantInfo, out var y);
 
 					// z component is optional for compatibility with older float2 definitions
+					float z = 0;
 					if (parts.Length > 2)
 						float.TryParse(parts[2], NumberStyles.Float, NumberFormatInfo.InvariantInfo, out z);
 
@@ -562,28 +533,29 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Bits<>))
+			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(BitSet<>))
 			{
 				if (value != null)
 				{
 					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-					var argTypes = new Type[] { typeof(string[]) };
-					var argValues = new object[] { parts };
-					return fieldType.GetConstructor(argTypes).Invoke(argValues);
+					var ctor = fieldType.GetConstructor(new[] { typeof(string[]) });
+					return ctor.Invoke(new object[] { parts.Select(p => p.Trim()).ToArray() });
 				}
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Nullable<>))
 			{
+				if (string.IsNullOrEmpty(value))
+					return null;
+
 				var innerType = fieldType.GetGenericArguments().First();
 				var innerValue = GetValue("Nullable<T>", innerType, value, field);
 				return fieldType.GetConstructor(new[] { innerType }).Invoke(new[] { innerValue });
 			}
 			else if (fieldType == typeof(DateTime))
 			{
-				DateTime dt;
-				if (DateTime.TryParseExact(value, "yyyy-MM-dd HH-mm-ss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out dt))
+				if (DateTime.TryParseExact(value, "yyyy-MM-dd HH-mm-ss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out var dt))
 					return dt;
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
@@ -607,20 +579,6 @@ 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;
@@ -747,8 +705,7 @@ namespace OpenRA
 				if (translations == null)
 					return key;
 
-				string value;
-				if (!translations.TryGetValue(key, out value))
+				if (!translations.TryGetValue(key, out var value))
 					return key;
 
 				return value;

OpenRA.Game/FieldSaver.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -12,12 +12,10 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using OpenRA.Graphics;
+using OpenRA.Primitives;
 
 namespace OpenRA
 {
@@ -75,21 +73,9 @@ namespace OpenRA
 
 			var t = v.GetType();
 
-			// Color.ToString() does the wrong thing; force it to format as rgb[a] hex
 			if (t == typeof(Color))
 			{
-				return HSLColor.ToHexString((Color)v);
-			}
-
-			// HSLColor.ToString() does the wrong thing; force it to format as rgb[a] hex
-			if (t == typeof(HSLColor))
-			{
-				return ((HSLColor)v).ToHexString();
-			}
-
-			if (t == typeof(ImageFormat))
-			{
-				return ((ImageFormat)v).ToString();
+				return ((Color)v).ToString();
 			}
 
 			if (t == typeof(Rectangle))
@@ -98,6 +84,11 @@ namespace OpenRA
 				return "{0},{1},{2},{3}".F(r.X, r.Y, r.Width, r.Height);
 			}
 
+			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(BitSet<>))
+			{
+				return ((IEnumerable<string>)v).Select(FormatValue).JoinWith(", ");
+			}
+
 			if (t.IsArray && t.GetArrayRank() == 1)
 			{
 				return ((Array)v).Cast<object>().Select(FormatValue).JoinWith(", ");

OpenRA.Game/FileFormats/Png.cs

@@ -0,0 +1,355 @@
+#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 System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using ICSharpCode.SharpZipLib.Checksum;
+using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
+using OpenRA.Primitives;
+
+namespace OpenRA.FileFormats
+{
+	public class Png
+	{
+		static readonly byte[] Signature = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a };
+
+		public int Width { get; set; }
+		public int Height { get; set; }
+		public Color[] Palette { get; set; }
+		public byte[] Data { get; set; }
+		public Dictionary<string, string> EmbeddedData = new Dictionary<string, string>();
+
+		public Png(Stream s)
+		{
+			if (!Verify(s))
+				throw new InvalidDataException("PNG Signature is bogus");
+
+			s.Position += 8;
+			var headerParsed = false;
+			var isPaletted = false;
+			var is24Bit = false;
+			var data = new List<byte>();
+
+			while (true)
+			{
+				var length = IPAddress.NetworkToHostOrder(s.ReadInt32());
+				var type = Encoding.UTF8.GetString(s.ReadBytes(4));
+				var content = s.ReadBytes(length);
+				/*var crc = */s.ReadInt32();
+
+				if (!headerParsed && type != "IHDR")
+					throw new InvalidDataException("Invalid PNG file - header does not appear first.");
+
+				using (var ms = new MemoryStream(content))
+				{
+					switch (type)
+					{
+						case "IHDR":
+						{
+							if (headerParsed)
+								throw new InvalidDataException("Invalid PNG file - duplicate header.");
+							Width = IPAddress.NetworkToHostOrder(ms.ReadInt32());
+							Height = IPAddress.NetworkToHostOrder(ms.ReadInt32());
+
+							var bitDepth = ms.ReadUInt8();
+							var colorType = (PngColorType)ms.ReadByte();
+							isPaletted = IsPaletted(bitDepth, colorType);
+							is24Bit = colorType == PngColorType.Color;
+
+							var dataLength = Width * Height;
+							if (!isPaletted)
+								dataLength *= 4;
+
+							Data = new byte[dataLength];
+
+							var compression = ms.ReadByte();
+							/*var filter = */ms.ReadByte();
+							var interlace = ms.ReadByte();
+
+							if (compression != 0)
+								throw new InvalidDataException("Compression method not supported");
+
+							if (interlace != 0)
+								throw new InvalidDataException("Interlacing not supported");
+
+							headerParsed = true;
+
+							break;
+						}
+
+						case "PLTE":
+						{
+							Palette = new Color[256];
+							for (var i = 0; i < length / 3; i++)
+							{
+								var r = ms.ReadByte(); var g = ms.ReadByte(); var b = ms.ReadByte();
+								Palette[i] = Color.FromArgb(r, g, b);
+							}
+
+							break;
+						}
+
+						case "tRNS":
+						{
+							if (Palette == null)
+								throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
+
+							for (var i = 0; i < length; i++)
+								Palette[i] = Color.FromArgb(ms.ReadByte(), Palette[i]);
+
+							break;
+						}
+
+						case "IDAT":
+						{
+							data.AddRange(content);
+
+							break;
+						}
+
+						case "tEXt":
+						{
+							var key = ms.ReadASCIIZ();
+							EmbeddedData.Add(key, ms.ReadASCII(length - key.Length - 1));
+
+							break;
+						}
+
+						case "IEND":
+						{
+							using (var ns = new MemoryStream(data.ToArray()))
+							{
+								using (var ds = new InflaterInputStream(ns))
+								{
+									var pxStride = isPaletted ? 1 : is24Bit ? 3 : 4;
+									var srcStride = Width * pxStride;
+									var destStride = Width * (isPaletted ? 1 : 4);
+
+									var prevLine = new byte[srcStride];
+									for (var y = 0; y < Height; y++)
+									{
+										var filter = (PngFilter)ds.ReadByte();
+										var line = ds.ReadBytes(srcStride);
+
+										for (var i = 0; i < srcStride; i++)
+											line[i] = i < pxStride
+												? UnapplyFilter(filter, line[i], 0, prevLine[i], 0)
+												: UnapplyFilter(filter, line[i], line[i - pxStride], prevLine[i], prevLine[i - pxStride]);
+
+										if (is24Bit)
+										{
+											// Fold alpha channel into RGB data
+											for (var i = 0; i < line.Length / 3; i++)
+											{
+												Array.Copy(line, 3 * i, Data, y * destStride + 4 * i, 3);
+												Data[y * destStride + 4 * i + 3] = 255;
+											}
+										}
+										else
+											Array.Copy(line, 0, Data, y * destStride, line.Length);
+
+										prevLine = line;
+									}
+								}
+							}
+
+							if (isPaletted && Palette == null)
+								throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
+
+							return;
+						}
+					}
+				}
+			}
+		}
+
+		public Png(byte[] data, int width, int height, Color[] palette = null,
+			Dictionary<string, string> embeddedData = null)
+		{
+			var expectLength = width * height;
+			if (palette == null)
+				expectLength *= 4;
+
+			if (data.Length != expectLength)
+				throw new InvalidDataException("Input data does not match expected length");
+
+			Width = width;
+			Height = height;
+
+			Palette = palette;
+			Data = data;
+
+			if (embeddedData != null)
+				EmbeddedData = embeddedData;
+		}
+
+		public static bool Verify(Stream s)
+		{
+			var pos = s.Position;
+			var isPng = Signature.Aggregate(true, (current, t) => current && s.ReadUInt8() == t);
+			s.Position = pos;
+			return isPng;
+		}
+
+		static byte UnapplyFilter(PngFilter f, byte x, byte a, byte b, byte c)
+		{
+			switch (f)
+			{
+				case PngFilter.None: return x;
+				case PngFilter.Sub: return (byte)(x + a);
+				case PngFilter.Up: return (byte)(x + b);
+				case PngFilter.Average: return (byte)(x + (a + b) / 2);
+				case PngFilter.Paeth: return (byte)(x + Paeth(a, b, c));
+				default:
+					throw new InvalidOperationException("Unsupported Filter");
+			}
+		}
+
+		static byte Paeth(byte a, byte b, byte c)
+		{
+			var p = a + b - c;
+			var pa = Math.Abs(p - a);
+			var pb = Math.Abs(p - b);
+			var pc = Math.Abs(p - c);
+
+			return (pa <= pb && pa <= pc) ? a :
+				(pb <= pc) ? b : c;
+		}
+
+		[Flags]
+		enum PngColorType { Indexed = 1, Color = 2, Alpha = 4 }
+		enum PngFilter { None, Sub, Up, Average, Paeth }
+
+		static bool IsPaletted(byte bitDepth, PngColorType colorType)
+		{
+			if (bitDepth == 8 && colorType == (PngColorType.Indexed | PngColorType.Color))
+				return true;
+
+			if (bitDepth == 8 && colorType == (PngColorType.Color | PngColorType.Alpha))
+				return false;
+
+			if (bitDepth == 8 && colorType == PngColorType.Color)
+				return false;
+
+			throw new InvalidDataException("Unknown pixel format");
+		}
+
+		void WritePngChunk(Stream output, string type, Stream input)
+		{
+			input.Position = 0;
+
+			var typeBytes = Encoding.ASCII.GetBytes(type);
+			output.Write(IPAddress.HostToNetworkOrder((int)input.Length));
+			output.WriteArray(typeBytes);
+
+			var data = input.ReadAllBytes();
+			output.WriteArray(data);
+
+			var crc32 = new Crc32();
+			crc32.Update(typeBytes);
+			crc32.Update(data);
+			output.Write(IPAddress.NetworkToHostOrder((int)crc32.Value));
+		}
+
+		public byte[] Save()
+		{
+			using (var output = new MemoryStream())
+			{
+				output.WriteArray(Signature);
+				using (var header = new MemoryStream())
+				{
+					header.Write(IPAddress.HostToNetworkOrder(Width));
+					header.Write(IPAddress.HostToNetworkOrder(Height));
+					header.WriteByte(8); // Bit depth
+
+					var colorType = Palette != null
+						? PngColorType.Indexed | PngColorType.Color
+						: PngColorType.Color | PngColorType.Alpha;
+					header.WriteByte((byte)colorType);
+
+					header.WriteByte(0); // Compression
+					header.WriteByte(0); // Filter
+					header.WriteByte(0); // Interlacing
+
+					WritePngChunk(output, "IHDR", header);
+				}
+
+				bool alphaPalette = false;
+				if (Palette != null)
+				{
+					using (var palette = new MemoryStream())
+					{
+						foreach (var c in Palette)
+						{
+							palette.WriteByte(c.R);
+							palette.WriteByte(c.G);
+							palette.WriteByte(c.B);
+							alphaPalette |= c.A > 0;
+						}
+
+						WritePngChunk(output, "PLTE", palette);
+					}
+				}
+
+				if (alphaPalette)
+				{
+					using (var alpha = new MemoryStream())
+					{
+						foreach (var c in Palette)
+							alpha.WriteByte(c.A);
+
+						WritePngChunk(output, "tRNS", alpha);
+					}
+				}
+
+				using (var data = new MemoryStream())
+				{
+					using (var compressed = new DeflaterOutputStream(data))
+					{
+						var stride = Width * (Palette != null ? 1 : 4);
+						for (var y = 0; y < Height; y++)
+						{
+							// Write uncompressed scanlines for simplicity
+							compressed.WriteByte(0);
+							compressed.Write(Data, y * stride, stride);
+						}
+
+						compressed.Flush();
+						compressed.Finish();
+
+						WritePngChunk(output, "IDAT", data);
+					}
+				}
+
+				foreach (var kv in EmbeddedData)
+				{
+					using (var text = new MemoryStream())
+					{
+						text.WriteArray(Encoding.ASCII.GetBytes(kv.Key + (char)0 + kv.Value));
+						WritePngChunk(output, "tEXt", text);
+					}
+				}
+
+				WritePngChunk(output, "IEND", new MemoryStream());
+				return output.ToArray();
+			}
+		}
+
+		public void Save(string path)
+		{
+			File.WriteAllBytes(path, Save());
+		}
+	}
+}

OpenRA.Game/FileFormats/PngLoader.cs

@@ -1,206 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.IO.Compression;
-using System.Net;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace OpenRA.FileFormats
-{
-	public static class PngLoader
-	{
-		public static Bitmap Load(string filename)
-		{
-			using (var s = File.OpenRead(filename))
-				return Load(s);
-		}
-
-		public static Bitmap Load(Stream s)
-		{
-			using (var br = new BinaryReader(s))
-			{
-				var signature = new byte[] { 137, 80, 78, 71, 13, 10, 26, 10 };
-				foreach (var b in signature)
-					if (br.ReadByte() != b)
-						throw new InvalidDataException("PNG Signature is bogus");
-
-				Bitmap bitmap = null;
-				Color[] palette = null;
-				var data = new List<byte>();
-
-				try
-				{
-					for (;;)
-					{
-						var length = IPAddress.NetworkToHostOrder(br.ReadInt32());
-						var type = Encoding.UTF8.GetString(br.ReadBytes(4));
-						var content = br.ReadBytes(length);
-						/*var crc = */br.ReadInt32();
-
-						if (bitmap == null && type != "IHDR")
-							throw new InvalidDataException("Invalid PNG file - header does not appear first.");
-
-						using (var ms = new MemoryStream(content))
-						using (var cr = new BinaryReader(ms))
-							switch (type)
-							{
-								case "IHDR":
-									{
-										if (bitmap != null)
-											throw new InvalidDataException("Invalid PNG file - duplicate header.");
-
-										var width = IPAddress.NetworkToHostOrder(cr.ReadInt32());
-										var height = IPAddress.NetworkToHostOrder(cr.ReadInt32());
-										var bitDepth = cr.ReadByte();
-										var colorType = (PngColorType)cr.ReadByte();
-										var compression = cr.ReadByte();
-										/*var filter = */cr.ReadByte();
-										var interlace = cr.ReadByte();
-
-										if (compression != 0) throw new InvalidDataException("Compression method not supported");
-										if (interlace != 0) throw new InvalidDataException("Interlacing not supported");
-
-										bitmap = new Bitmap(width, height, MakePixelFormat(bitDepth, colorType));
-									}
-
-									break;
-
-								case "PLTE":
-									{
-										palette = new Color[256];
-										for (var i = 0; i < 256; i++)
-										{
-											var r = cr.ReadByte(); var g = cr.ReadByte(); var b = cr.ReadByte();
-											palette[i] = Color.FromArgb(r, g, b);
-										}
-									}
-
-									break;
-
-								case "tRNS":
-									{
-										if (palette == null)
-											throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
-
-										for (var i = 0; i < length; i++)
-											palette[i] = Color.FromArgb(cr.ReadByte(), palette[i]);
-									}
-
-									break;
-
-								case "IDAT":
-									{
-										data.AddRange(content);
-									}
-
-									break;
-
-								case "IEND":
-									{
-										var bits = bitmap.LockBits(bitmap.Bounds(),
-											ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-										using (var ns = new MemoryStream(data.ToArray()))
-										{
-											// 'zlib' flags bytes; confuses the DeflateStream.
-											/*var flags = (byte)*/ns.ReadByte();
-											/*var moreFlags = (byte)*/ns.ReadByte();
-
-											using (var ds = new DeflateStream(ns, CompressionMode.Decompress))
-											using (var dr = new BinaryReader(ds))
-											{
-												var prevLine = new byte[bitmap.Width];  // all zero
-												for (var y = 0; y < bitmap.Height; y++)
-												{
-													var filter = (PngFilter)dr.ReadByte();
-													var line = dr.ReadBytes(bitmap.Width);
-
-													for (var i = 0; i < bitmap.Width; i++)
-														line[i] = i > 0
-															? UnapplyFilter(filter, line[i], line[i - 1], prevLine[i], prevLine[i - 1])
-															: UnapplyFilter(filter, line[i], 0, prevLine[i], 0);
-
-													Marshal.Copy(line, 0, new IntPtr(bits.Scan0.ToInt64() + y * bits.Stride), line.Length);
-													prevLine = line;
-												}
-											}
-										}
-
-										bitmap.UnlockBits(bits);
-
-										if (palette == null)
-											throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
-
-										using (var temp = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
-										{
-											var cp = temp.Palette;
-											for (var i = 0; i < 256; i++)
-												cp.Entries[i] = palette[i];     // finalize the palette.
-											bitmap.Palette = cp;
-											return bitmap;
-										}
-									}
-							}
-					}
-				}
-				catch
-				{
-					if (bitmap != null)
-						bitmap.Dispose();
-					throw;
-				}
-			}
-		}
-
-		static byte UnapplyFilter(PngFilter f, byte x, byte a, byte b, byte c)
-		{
-			switch (f)
-			{
-				case PngFilter.None: return x;
-				case PngFilter.Sub: return (byte)(x + a);
-				case PngFilter.Up: return (byte)(x + b);
-				case PngFilter.Average: return (byte)(x + (a + b) / 2);
-				case PngFilter.Paeth: return (byte)(x + Paeth(a, b, c));
-				default:
-					throw new InvalidOperationException("Unsupported Filter");
-			}
-		}
-
-		static byte Paeth(byte a, byte b, byte c)
-		{
-			var p = a + b - c;
-			var pa = Math.Abs(p - a);
-			var pb = Math.Abs(p - b);
-			var pc = Math.Abs(p - c);
-
-			return (pa <= pb && pa <= pc) ? a :
-				(pb <= pc) ? b : c;
-		}
-
-		[Flags]
-		enum PngColorType { Indexed = 1, Color = 2, Alpha = 4 }
-		enum PngFilter { None, Sub, Up, Average, Paeth }
-
-		static PixelFormat MakePixelFormat(byte bitDepth, PngColorType colorType)
-		{
-			if (bitDepth == 8 && colorType == (PngColorType.Indexed | PngColorType.Color))
-				return PixelFormat.Format8bppIndexed;
-
-			throw new InvalidDataException("Unknown pixel format");
-		}
-	}
-}

OpenRA.Game/FileFormats/ReplayMetadata.cs

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

OpenRA.Game/FileSystem/BagFile.cs

@@ -1,127 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using OpenRA.FileFormats;
-using OpenRA.Primitives;
-
-namespace OpenRA.FileSystem
-{
-	public sealed class BagFile : IReadOnlyPackage
-	{
-		public string Name { get; private set; }
-		public IEnumerable<string> Contents { get { return index.Keys; } }
-
-		readonly Stream s;
-		readonly Dictionary<string, IdxEntry> index;
-
-		public BagFile(FileSystem context, string filename)
-		{
-			Name = filename;
-
-			// A bag file is always accompanied with an .idx counterpart
-			// For example: audio.bag requires the audio.idx file
-			var indexFilename = Path.ChangeExtension(filename, ".idx");
-
-			// Build the index and dispose the stream, it is no longer needed after this
-			List<IdxEntry> entries;
-			using (var indexStream = context.Open(indexFilename))
-				entries = new IdxReader(indexStream).Entries;
-
-			index = entries.ToDictionaryWithConflictLog(x => x.Filename,
-				"{0} (bag format)".F(filename),
-				null, x => "(offs={0}, len={1})".F(x.Offset, x.Length));
-
-			s = context.Open(filename);
-		}
-
-		public Stream GetStream(string filename)
-		{
-			IdxEntry entry;
-			if (!index.TryGetValue(filename, out entry))
-				return null;
-
-			s.Seek(entry.Offset, SeekOrigin.Begin);
-
-			var waveHeaderMemoryStream = new MemoryStream();
-
-			var channels = (entry.Flags & 1) > 0 ? 2 : 1;
-
-			if ((entry.Flags & 2) > 0)
-			{
-				// PCM
-				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("RIFF"));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length + 36));
-				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("WAVE"));
-				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fmt "));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes(16));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)1));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)channels));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.SampleRate));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes(2 * channels * entry.SampleRate));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)(2 * channels)));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)16));
-				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("data"));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length));
-			}
-
-			if ((entry.Flags & 8) > 0)
-			{
-				// IMA ADPCM
-				var samplesPerChunk = (2 * (entry.ChunkSize - 4)) + 1;
-				var bytesPerSec = (int)Math.Floor(((double)(2 * entry.ChunkSize) / samplesPerChunk) * ((double)entry.SampleRate / 2));
-				var chunkSize = entry.ChunkSize > entry.Length ? entry.Length : entry.ChunkSize;
-
-				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("RIFF"));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length + 52));
-				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("WAVE"));
-				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fmt "));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes(20));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)17));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)channels));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.SampleRate));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes(bytesPerSec));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)chunkSize));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)4));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)2));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes((short)samplesPerChunk));
-				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("fact"));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes(4));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes(4 * entry.Length));
-				waveHeaderMemoryStream.Write(Encoding.ASCII.GetBytes("data"));
-				waveHeaderMemoryStream.Write(BitConverter.GetBytes(entry.Length));
-			}
-
-			waveHeaderMemoryStream.Seek(0, SeekOrigin.Begin);
-
-			// Construct a merged stream
-			var mergedStream = new MergedStream(waveHeaderMemoryStream, s);
-			mergedStream.SetLength(waveHeaderMemoryStream.Length + entry.Length);
-
-			return mergedStream;
-		}
-
-		public bool Contains(string filename)
-		{
-			return index.ContainsKey(filename);
-		}
-
-		public void Dispose()
-		{
-			s.Dispose();
-		}
-	}
-}

OpenRA.Game/FileSystem/BigFile.cs

@@ -1,105 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileSystem
-{
-	public sealed class BigFile : IReadOnlyPackage
-	{
-		public string Name { get; private set; }
-		public IEnumerable<string> Contents { get { return index.Keys; } }
-
-		readonly Dictionary<string, Entry> index = new Dictionary<string, Entry>();
-		readonly Stream s;
-
-		public BigFile(FileSystem context, string filename)
-		{
-			Name = filename;
-
-			s = context.Open(filename);
-			try
-			{
-				if (s.ReadASCII(4) != "BIGF")
-					throw new InvalidDataException("Header is not BIGF");
-
-				// Total archive size.
-				s.ReadUInt32();
-
-				var entryCount = s.ReadUInt32();
-				if (BitConverter.IsLittleEndian)
-					entryCount = int2.Swap(entryCount);
-
-				// First entry offset? This is apparently bogus for EA's .big files
-				// and we don't have to try seeking there since the entries typically start next in EA's .big files.
-				s.ReadUInt32();
-
-				for (var i = 0; i < entryCount; i++)
-				{
-					var entry = new Entry(s);
-					index.Add(entry.Path, entry);
-				}
-			}
-			catch
-			{
-				Dispose();
-				throw;
-			}
-		}
-
-		class Entry
-		{
-			readonly Stream s;
-			readonly uint offset;
-			readonly uint size;
-			public readonly string Path;
-
-			public Entry(Stream s)
-			{
-				this.s = s;
-
-				offset = s.ReadUInt32();
-				size = s.ReadUInt32();
-				if (BitConverter.IsLittleEndian)
-				{
-					offset = int2.Swap(offset);
-					size = int2.Swap(size);
-				}
-
-				Path = s.ReadASCIIZ();
-			}
-
-			public Stream GetData()
-			{
-				s.Position = offset;
-				return new MemoryStream(s.ReadBytes((int)size));
-			}
-		}
-
-		public Stream GetStream(string filename)
-		{
-			return index[filename].GetData();
-		}
-
-		public bool Contains(string filename)
-		{
-			return index.ContainsKey(filename);
-		}
-
-		public void Dispose()
-		{
-			s.Dispose();
-		}
-	}
-}

OpenRA.Game/FileSystem/D2kSoundResources.cs

@@ -1,81 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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 System.IO;
-using OpenRA.Primitives;
-
-namespace OpenRA.FileSystem
-{
-	public sealed class D2kSoundResources : IReadOnlyPackage
-	{
-		struct Entry
-		{
-			public readonly uint Offset;
-			public readonly uint Length;
-
-			public Entry(uint offset, uint length)
-			{
-				Offset = offset;
-				Length = length;
-			}
-		}
-
-		public string Name { get; private set; }
-		public IEnumerable<string> Contents { get { return index.Keys; } }
-
-		readonly Stream s;
-		readonly Dictionary<string, Entry> index = new Dictionary<string, Entry>();
-
-		public D2kSoundResources(FileSystem context, string filename)
-		{
-			Name = filename;
-
-			s = context.Open(filename);
-			try
-			{
-				var headerLength = s.ReadUInt32();
-				while (s.Position < headerLength + 4)
-				{
-					var name = s.ReadASCIIZ();
-					var offset = s.ReadUInt32();
-					var length = s.ReadUInt32();
-					index.Add(name, new Entry(offset, length));
-				}
-			}
-			catch
-			{
-				Dispose();
-				throw;
-			}
-		}
-
-		public Stream GetStream(string filename)
-		{
-			Entry e;
-			if (!index.TryGetValue(filename, out e))
-				return null;
-
-			s.Seek(e.Offset, SeekOrigin.Begin);
-			return new MemoryStream(s.ReadBytes((int)e.Length));
-		}
-
-		public bool Contains(string filename)
-		{
-			return index.ContainsKey(filename);
-		}
-
-		public void Dispose()
-		{
-			s.Dispose();
-		}
-	}
-}

OpenRA.Game/FileSystem/FileSystem.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -23,6 +23,7 @@ namespace OpenRA.FileSystem
 		bool TryGetPackageContaining(string path, out IReadOnlyPackage package, out string filename);
 		bool TryOpen(string filename, out Stream s);
 		bool Exists(string filename);
+		bool IsExternalModFile(string filename);
 	}
 
 	public class FileSystem : IReadOnlyFileSystem
@@ -30,91 +31,70 @@ namespace OpenRA.FileSystem
 		public IEnumerable<IReadOnlyPackage> MountedPackages { get { return mountedPackages.Keys; } }
 		readonly Dictionary<IReadOnlyPackage, int> mountedPackages = new Dictionary<IReadOnlyPackage, int>();
 		readonly Dictionary<string, IReadOnlyPackage> explicitMounts = new Dictionary<string, IReadOnlyPackage>();
+		readonly string modID;
 
 		// Mod packages that should not be disposed
 		readonly List<IReadOnlyPackage> modPackages = new List<IReadOnlyPackage>();
 		readonly IReadOnlyDictionary<string, Manifest> installedMods;
+		readonly IPackageLoader[] packageLoaders;
 
 		Cache<string, List<IReadOnlyPackage>> fileIndex = new Cache<string, List<IReadOnlyPackage>>(_ => new List<IReadOnlyPackage>());
 
-		public FileSystem(IReadOnlyDictionary<string, Manifest> installedMods)
+		public FileSystem(string modID, IReadOnlyDictionary<string, Manifest> installedMods, IPackageLoader[] packageLoaders)
 		{
+			this.modID = modID;
 			this.installedMods = installedMods;
+			this.packageLoaders = packageLoaders
+				.Append(new ZipFileLoader())
+				.ToArray();
+		}
+
+		public bool TryParsePackage(Stream stream, string filename, out IReadOnlyPackage package)
+		{
+			package = null;
+			foreach (var packageLoader in packageLoaders)
+				if (packageLoader.TryParsePackage(stream, filename, this, out package))
+					return true;
+
+			return false;
 		}
 
 		public IReadOnlyPackage OpenPackage(string filename)
 		{
-			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
-				return new MixFile(this, filename);
-			if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(this, filename);
-			if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(this, filename);
-			if (filename.EndsWith(".oramod", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(this, filename);
-			if (filename.EndsWith(".RS", StringComparison.InvariantCultureIgnoreCase))
-				return new D2kSoundResources(this, filename);
-			if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
-				return new InstallShieldPackage(this, filename);
-			if (filename.EndsWith(".PAK", StringComparison.InvariantCultureIgnoreCase))
-				return new PakFile(this, filename);
-			if (filename.EndsWith(".big", StringComparison.InvariantCultureIgnoreCase))
-				return new BigFile(this, filename);
-			if (filename.EndsWith(".bag", StringComparison.InvariantCultureIgnoreCase))
-				return new BagFile(this, filename);
+			// Raw directories are the easiest and one of the most common cases, so try these first
+			var resolvedPath = Platform.ResolvePath(filename);
+			if (!filename.Contains("|") && Directory.Exists(resolvedPath))
+				return new Folder(resolvedPath);
 
-			IReadOnlyPackage parent;
-			string subPath = null;
-			if (TryGetPackageContaining(filename, out parent, out subPath))
-				return OpenPackage(subPath, parent);
+			// Children of another package require special handling
+			if (TryGetPackageContaining(filename, out var parent, out var subPath))
+				return parent.OpenPackage(subPath, this);
 
-			return new Folder(Platform.ResolvePath(filename));
-		}
+			// Try and open it normally
+			var stream = Open(filename);
+			if (TryParsePackage(stream, filename, out var package))
+				return package;
 
-		public IReadOnlyPackage OpenPackage(string filename, IReadOnlyPackage parent)
-		{
-			// HACK: limit support to zip and folder until we generalize the PackageLoader support
-			if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase) ||
-				filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-			{
-				using (var s = parent.GetStream(filename))
-					return new ZipFile(s, filename, parent);
-			}
-
-			if (parent is ZipFile)
-				return new ZipFolder(this, (ZipFile)parent, filename, filename);
-
-			if (parent is ZipFolder)
-			{
-				var folder = (ZipFolder)parent;
-				return new ZipFolder(this, folder.Parent, folder.Name + "/" + filename, filename);
-			}
-
-			if (parent is Folder)
-			{
-				var subFolder = Platform.ResolvePath(Path.Combine(parent.Name, filename));
-				if (Directory.Exists(subFolder))
-					return new Folder(subFolder);
-			}
+			// No package loaders took ownership of the stream, so clean it up
+			stream.Dispose();
 
 			return null;
 		}
 
 		public void Mount(string name, string explicitName = null)
 		{
-			var optional = name.StartsWith("~");
+			var optional = name.StartsWith("~", StringComparison.Ordinal);
 			if (optional)
 				name = name.Substring(1);
 
 			try
 			{
 				IReadOnlyPackage package;
-				if (name.StartsWith("$"))
+				if (name.StartsWith("$", StringComparison.Ordinal))
 				{
 					name = name.Substring(1);
 
-					Manifest mod;
-					if (!installedMods.TryGetValue(name, out mod))
+					if (!installedMods.TryGetValue(name, out var mod))
 						throw new InvalidOperationException("Could not load mod '{0}'. Available mods: {1}".F(name, installedMods.Keys.JoinWith(", ")));
 
 					package = mod.Package;
@@ -138,8 +118,7 @@ namespace OpenRA.FileSystem
 
 		public void Mount(IReadOnlyPackage package, string explicitName = null)
 		{
-			var mountCount = 0;
-			if (mountedPackages.TryGetValue(package, out mountCount))
+			if (mountedPackages.TryGetValue(package, out var mountCount))
 			{
 				// Package is already mounted
 				// Increment the mount count and bump up the file loading priority
@@ -165,8 +144,7 @@ namespace OpenRA.FileSystem
 
 		public bool Unmount(IReadOnlyPackage package)
 		{
-			var mountCount = 0;
-			if (!mountedPackages.TryGetValue(package, out mountCount))
+			if (!mountedPackages.TryGetValue(package, out var mountCount))
 				return false;
 
 			if (--mountCount <= 0)
@@ -219,16 +197,12 @@ namespace OpenRA.FileSystem
 			var package = fileIndex[filename]
 				.LastOrDefault(x => x.Contains(filename));
 
-			if (package != null)
-				return package.GetStream(filename);
-
-			return null;
+			return package?.GetStream(filename);
 		}
 
 		public Stream Open(string filename)
 		{
-			Stream s;
-			if (!TryOpen(filename, out s))
+			if (!TryOpen(filename, out var s))
 				throw new FileNotFoundException("File not found: {0}".F(filename), filename);
 
 			return s;
@@ -254,8 +228,7 @@ namespace OpenRA.FileSystem
 			var explicitSplit = filename.IndexOf('|');
 			if (explicitSplit > 0)
 			{
-				IReadOnlyPackage explicitPackage;
-				if (explicitMounts.TryGetValue(filename.Substring(0, explicitSplit), out explicitPackage))
+				if (explicitMounts.TryGetValue(filename.Substring(0, explicitSplit), out var explicitPackage))
 				{
 					s = explicitPackage.GetStream(filename.Substring(explicitSplit + 1));
 					if (s != null)
@@ -290,14 +263,68 @@ namespace OpenRA.FileSystem
 		{
 			var explicitSplit = filename.IndexOf('|');
 			if (explicitSplit > 0)
-			{
-				IReadOnlyPackage explicitPackage;
-				if (explicitMounts.TryGetValue(filename.Substring(0, explicitSplit), out explicitPackage))
+				if (explicitMounts.TryGetValue(filename.Substring(0, explicitSplit), out var explicitPackage))
 					if (explicitPackage.Contains(filename.Substring(explicitSplit + 1)))
 						return true;
-			}
 
 			return fileIndex.ContainsKey(filename);
 		}
+
+		/// <summary>
+		/// Returns true if the given filename references an external mod via an explicit mount
+		/// </summary>
+		public bool IsExternalModFile(string filename)
+		{
+			var explicitSplit = filename.IndexOf('|');
+			if (explicitSplit < 0)
+				return false;
+
+			if (!explicitMounts.TryGetValue(filename.Substring(0, explicitSplit), out var explicitPackage))
+				return false;
+
+			if (installedMods[modID].Package == explicitPackage)
+				return false;
+
+			return modPackages.Contains(explicitPackage);
+		}
+
+		/// <summary>
+		/// Resolves a filesystem for an assembly, accounting for explicit and mod mounts.
+		/// Assemblies must exist in the native OS file system (not inside an OpenRA-defined package).
+		/// </summary>
+		public static string ResolveAssemblyPath(string path, Manifest manifest, InstalledMods installedMods)
+		{
+			var explicitSplit = path.IndexOf('|');
+			if (explicitSplit > 0)
+			{
+				var parent = path.Substring(0, explicitSplit);
+				var filename = path.Substring(explicitSplit + 1);
+
+				var parentPath = manifest.Packages.FirstOrDefault(kv => kv.Value == parent).Key;
+				if (parentPath == null)
+					return null;
+
+				if (parentPath.StartsWith("$", StringComparison.Ordinal))
+				{
+					if (!installedMods.TryGetValue(parentPath.Substring(1), out var mod))
+						return null;
+
+					if (!(mod.Package is Folder))
+						return null;
+
+					path = Path.Combine(mod.Package.Name, filename);
+				}
+				else
+					path = Path.Combine(parentPath, filename);
+			}
+
+			var resolvedPath = Platform.ResolvePath(path);
+			return File.Exists(resolvedPath) ? resolvedPath : null;
+		}
+
+		public string GetPrefix(IReadOnlyPackage package)
+		{
+			return explicitMounts.ContainsValue(package) ? explicitMounts.First(f => f.Value == package).Key : null;
+		}
 	}
 }

OpenRA.Game/FileSystem/Folder.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -51,6 +51,28 @@ namespace OpenRA.FileSystem
 			return combined.StartsWith(path, StringComparison.Ordinal) && File.Exists(combined);
 		}
 
+		public IReadOnlyPackage OpenPackage(string filename, FileSystem context)
+		{
+			var resolvedPath = Platform.ResolvePath(Path.Combine(Name, filename));
+			if (Directory.Exists(resolvedPath))
+				return new Folder(resolvedPath);
+
+			// Zip files loaded from Folders (and *only* from Folders) can be read-write
+			if (ZipFileLoader.TryParseReadWritePackage(resolvedPath, out var readWritePackage))
+				return readWritePackage;
+
+			// Other package types can be loaded normally
+			var s = GetStream(filename);
+			if (s == null)
+				return null;
+
+			if (context.TryParsePackage(s, filename, out var package))
+				return package;
+
+			s.Dispose();
+			return null;
+		}
+
 		public void Update(string filename, byte[] contents)
 		{
 			// HACK: ZipFiles can't be loaded as read-write from a stream, so we are

OpenRA.Game/FileSystem/IPackage.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -15,12 +15,23 @@ using System.IO;
 
 namespace OpenRA.FileSystem
 {
+	public interface IPackageLoader
+	{
+		/// <summary>
+		/// Attempt to parse a stream as this type of package.
+		/// If successful, the loader is expected to take ownership of `s` and dispose it once done.
+		/// If unsuccessful, the loader is expected to return the stream position to where it started.
+		/// </summary>
+		bool TryParsePackage(Stream s, string filename, FileSystem context, out IReadOnlyPackage package);
+	}
+
 	public interface IReadOnlyPackage : IDisposable
 	{
 		string Name { get; }
 		IEnumerable<string> Contents { get; }
 		Stream GetStream(string filename);
 		bool Contains(string filename);
+		IReadOnlyPackage OpenPackage(string filename, FileSystem context);
 	}
 
 	public interface IReadWritePackage : IReadOnlyPackage

OpenRA.Game/FileSystem/InstallShieldPackage.cs

@@ -1,137 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using OpenRA.FileFormats;
-
-namespace OpenRA.FileSystem
-{
-	public sealed class InstallShieldPackage : IReadOnlyPackage
-	{
-		public struct Entry
-		{
-			public readonly uint Offset;
-			public readonly uint Length;
-
-			public Entry(uint offset, uint length)
-			{
-				Offset = offset;
-				Length = length;
-			}
-		}
-
-		public string Name { get; private set; }
-		public IEnumerable<string> Contents { get { return index.Keys; } }
-
-		readonly Dictionary<string, Entry> index = new Dictionary<string, Entry>();
-		readonly Stream s;
-		readonly long dataStart = 255;
-
-		public InstallShieldPackage(FileSystem context, string filename)
-		{
-			Name = filename;
-
-			s = context.Open(filename);
-			try
-			{
-				// Parse package header
-				var signature = s.ReadUInt32();
-				if (signature != 0x8C655D13)
-					throw new InvalidDataException("Not an Installshield package");
-
-				s.Position += 8;
-				/*var FileCount = */s.ReadUInt16();
-				s.Position += 4;
-				/*var ArchiveSize = */s.ReadUInt32();
-				s.Position += 19;
-				var tocAddress = s.ReadInt32();
-				s.Position += 4;
-				var dirCount = s.ReadUInt16();
-
-				// Parse the directory list
-				s.Position = tocAddress;
-
-				// Parse directories
-				var directories = new Dictionary<string, uint>();
-				for (var i = 0; i < dirCount; i++)
-				{
-					// Parse directory header
-					var fileCount = s.ReadUInt16();
-					var chunkSize = s.ReadUInt16();
-					var nameLength = s.ReadUInt16();
-					var dirName = s.ReadASCII(nameLength);
-
-					// Skip to the end of the chunk
-					s.ReadBytes(chunkSize - nameLength - 6);
-					directories.Add(dirName, fileCount);
-				}
-
-				// Parse files
-				foreach (var dir in directories)
-					for (var i = 0; i < dir.Value; i++)
-						ParseFile(s, dir.Key);
-			}
-			catch
-			{
-				Dispose();
-				throw;
-			}
-		}
-
-		uint accumulatedData = 0;
-		void ParseFile(Stream s, string dirName)
-		{
-			s.Position += 7;
-			var compressedSize = s.ReadUInt32();
-			s.Position += 12;
-			var chunkSize = s.ReadUInt16();
-			s.Position += 4;
-			var nameLength = s.ReadByte();
-			var fileName = dirName + "\\" + s.ReadASCII(nameLength);
-
-			// Use index syntax to overwrite any duplicate entries with the last value
-			index[fileName] = new Entry(accumulatedData, compressedSize);
-			accumulatedData += compressedSize;
-
-			// Skip to the end of the chunk
-			s.Position += chunkSize - nameLength - 30;
-		}
-
-		public Stream GetStream(string filename)
-		{
-			Entry e;
-			if (!index.TryGetValue(filename, out e))
-				return null;
-
-			s.Seek(dataStart + e.Offset, SeekOrigin.Begin);
-
-			var ret = new MemoryStream();
-			Blast.Decompress(s, ret);
-			ret.Seek(0, SeekOrigin.Begin);
-
-			return ret;
-		}
-
-		public bool Contains(string filename)
-		{
-			return index.ContainsKey(filename);
-		}
-
-		public IReadOnlyDictionary<string, Entry> Index { get { return new ReadOnlyDictionary<string, Entry>(index); } }
-
-		public void Dispose()
-		{
-			s.Dispose();
-		}
-	}
-}

OpenRA.Game/FileSystem/MixFile.cs

@@ -1,243 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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.Globalization;
-using System.IO;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.Primitives;
-
-namespace OpenRA.FileSystem
-{
-	public sealed class MixFile : IReadOnlyPackage
-	{
-		public string Name { get; private set; }
-		public IEnumerable<string> Contents { get { return index.Keys; } }
-
-		readonly Dictionary<string, PackageEntry> index;
-		readonly long dataStart;
-		readonly Stream s;
-		readonly FileSystem context;
-
-		public MixFile(FileSystem context, string filename)
-		{
-			Name = filename;
-			this.context = context;
-
-			s = context.Open(filename);
-			try
-			{
-				// Detect format type
-				var isCncMix = s.ReadUInt16() != 0;
-
-				// The C&C mix format doesn't contain any flags or encryption
-				var isEncrypted = false;
-				if (!isCncMix)
-					isEncrypted = (s.ReadUInt16() & 0x2) != 0;
-
-				List<PackageEntry> entries;
-				if (isEncrypted)
-				{
-					long unused;
-					entries = ParseHeader(DecryptHeader(s, 4, out dataStart), 0, out unused);
-				}
-				else
-					entries = ParseHeader(s, isCncMix ? 0 : 4, out dataStart);
-
-				index = ParseIndex(entries.ToDictionaryWithConflictLog(x => x.Hash,
-					"{0} ({1} format, Encrypted: {2}, DataStart: {3})".F(filename, isCncMix ? "C&C" : "RA/TS/RA2", isEncrypted, dataStart),
-					null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)));
-			}
-			catch (Exception)
-			{
-				Dispose();
-				throw;
-			}
-		}
-
-		Dictionary<string, PackageEntry> ParseIndex(Dictionary<uint, PackageEntry> entries)
-		{
-			var classicIndex = new Dictionary<string, PackageEntry>();
-			var crcIndex = new Dictionary<string, PackageEntry>();
-			var allPossibleFilenames = new HashSet<string>();
-
-			// Try and find a local mix database
-			var dbNameClassic = PackageEntry.HashFilename("local mix database.dat", PackageHashType.Classic);
-			var dbNameCRC = PackageEntry.HashFilename("local mix database.dat", PackageHashType.CRC32);
-			foreach (var kv in entries)
-			{
-				if (kv.Key == dbNameClassic || kv.Key == dbNameCRC)
-				{
-					using (var content = GetContent(kv.Value))
-					{
-						var db = new XccLocalDatabase(content);
-						foreach (var e in db.Entries)
-							allPossibleFilenames.Add(e);
-					}
-
-					break;
-				}
-			}
-
-			// Load the global mix database
-			// TODO: This should be passed to the mix file ctor
-			if (context.Exists("global mix database.dat"))
-			{
-				using (var db = new XccGlobalDatabase(context.Open("global mix database.dat")))
-				{
-					foreach (var e in db.Entries)
-						allPossibleFilenames.Add(e);
-				}
-			}
-
-			foreach (var filename in allPossibleFilenames)
-			{
-				var classicHash = PackageEntry.HashFilename(filename, PackageHashType.Classic);
-				var crcHash = PackageEntry.HashFilename(filename, PackageHashType.CRC32);
-				PackageEntry e;
-
-				if (entries.TryGetValue(classicHash, out e))
-					classicIndex.Add(filename, e);
-
-				if (entries.TryGetValue(crcHash, out e))
-					crcIndex.Add(filename, e);
-			}
-
-			var bestIndex = crcIndex.Count > classicIndex.Count ? crcIndex : classicIndex;
-
-			var unknown = entries.Count - bestIndex.Count;
-			if (unknown > 0)
-				Log.Write("debug", "{0}: failed to resolve filenames for {1} unknown hashes".F(Name, unknown));
-
-			return bestIndex;
-		}
-
-		static List<PackageEntry> ParseHeader(Stream s, long offset, out long headerEnd)
-		{
-			s.Seek(offset, SeekOrigin.Begin);
-			var numFiles = s.ReadUInt16();
-			/*uint dataSize = */s.ReadUInt32();
-
-			var items = new List<PackageEntry>();
-			for (var i = 0; i < numFiles; i++)
-				items.Add(new PackageEntry(s));
-
-			headerEnd = offset + 6 + numFiles * PackageEntry.Size;
-			return items;
-		}
-
-		static MemoryStream DecryptHeader(Stream s, long offset, out long headerEnd)
-		{
-			s.Seek(offset, SeekOrigin.Begin);
-
-			// Decrypt blowfish key
-			var keyblock = s.ReadBytes(80);
-			var blowfishKey = new BlowfishKeyProvider().DecryptKey(keyblock);
-			var fish = new Blowfish(blowfishKey);
-
-			// Decrypt first block to work out the header length
-			var ms = Decrypt(ReadBlocks(s, offset + 80, 1), fish);
-			var numFiles = ms.ReadUInt16();
-
-			// Decrypt the full header - round bytes up to a full block
-			var blockCount = (13 + numFiles * PackageEntry.Size) / 8;
-			headerEnd = offset + 80 + blockCount * 8;
-
-			return Decrypt(ReadBlocks(s, offset + 80, blockCount), fish);
-		}
-
-		static MemoryStream Decrypt(uint[] h, Blowfish fish)
-		{
-			var decrypted = fish.Decrypt(h);
-
-			var ms = new MemoryStream();
-			var writer = new BinaryWriter(ms);
-			foreach (var t in decrypted)
-				writer.Write(t);
-			writer.Flush();
-
-			ms.Seek(0, SeekOrigin.Begin);
-			return ms;
-		}
-
-		static uint[] ReadBlocks(Stream s, long offset, int count)
-		{
-			if (offset < 0)
-				throw new ArgumentOutOfRangeException("offset", "Non-negative number required.");
-
-			if (count < 0)
-				throw new ArgumentOutOfRangeException("count", "Non-negative number required.");
-
-			if (offset + (count * 2) > s.Length)
-				throw new ArgumentException("Bytes to read {0} and offset {1} greater than stream length {2}.".F(count * 2, offset, s.Length));
-
-			s.Seek(offset, SeekOrigin.Begin);
-
-			// A block is a single encryption unit (represented as two 32-bit integers)
-			var ret = new uint[2 * count];
-			for (var i = 0; i < ret.Length; i++)
-				ret[i] = s.ReadUInt32();
-
-			return ret;
-		}
-
-		public Stream GetContent(PackageEntry entry)
-		{
-			Stream parentStream;
-			var baseOffset = dataStart + entry.Offset;
-			var nestedOffset = baseOffset + SegmentStream.GetOverallNestedOffset(s, out parentStream);
-
-			// Special case FileStream - instead of creating an in-memory copy,
-			// just reference the portion of the on-disk file that we need to save memory.
-			// We use GetType instead of 'is' here since we can't handle any derived classes of FileStream.
-			if (parentStream.GetType() == typeof(FileStream))
-			{
-				var path = ((FileStream)parentStream).Name;
-				return new SegmentStream(File.OpenRead(path), nestedOffset, entry.Length);
-			}
-
-			// For all other streams, create a copy in memory.
-			// This uses more memory but is the only way in general to ensure the returned streams won't clash.
-			s.Seek(baseOffset, SeekOrigin.Begin);
-			return new MemoryStream(s.ReadBytes((int)entry.Length));
-		}
-
-		public Stream GetStream(string filename)
-		{
-			PackageEntry e;
-			if (!index.TryGetValue(filename, out e))
-				return null;
-
-			return GetContent(e);
-		}
-
-		public IReadOnlyDictionary<string, PackageEntry> Index
-		{
-			get
-			{
-				var absoluteIndex = index.ToDictionary(e => e.Key, e => new PackageEntry(e.Value.Hash, (uint)(e.Value.Offset + dataStart), e.Value.Length));
-				return new ReadOnlyDictionary<string, PackageEntry>(absoluteIndex);
-			}
-		}
-
-		public bool Contains(string filename)
-		{
-			return index.ContainsKey(filename);
-		}
-
-		public void Dispose()
-		{
-			s.Dispose();
-		}
-	}
-}

OpenRA.Game/FileSystem/Pak.cs

@@ -1,84 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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 System.IO;
-
-namespace OpenRA.FileSystem
-{
-	struct Entry
-	{
-		public uint Offset;
-		public uint Length;
-		public string Filename;
-	}
-
-	public sealed class PakFile : IReadOnlyPackage
-	{
-		public string Name { get; private set; }
-		public IEnumerable<string> Contents { get { return index.Keys; } }
-
-		readonly Dictionary<string, Entry> index;
-		readonly Stream stream;
-
-		public PakFile(FileSystem context, string filename)
-		{
-			Name = filename;
-			index = new Dictionary<string, Entry>();
-
-			stream = context.Open(filename);
-			try
-			{
-				index = new Dictionary<string, Entry>();
-				var offset = stream.ReadUInt32();
-				while (offset != 0)
-				{
-					var file = stream.ReadASCIIZ();
-					var next = stream.ReadUInt32();
-					var length = (next == 0 ? (uint)stream.Length : next) - offset;
-
-					// Ignore duplicate files
-					if (index.ContainsKey(file))
-						continue;
-
-					index.Add(file, new Entry { Offset = offset, Length = length, Filename = file });
-					offset = next;
-				}
-			}
-			catch
-			{
-				Dispose();
-				throw;
-			}
-		}
-
-		public Stream GetStream(string filename)
-		{
-			Entry entry;
-			if (!index.TryGetValue(filename, out entry))
-				return null;
-
-			stream.Seek(entry.Offset, SeekOrigin.Begin);
-			var data = stream.ReadBytes((int)entry.Length);
-			return new MemoryStream(data);
-		}
-
-		public bool Contains(string filename)
-		{
-			return index.ContainsKey(filename);
-		}
-
-		public void Dispose()
-		{
-			stream.Dispose();
-		}
-	}
-}

OpenRA.Game/FileSystem/ZipFile.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -9,152 +9,228 @@
  */
 #endregion
 
-using System.Collections;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using ICSharpCode.SharpZipLib.Zip;
-using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;
 
 namespace OpenRA.FileSystem
 {
-	public sealed class ZipFile : IReadWritePackage
+	public class ZipFileLoader : IPackageLoader
 	{
-		public IReadWritePackage Parent { get; private set; }
-		public string Name { get; private set; }
-		readonly Stream pkgStream;
-		readonly SZipFile pkg;
+		static readonly string[] Extensions = { ".zip", ".oramap" };
 
-		static ZipFile()
+		class ReadOnlyZipFile : IReadOnlyPackage
 		{
-			ZipConstants.DefaultCodePage = Encoding.UTF8.CodePage;
-		}
+			public string Name { get; protected set; }
+			protected ZipFile pkg;
 
-		public ZipFile(Stream stream, string name, IReadOnlyPackage parent = null)
-		{
-			// SharpZipLib breaks when asked to update archives loaded from outside streams or files
-			// We can work around this by creating a clean in-memory-only file, cutting all outside references
-			pkgStream = new MemoryStream();
-			stream.CopyTo(pkgStream);
-			pkgStream.Position = 0;
+			// Dummy constructor for use with ReadWriteZipFile
+			protected ReadOnlyZipFile() { }
 
-			Name = name;
-			Parent = parent as IReadWritePackage;
-			pkg = new SZipFile(pkgStream);
-		}
+			public ReadOnlyZipFile(Stream s, string filename)
+			{
+				Name = filename;
+				pkg = new ZipFile(s);
+			}
 
-		public ZipFile(IReadOnlyFileSystem context, string filename)
-		{
-			string name;
-			IReadOnlyPackage p;
-			if (!context.TryGetPackageContaining(filename, out p, out name))
-				throw new FileNotFoundException("Unable to find parent package for " + filename);
+			public Stream GetStream(string filename)
+			{
+				var entry = pkg.GetEntry(filename);
+				if (entry == null)
+					return null;
 
-			Name = name;
-			Parent = p as IReadWritePackage;
+				using (var z = pkg.GetInputStream(entry))
+				{
+					var ms = new MemoryStream((int)entry.Size);
+					z.CopyTo(ms);
+					ms.Seek(0, SeekOrigin.Begin);
+					return ms;
+				}
+			}
 
-			// SharpZipLib breaks when asked to update archives loaded from outside streams or files
-			// We can work around this by creating a clean in-memory-only file, cutting all outside references
-			pkgStream = new MemoryStream();
-			using (var sourceStream = p.GetStream(name))
-				sourceStream.CopyTo(pkgStream);
-			pkgStream.Position = 0;
+			public IEnumerable<string> Contents
+			{
+				get
+				{
+					foreach (ZipEntry entry in pkg)
+						yield return entry.Name;
+				}
+			}
 
-			pkg = new SZipFile(pkgStream);
-		}
+			public bool Contains(string filename)
+			{
+				return pkg.GetEntry(filename) != null;
+			}
 
-		ZipFile(string filename, IReadWritePackage parent)
-		{
-			pkgStream = new MemoryStream();
+			public void Dispose()
+			{
+				pkg?.Close();
+			}
 
-			Name = filename;
-			Parent = parent;
-			pkg = SZipFile.Create(pkgStream);
-		}
+			public IReadOnlyPackage OpenPackage(string filename, FileSystem context)
+			{
+				// Directories are stored with a trailing "/" in the index
+				var entry = pkg.GetEntry(filename) ?? pkg.GetEntry(filename + "/");
+				if (entry == null)
+					return null;
 
-		public static ZipFile Create(string filename, IReadWritePackage parent)
-		{
-			return new ZipFile(filename, parent);
-		}
+				if (entry.IsDirectory)
+					return new ZipFolder(this, filename);
 
-		public Stream GetStream(string filename)
-		{
-			var entry = pkg.GetEntry(filename);
-			if (entry == null)
+				// Other package types can be loaded normally
+				var s = GetStream(filename);
+				if (s == null)
+					return null;
+
+				if (context.TryParsePackage(s, filename, out var package))
+					return package;
+
+				s.Dispose();
 				return null;
-
-			using (var z = pkg.GetInputStream(entry))
-			{
-				var ms = new MemoryStream();
-				z.CopyTo(ms);
-				ms.Seek(0, SeekOrigin.Begin);
-				return ms;
 			}
 		}
 
-		public IEnumerable<string> Contents
+		sealed class ReadWriteZipFile : ReadOnlyZipFile, IReadWritePackage
 		{
-			get
+			readonly MemoryStream pkgStream = new MemoryStream();
+
+			public ReadWriteZipFile(string filename, bool create = false)
 			{
-				foreach (ZipEntry entry in pkg)
-					yield return entry.Name;
+				// SharpZipLib breaks when asked to update archives loaded from outside streams or files
+				// We can work around this by creating a clean in-memory-only file, cutting all outside references
+				if (!create)
+				{
+					using (var copy = new MemoryStream(File.ReadAllBytes(filename)))
+					{
+						pkgStream.Capacity = (int)copy.Length;
+						copy.CopyTo(pkgStream);
+					}
+				}
+
+				pkgStream.Position = 0;
+				pkg = new ZipFile(pkgStream);
+				Name = filename;
+			}
+
+			void Commit()
+			{
+				var pos = pkgStream.Position;
+				pkgStream.Position = 0;
+				File.WriteAllBytes(Name, pkgStream.ReadBytes((int)pkgStream.Length));
+				pkgStream.Position = pos;
+			}
+
+			public void Update(string filename, byte[] contents)
+			{
+				pkg.BeginUpdate();
+				pkg.Add(new StaticStreamDataSource(new MemoryStream(contents)), filename);
+				pkg.CommitUpdate();
+				Commit();
+			}
+
+			public void Delete(string filename)
+			{
+				pkg.BeginUpdate();
+				pkg.Delete(filename);
+				pkg.CommitUpdate();
+				Commit();
 			}
 		}
 
-		public bool Contains(string filename)
+		sealed class ZipFolder : IReadOnlyPackage
 		{
-			return pkg.GetEntry(filename) != null;
+			public string Name { get { return path; } }
+			public ReadOnlyZipFile Parent { get; private set; }
+			readonly string path;
+
+			public ZipFolder(ReadOnlyZipFile parent, string path)
+			{
+				if (path.EndsWith("/", StringComparison.Ordinal))
+					path = path.Substring(0, path.Length - 1);
+
+				Parent = parent;
+				this.path = path;
+			}
+
+			public Stream GetStream(string filename)
+			{
+				// Zip files use '/' as a path separator
+				return Parent.GetStream(path + '/' + filename);
+			}
+
+			public IEnumerable<string> Contents
+			{
+				get
+				{
+					foreach (var entry in Parent.Contents)
+					{
+						if (entry.StartsWith(path, StringComparison.Ordinal) && entry != path)
+						{
+							var filename = entry.Substring(path.Length + 1);
+							var dirLevels = filename.Split('/').Count(c => !string.IsNullOrEmpty(c));
+							if (dirLevels == 1)
+								yield return filename;
+						}
+					}
+				}
+			}
+
+			public bool Contains(string filename)
+			{
+				return Parent.Contains(path + '/' + filename);
+			}
+
+			public IReadOnlyPackage OpenPackage(string filename, FileSystem context)
+			{
+				return Parent.OpenPackage(path + '/' + filename, context);
+			}
+
+			public void Dispose() { /* nothing to do */ }
 		}
 
-		void Commit()
+		class StaticStreamDataSource : IStaticDataSource
 		{
-			if (Parent == null)
-				throw new InvalidDataException("Cannot update ZipFile without writable parent");
+			readonly Stream s;
+			public StaticStreamDataSource(Stream s)
+			{
+				this.s = s;
+			}
 
-			var pos = pkgStream.Position;
-			pkgStream.Position = 0;
-			Parent.Update(Name, pkgStream.ReadBytes((int)pkgStream.Length));
-			pkgStream.Position = pos;
+			public Stream GetSource()
+			{
+				return s;
+			}
 		}
 
-		public void Update(string filename, byte[] contents)
+		public bool TryParsePackage(Stream s, string filename, FileSystem context, out IReadOnlyPackage package)
 		{
-			pkg.BeginUpdate();
-			pkg.Add(new StaticStreamDataSource(new MemoryStream(contents)), filename);
-			pkg.CommitUpdate();
-			Commit();
+			if (!Extensions.Any(e => filename.EndsWith(e, StringComparison.InvariantCultureIgnoreCase)))
+			{
+				package = null;
+				return false;
+			}
+
+			package = new ReadOnlyZipFile(s, filename);
+			return true;
 		}
 
-		public void Delete(string filename)
+		public static bool TryParseReadWritePackage(string filename, out IReadWritePackage package)
 		{
-			pkg.BeginUpdate();
-			pkg.Delete(filename);
-			pkg.CommitUpdate();
-			Commit();
+			if (!Extensions.Any(e => filename.EndsWith(e, StringComparison.InvariantCultureIgnoreCase)))
+			{
+				package = null;
+				return false;
+			}
+
+			package = new ReadWriteZipFile(filename);
+			return true;
 		}
 
-		public void Dispose()
+		public static IReadWritePackage Create(string filename)
 		{
-			if (pkg != null)
-				pkg.Close();
-
-			if (pkgStream != null)
-				pkgStream.Dispose();
-		}
-	}
-
-	class StaticStreamDataSource : IStaticDataSource
-	{
-		readonly Stream s;
-		public StaticStreamDataSource(Stream s)
-		{
-			this.s = s;
-		}
-
-		public Stream GetSource()
-		{
-			return s;
+			return new ReadWriteZipFile(filename, true);
 		}
 	}
 }

OpenRA.Game/FileSystem/ZipFolder.cs

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

OpenRA.Game/Fonts.cs

@@ -0,0 +1,37 @@
+#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.Collections.Generic;
+
+namespace OpenRA
+{
+	public class FontData
+	{
+		public readonly string Font;
+		public readonly int Size;
+		public readonly int Ascender;
+	}
+
+	public class Fonts : IGlobalModData
+	{
+		[FieldLoader.LoadUsing("LoadFonts")]
+		public readonly Dictionary<string, FontData> FontList;
+
+		static object LoadFonts(MiniYaml y)
+		{
+			var ret = new Dictionary<string, FontData>();
+			foreach (var node in y.Nodes)
+				ret.Add(node.Key, FieldLoader.Load<FontData>(node.Value));
+
+			return ret;
+		}
+	}
+}

OpenRA.Game/Game.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -12,8 +12,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -21,10 +19,10 @@ using System.Net;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-using OpenRA.Chat;
 using OpenRA.Graphics;
 using OpenRA.Network;
 using OpenRA.Primitives;
+using OpenRA.Server;
 using OpenRA.Support;
 using OpenRA.Widgets;
 
@@ -41,8 +39,10 @@ namespace OpenRA
 
 		public static ModData ModData;
 		public static Settings Settings;
-		public static ICursor Cursor;
+		public static CursorManager Cursor;
+		public static bool HideCursor;
 		static WorldRenderer worldRenderer;
+		static string modLaunchWrapper;
 
 		internal static OrderManager OrderManager;
 		static Server.Server server;
@@ -51,21 +51,23 @@ namespace OpenRA
 
 		public static Renderer Renderer;
 		public static Sound Sound;
-		public static bool HasInputFocus = false;
 
-		public static bool BenchmarkMode = false;
-
-		public static GlobalChat GlobalChat;
+		public static string EngineVersion { get; private set; }
+		public static LocalPlayerProfile LocalPlayerProfile;
 
 		static Task discoverNat;
+		static bool takeScreenshot = false;
+		static Benchmark benchmark = null;
 
-		public static OrderManager JoinServer(string host, int port, string password, bool recordReplay = true)
+		public static event Action OnShellmapLoaded = () => { };
+
+		public static OrderManager JoinServer(ConnectionTarget endpoint, string password, bool recordReplay = true)
 		{
-			var connection = new NetworkConnection(host, port);
+			var connection = new NetworkConnection(endpoint);
 			if (recordReplay)
 				connection.StartRecording(() => { return TimestampedFilename(); });
 
-			var om = new OrderManager(host, port, password, connection);
+			var om = new OrderManager(endpoint, password, connection);
 			JoinInner(om);
 			return om;
 		}
@@ -73,12 +75,12 @@ namespace OpenRA
 		static string TimestampedFilename(bool includemilliseconds = false)
 		{
 			var format = includemilliseconds ? "yyyy-MM-ddTHHmmssfffZ" : "yyyy-MM-ddTHHmmssZ";
-			return "OpenRA-" + DateTime.UtcNow.ToString(format, CultureInfo.InvariantCulture);
+			return ModData.Manifest.Id + "-" + DateTime.UtcNow.ToString(format, CultureInfo.InvariantCulture);
 		}
 
 		static void JoinInner(OrderManager om)
 		{
-			if (OrderManager != null) OrderManager.Dispose();
+			OrderManager?.Dispose();
 			OrderManager = om;
 			lastConnectionState = ConnectionState.PreConnecting;
 			ConnectionStateChanged(OrderManager);
@@ -86,12 +88,12 @@ namespace OpenRA
 
 		public static void JoinReplay(string replayFile)
 		{
-			JoinInner(new OrderManager("<no server>", -1, "", new ReplayConnection(replayFile)));
+			JoinInner(new OrderManager(new ConnectionTarget(), "", new ReplayConnection(replayFile)));
 		}
 
 		static void JoinLocal()
 		{
-			JoinInner(new OrderManager("<no server>", -1, "", new EchoConnection()));
+			JoinInner(new OrderManager(new ConnectionTarget(), "", new EchoConnection()));
 		}
 
 		// More accurate replacement for Environment.TickCount
@@ -102,14 +104,14 @@ namespace OpenRA
 		public static int NetFrameNumber { get { return OrderManager.NetFrameNumber; } }
 		public static int LocalTick { get { return OrderManager.LocalFrameNumber; } }
 
-		public static event Action<string, int> OnRemoteDirectConnect = (a, b) => { };
+		public static event Action<ConnectionTarget> OnRemoteDirectConnect = _ => { };
 		public static event Action<OrderManager> ConnectionStateChanged = _ => { };
 		static ConnectionState lastConnectionState = ConnectionState.PreConnecting;
 		public static int LocalClientId { get { return OrderManager.Connection.LocalClientId; } }
 
-		public static void RemoteDirectConnect(string host, int port)
+		public static void RemoteDirectConnect(ConnectionTarget endpoint)
 		{
-			OnRemoteDirectConnect(host, port);
+			OnRemoteDirectConnect(endpoint);
 		}
 
 		// Hacky workaround for orderManager visibility
@@ -152,8 +154,7 @@ namespace OpenRA
 		internal static void StartGame(string mapUID, WorldType type)
 		{
 			// Dispose of the old world before creating a new one.
-			if (worldRenderer != null)
-				worldRenderer.Dispose();
+			worldRenderer?.Dispose();
 
 			Cursor.SetCursor(null);
 			BeforeGameStart();
@@ -163,13 +164,19 @@ namespace OpenRA
 			using (new PerfTimer("PrepareMap"))
 				map = ModData.PrepareMap(mapUID);
 			using (new PerfTimer("NewWorld"))
-				OrderManager.World = new World(map, OrderManager, type);
+				OrderManager.World = new World(ModData, map, OrderManager, type);
+
+			OrderManager.World.GameOver += FinishBenchmark;
 
 			worldRenderer = new WorldRenderer(ModData, OrderManager.World);
 
+			GC.Collect();
+
 			using (new PerfTimer("LoadComplete"))
 				OrderManager.World.LoadComplete(worldRenderer);
 
+			GC.Collect();
+
 			if (OrderManager.GameStarted)
 				return;
 
@@ -190,7 +197,12 @@ namespace OpenRA
 			var replay = OrderManager.Connection as ReplayConnection;
 			var replayName = replay != null ? replay.Filename : null;
 			var lobbyInfo = OrderManager.LobbyInfo;
-			var orders = new[] {
+
+			// Reseed the RNG so this isn't an exact repeat of the last game
+			lobbyInfo.GlobalSettings.RandomSeed = CosmeticRandom.Next();
+
+			var orders = new[]
+			{
 					Order.Command("sync_lobby {0}".F(lobbyInfo.Serialize())),
 					Order.Command("startgame")
 			};
@@ -220,7 +232,7 @@ namespace OpenRA
 
 			LobbyInfoChanged += lobbyReady;
 
-			om = JoinServer(IPAddress.Loopback.ToString(), CreateLocalServer(mapUID), "");
+			om = JoinServer(CreateLocalServer(mapUID), "");
 		}
 
 		public static bool IsHost
@@ -239,33 +251,56 @@ namespace OpenRA
 
 		public static void InitializeSettings(Arguments args)
 		{
-			Settings = new Settings(Platform.ResolvePath(Path.Combine("^", "settings.yaml")), args);
+			Settings = new Settings(Platform.ResolvePath(Path.Combine(Platform.SupportDirPrefix, "settings.yaml")), args);
 		}
 
-		internal static void Initialize(Arguments args)
+		public static RunStatus InitializeAndRun(string[] args)
 		{
+			Initialize(new Arguments(args));
+			GC.Collect();
+			return Run();
+		}
+
+		static void Initialize(Arguments args)
+		{
+			var supportDirArg = args.GetValue("Engine.SupportDir", null);
+			if (!string.IsNullOrEmpty(supportDirArg))
+				Platform.OverrideSupportDir(supportDirArg);
+
 			Console.WriteLine("Platform is {0}", Platform.CurrentPlatform);
 
+			// Load the engine version as early as possible so it can be written to exception logs
+			try
+			{
+				EngineVersion = File.ReadAllText(Platform.ResolvePath(Path.Combine(".", "VERSION"))).Trim();
+			}
+			catch { }
+
+			if (string.IsNullOrEmpty(EngineVersion))
+				EngineVersion = "Unknown";
+
+			Console.WriteLine("Engine version is {0}", EngineVersion);
+
 			// Special case handling of Game.Mod argument: if it matches a real filesystem path
 			// then we use this to override the mod search path, and replace it with the mod id
-			var modArgument = args.GetValue("Game.Mod", null);
+			var modID = args.GetValue("Game.Mod", null);
 			var explicitModPaths = new string[0];
-			if (modArgument != null && (File.Exists(modArgument) || Directory.Exists(modArgument)))
+			if (modID != null && (File.Exists(modID) || Directory.Exists(modID)))
 			{
-				explicitModPaths = new[] { modArgument };
-				args.ReplaceValue("Game.Mod", Path.GetFileNameWithoutExtension(modArgument));
+				explicitModPaths = new[] { modID };
+				modID = Path.GetFileNameWithoutExtension(modID);
 			}
 
 			InitializeSettings(args);
 
 			Log.AddChannel("perf", "perf.log");
 			Log.AddChannel("debug", "debug.log");
-			Log.AddChannel("server", "server.log");
+			Log.AddChannel("server", "server.log", true);
 			Log.AddChannel("sound", "sound.log");
 			Log.AddChannel("graphics", "graphics.log");
 			Log.AddChannel("geoip", "geoip.log");
-			Log.AddChannel("irc", "irc.log");
 			Log.AddChannel("nat", "nat.log");
+			Log.AddChannel("client", "client.log");
 
 			var platforms = new[] { Settings.Game.Platform, "Default", null };
 			foreach (var p in platforms)
@@ -294,55 +329,49 @@ namespace OpenRA
 					Log.Write("graphics", "{0}", e);
 					Console.WriteLine("Renderer initialization failed. Check graphics.log for details.");
 
-					if (Renderer != null)
-						Renderer.Dispose();
+					Renderer?.Dispose();
 
-					if (Sound != null)
-						Sound.Dispose();
+					Sound?.Dispose();
 				}
 			}
 
-			GeoIP.Initialize();
-
-			if (!Settings.Server.DiscoverNatDevices)
-				Settings.Server.AllowPortForward = false;
-			else
-			{
+			if (Settings.Server.DiscoverNatDevices)
 				discoverNat = UPnP.DiscoverNatDevices(Settings.Server.NatDiscoveryTimeout);
-				Settings.Server.AllowPortForward = true;
-			}
-
-			GlobalChat = new GlobalChat();
 
 			var modSearchArg = args.GetValue("Engine.ModSearchPaths", null);
 			var modSearchPaths = modSearchArg != null ?
 				FieldLoader.GetValue<string[]>("Engine.ModsPath", modSearchArg) :
-				new[] { Path.Combine(".", "mods"), Path.Combine("^", "mods") };
+				new[] { Path.Combine(".", "mods") };
 
 			Mods = new InstalledMods(modSearchPaths, explicitModPaths);
 			Console.WriteLine("Internal mods:");
 			foreach (var mod in Mods)
 				Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Metadata.Title, mod.Value.Metadata.Version);
 
-			var launchPath = args.GetValue("Engine.LaunchPath", Assembly.GetEntryAssembly().Location);
-			ExternalMods = new ExternalMods(launchPath);
+			modLaunchWrapper = args.GetValue("Engine.LaunchWrapper", null);
+
+			ExternalMods = new ExternalMods();
+
+			if (modID != null && Mods.TryGetValue(modID, out _))
+			{
+				var launchPath = args.GetValue("Engine.LaunchPath", Assembly.GetEntryAssembly().Location);
+
+				// Sanitize input from platform-specific launchers
+				// Process.Start requires paths to not be quoted, even if they contain spaces
+				if (launchPath.First() == '"' && launchPath.Last() == '"')
+					launchPath = launchPath.Substring(1, launchPath.Length - 2);
+
+				ExternalMods.Register(Mods[modID], launchPath, ModRegistration.User);
+
+				if (ExternalMods.TryGetValue(ExternalMod.MakeKey(Mods[modID]), out var activeMod))
+					ExternalMods.ClearInvalidRegistrations(activeMod, ModRegistration.User);
+			}
+
 			Console.WriteLine("External mods:");
 			foreach (var mod in ExternalMods)
 				Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version);
 
-			InitializeMod(Settings.Game.Mod, args);
-		}
-
-		public static bool IsModInstalled(string modId)
-		{
-			return Mods.ContainsKey(modId) && Mods[modId].RequiresMods.All(IsModInstalled);
-		}
-
-		public static bool IsModInstalled(KeyValuePair<string, string> mod)
-		{
-			return Mods.ContainsKey(mod.Key)
-				&& Mods[mod.Key].Metadata.Version == mod.Value
-				&& IsModInstalled(mod.Key);
+			InitializeMod(modID, args);
 		}
 
 		public static void InitializeMod(string mod, Arguments args)
@@ -351,18 +380,15 @@ namespace OpenRA
 			LobbyInfoChanged = () => { };
 			ConnectionStateChanged = om => { };
 			BeforeGameStart = () => { };
-			OnRemoteDirectConnect = (a, b) => { };
+			OnRemoteDirectConnect = endpoint => { };
 			delayedActions = new ActionQueue();
 
 			Ui.ResetAll();
 
-			if (worldRenderer != null)
-				worldRenderer.Dispose();
+			worldRenderer?.Dispose();
 			worldRenderer = null;
-			if (server != null)
-				server.Shutdown();
-			if (OrderManager != null)
-				OrderManager.Dispose();
+			server?.Shutdown();
+			OrderManager?.Dispose();
 
 			if (ModData != null)
 			{
@@ -372,17 +398,19 @@ namespace OpenRA
 
 			ModData = null;
 
-			// Fall back to default if the mod doesn't exist or has missing prerequisites.
-			if (mod == null || !IsModInstalled(mod))
-				mod = args.GetValue("Engine.DefaultMod", "modchooser");
+			if (mod == null)
+				throw new InvalidOperationException("Game.Mod argument missing.");
+
+			if (!Mods.ContainsKey(mod))
+				throw new InvalidOperationException("Unknown or invalid mod '{0}'.".F(mod));
 
 			Console.WriteLine("Loading mod: {0}", mod);
-			Settings.Game.Mod = mod;
 
 			Sound.StopVideo();
 
 			ModData = new ModData(Mods[mod], Mods, true);
-			ExternalMods.Register(ModData.Manifest);
+
+			LocalPlayerProfile = new LocalPlayerProfile(Platform.ResolvePath(Path.Combine("^", Settings.Game.AuthProfile)), ModData.Manifest.Get<PlayerDatabase>());
 
 			if (!ModData.LoadScreen.BeforeLoad())
 				return;
@@ -396,48 +424,32 @@ namespace OpenRA
 			var grid = ModData.Manifest.Contains<MapGrid>() ? ModData.Manifest.Get<MapGrid>() : null;
 			Renderer.InitializeDepthBuffer(grid);
 
-			if (Cursor != null)
-				Cursor.Dispose();
+			Cursor?.Dispose();
 
-			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);
+			Cursor = new CursorManager(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;
+			PerfHistory.Items["terrain_lighting"].HasNormalTick = false;
 
 			JoinLocal();
 
 			try
 			{
-				if (discoverNat != null)
-					discoverNat.Wait();
+				discoverNat?.Wait();
 			}
 			catch (Exception e)
 			{
 				Console.WriteLine("NAT discovery failed: {0}", e.Message);
 				Log.Write("nat", e.ToString());
-				Settings.Server.AllowPortForward = false;
 			}
 
+			ChromeMetrics.TryGet("ChatMessageColor", out chatMessageColor);
+			ChromeMetrics.TryGet("SystemMessageColor", out systemMessageColor);
+
 			ModData.LoadScreen.StartGame(args);
 		}
 
@@ -451,7 +463,10 @@ namespace OpenRA
 			var shellmap = ChooseShellmap();
 
 			using (new PerfTimer("StartGame"))
+			{
 				StartGame(shellmap, WorldType.Shellmap);
+				OnShellmapLoaded();
+			}
 		}
 
 		static string ChooseShellmap()
@@ -470,8 +485,15 @@ namespace OpenRA
 		{
 			try
 			{
+				var path = mod.LaunchPath;
 				var args = launchArguments != null ? mod.LaunchArgs.Append(launchArguments) : mod.LaunchArgs;
-				var p = Process.Start(mod.LaunchPath, args.Select(a => "\"" + a + "\"").JoinWith(" "));
+				if (modLaunchWrapper != null)
+				{
+					path = modLaunchWrapper;
+					args = new[] { mod.LaunchPath }.Concat(args);
+				}
+
+				var p = Process.Start(path, args.Select(a => "\"" + a + "\"").JoinWith(" "));
 				if (p == null || p.HasExited)
 					onFailed();
 				else
@@ -494,36 +516,26 @@ namespace OpenRA
 		// Note: These delayed actions should only be used by widgets or disposing objects
 		// - things that depend on a particular world should be queuing them on the world actor.
 		static volatile ActionQueue delayedActions = new ActionQueue();
+		static Color systemMessageColor = Color.White;
+		static Color chatMessageColor = Color.White;
 		public static void RunAfterTick(Action a) { delayedActions.Add(a, RunTime); }
 		public static void RunAfterDelay(int delayMilliseconds, Action a) { delayedActions.Add(a, RunTime + delayMilliseconds); }
 
 		static void TakeScreenshotInner()
 		{
-			Log.Write("debug", "Taking screenshot");
-
-			Bitmap bitmap;
-			using (new PerfTimer("Renderer.TakeScreenshot"))
-				bitmap = Renderer.Device.TakeScreenshot();
-
-			ThreadPool.QueueUserWorkItem(_ =>
+			using (new PerfTimer("Renderer.SaveScreenshot"))
 			{
 				var mod = ModData.Manifest.Metadata;
-				var directory = Platform.ResolvePath("^", "Screenshots", ModData.Manifest.Id, mod.Version);
+				var directory = Platform.ResolvePath(Platform.SupportDirPrefix, "Screenshots", ModData.Manifest.Id, mod.Version);
 				Directory.CreateDirectory(directory);
 
 				var filename = TimestampedFilename(true);
-				var format = Settings.Graphics.ScreenshotFormat;
-				var extension = ImageCodecInfo.GetImageEncoders().FirstOrDefault(x => x.FormatID == format.Guid)
-					.FilenameExtension.Split(';').First().ToLowerInvariant().Substring(1);
-				var destination = Path.Combine(directory, string.Concat(filename, extension));
+				var path = Path.Combine(directory, string.Concat(filename, ".png"));
+				Log.Write("debug", "Taking screenshot " + path);
 
-				using (new PerfTimer("Save Screenshot ({0})".F(format)))
-					bitmap.Save(destination, format);
-
-				bitmap.Dispose();
-
-				RunAfterTick(() => Debug("Saved screenshot " + filename));
-			});
+				Renderer.SaveScreenshot(path);
+				Debug("Saved screenshot " + filename);
+			}
 		}
 
 		static void InnerLogicTick(OrderManager orderManager)
@@ -539,13 +551,11 @@ namespace OpenRA
 				var integralTickTimestep = (uiTickDelta / Timestep) * Timestep;
 				Ui.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : Timestep;
 
-				Viewport.TicksSinceLastMove += uiTickDelta / Timestep;
-
-				Sync.CheckSyncUnchanged(world, Ui.Tick);
+				Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, Ui.Tick);
 				Cursor.Tick();
 			}
 
-			var worldTimestep = world == null ? Timestep : world.Timestep;
+			var worldTimestep = world == null ? Timestep : world.IsLoadingGameSave ? 1 : world.Timestep;
 			var worldTickDelta = tick - orderManager.LastTickTime;
 			if (worldTimestep != 0 && worldTickDelta >= worldTimestep)
 			{
@@ -559,7 +569,7 @@ namespace OpenRA
 					orderManager.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : worldTimestep;
 
 					Sound.Tick();
-					Sync.CheckSyncUnchanged(world, orderManager.TickImmediate);
+					Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, orderManager.TickImmediate);
 
 					if (world == null)
 						return;
@@ -572,16 +582,12 @@ namespace OpenRA
 
 						Log.Write("debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local");
 
-						if (BenchmarkMode)
-							Log.Write("cpu", "{0};{1}".F(LocalTick, PerfHistory.Items["tick_time"].LastValue));
-
 						if (isNetTick)
 							orderManager.Tick();
 
-						Sync.CheckSyncUnchanged(world, () =>
+						Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, () =>
 						{
 							world.OrderGenerator.Tick(world);
-							world.Selection.Tick(world);
 						});
 
 						world.Tick();
@@ -593,14 +599,16 @@ namespace OpenRA
 
 					// Wait until we have done our first world Tick before TickRendering
 					if (orderManager.LocalFrameNumber > 0)
-						Sync.CheckSyncUnchanged(world, () => world.TickRender(worldRenderer));
+						Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, () => world.TickRender(worldRenderer));
 				}
+
+				benchmark?.Tick(LocalTick);
 			}
 		}
 
 		static void LogicTick()
 		{
-			delayedActions.PerformActions(RunTime);
+			PerformDelayedActions();
 
 			if (OrderManager.Connection.ConnectionState != lastConnectionState)
 			{
@@ -613,7 +621,15 @@ namespace OpenRA
 				InnerLogicTick(worldRenderer.World.OrderManager);
 		}
 
-		public static bool TakeScreenshot = false;
+		public static void PerformDelayedActions()
+		{
+			delayedActions.PerformActions(RunTime);
+		}
+
+		public static void TakeScreenshot()
+		{
+			takeScreenshot = true;
+		}
 
 		static void RenderTick()
 		{
@@ -621,48 +637,70 @@ namespace OpenRA
 			{
 				++RenderFrame;
 
-				// worldRenderer is null during the initial install/download screen
-				if (worldRenderer != null)
+				// Prepare renderables (i.e. render voxels) before calling BeginFrame
+				using (new PerfSample("render_prepare"))
 				{
-					Renderer.BeginFrame(worldRenderer.Viewport.TopLeft, worldRenderer.Viewport.Zoom);
-					Sound.SetListenerPosition(worldRenderer.Viewport.CenterPosition);
-					worldRenderer.Draw();
+					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)
+				{
+					Renderer.BeginWorld(worldRenderer.Viewport.Rectangle);
+					Sound.SetListenerPosition(worldRenderer.Viewport.CenterPosition);
+					using (new PerfSample("render_world"))
+						worldRenderer.Draw();
 				}
-				else
-					Renderer.BeginFrame(int2.Zero, 1f);
 
 				using (new PerfSample("render_widgets"))
 				{
-					Renderer.WorldVoxelRenderer.BeginFrame();
-					Ui.PrepareRenderables();
-					Renderer.WorldVoxelRenderer.EndFrame();
+					Renderer.BeginUI();
+
+					if (worldRenderer != null && !worldRenderer.World.IsLoadingGameSave)
+						worldRenderer.DrawAnnotations();
 
 					Ui.Draw();
 
 					if (ModData != null && ModData.CursorProvider != null)
 					{
-						Cursor.SetCursor(Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default");
-						Cursor.Render(Renderer);
+						if (HideCursor)
+							Cursor.SetCursor(null);
+						else
+						{
+							Cursor.SetCursor(Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default");
+							Cursor.Render(Renderer);
+						}
 					}
 				}
 
 				using (new PerfSample("render_flip"))
 					Renderer.EndFrame(new DefaultInputHandler(OrderManager.World));
 
-				if (TakeScreenshot)
+				if (takeScreenshot)
 				{
-					TakeScreenshot = false;
+					takeScreenshot = false;
 					TakeScreenshotInner();
 				}
 			}
 
 			PerfHistory.Items["render"].Tick();
 			PerfHistory.Items["batches"].Tick();
+			PerfHistory.Items["render_world"].Tick();
 			PerfHistory.Items["render_widgets"].Tick();
 			PerfHistory.Items["render_flip"].Tick();
-
-			if (BenchmarkMode)
-				Log.Write("render", "{0};{1}".F(RenderFrame, PerfHistory.Items["render"].LastValue));
+			PerfHistory.Items["terrain_lighting"].Tick();
 		}
 
 		static void Loop()
@@ -708,6 +746,7 @@ namespace OpenRA
 			var nextLogic = RunTime;
 			var nextRender = RunTime;
 			var forcedNextRender = RunTime;
+			var renderBeforeNextTick = false;
 
 			while (state == RunStatus.Running)
 			{
@@ -719,6 +758,13 @@ namespace OpenRA
 				var maxFramerate = Settings.Graphics.CapFramerate ? Settings.Graphics.MaxFramerate.Clamp(1, 1000) : 1000;
 				var renderInterval = 1000 / maxFramerate;
 
+				// Tick as fast as possible while restoring game saves, capping rendering at 5 FPS
+				if (OrderManager.World != null && OrderManager.World.IsLoadingGameSave)
+				{
+					logicInterval = 1;
+					renderInterval = 200;
+				}
+
 				var now = RunTime;
 
 				// If the logic has fallen behind too much, skip it and catch up
@@ -729,17 +775,17 @@ namespace OpenRA
 				var nextUpdate = Math.Min(nextLogic, nextRender);
 				if (now >= nextUpdate)
 				{
-					var forceRender = now >= forcedNextRender;
+					var forceRender = renderBeforeNextTick || now >= forcedNextRender;
 
-					if (now >= nextLogic)
+					if (now >= nextLogic && !renderBeforeNextTick)
 					{
 						nextLogic += logicInterval;
 
 						LogicTick();
 
 						// Force at least one render per tick during regular gameplay
-						if (OrderManager.World != null && !OrderManager.World.IsReplay)
-							forceRender = true;
+						if (OrderManager.World != null && !OrderManager.World.IsLoadingGameSave && !OrderManager.World.IsReplay)
+							renderBeforeNextTick = true;
 					}
 
 					var haveSomeTimeUntilNextLogic = now < nextLogic;
@@ -758,6 +804,7 @@ namespace OpenRA
 						forcedNextRender = now + maxRenderInterval;
 
 						RenderTick();
+						renderBeforeNextTick = false;
 					}
 				}
 				else
@@ -765,7 +812,7 @@ namespace OpenRA
 			}
 		}
 
-		internal static RunStatus Run()
+		static RunStatus Run()
 		{
 			if (Settings.Graphics.MaxFramerate < 1)
 			{
@@ -780,16 +827,13 @@ namespace OpenRA
 			finally
 			{
 				// Ensure that the active replay is properly saved
-				if (OrderManager != null)
-					OrderManager.Dispose();
+				OrderManager?.Dispose();
 			}
 
-			if (worldRenderer != null)
-				worldRenderer.Dispose();
+			worldRenderer?.Dispose();
 			ModData.Dispose();
 			ChromeProvider.Deinitialize();
 
-			GlobalChat.Dispose();
 			Sound.Dispose();
 			Renderer.Dispose();
 
@@ -803,20 +847,29 @@ namespace OpenRA
 			state = RunStatus.Success;
 		}
 
-		public static void AddChatLine(Color color, string name, string text)
+		public static void AddSystemLine(string text)
 		{
-			OrderManager.AddChatLine(color, name, text);
+			AddSystemLine("Battlefield Control", text);
+		}
+
+		public static void AddSystemLine(string name, string text)
+		{
+			OrderManager.AddChatLine(name, systemMessageColor, text, systemMessageColor);
+		}
+
+		public static void AddChatLine(string name, Color nameColor, string text)
+		{
+			OrderManager.AddChatLine(name, nameColor, text, chatMessageColor);
 		}
 
 		public static void Debug(string s, params object[] args)
 		{
-			AddChatLine(Color.White, "Debug", string.Format(s, args));
+			AddSystemLine("Debug", string.Format(s, args));
 		}
 
 		public static void Disconnect()
 		{
-			if (OrderManager.World != null)
-				OrderManager.World.TraitDict.PrintReport();
+			OrderManager.World?.TraitDict.PrintReport();
 
 			OrderManager.Dispose();
 			CloseServer();
@@ -825,8 +878,7 @@ namespace OpenRA
 
 		public static void CloseServer()
 		{
-			if (server != null)
-				server.Shutdown();
+			server?.Shutdown();
 		}
 
 		public static T CreateObject<T>(string name)
@@ -834,29 +886,77 @@ namespace OpenRA
 			return ModData.ObjectCreator.CreateObject<T>(name);
 		}
 
-		public static void CreateServer(ServerSettings settings)
+		public static ConnectionTarget CreateServer(ServerSettings settings)
 		{
-			server = new Server.Server(new IPEndPoint(IPAddress.Any, settings.ListenPort), settings, ModData, false);
+			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();
 		}
 
-		public static int CreateLocalServer(string map)
+		public static ConnectionTarget CreateLocalServer(string map)
 		{
 			var settings = new ServerSettings()
 			{
 				Name = "Skirmish Game",
 				Map = map,
-				AdvertiseOnline = false,
-				AllowPortForward = false
+				AdvertiseOnline = false
 			};
 
-			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0), settings, ModData, 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);
 
-			return server.Port;
+			return server.GetEndpointForLocalConnection();
 		}
 
 		public static bool IsCurrentWorld(World world)
 		{
 			return OrderManager != null && OrderManager.World == world && !world.Disposing;
 		}
+
+		public static bool SetClipboardText(string text)
+		{
+			return Renderer.Window.SetClipboardText(text);
+		}
+
+		public static void BenchmarkMode(string prefix)
+		{
+			benchmark = new Benchmark(prefix);
+		}
+
+		public static void LoadMap(string launchMap)
+		{
+			var orders = new List<Order>
+			{
+				Order.Command("option gamespeed {0}".F("default")),
+				Order.Command("state {0}".F(Session.ClientState.Ready))
+			};
+
+			var path = Platform.ResolvePath(launchMap);
+			var map = ModData.MapCache.SingleOrDefault(m => m.Uid == launchMap) ??
+				ModData.MapCache.SingleOrDefault(m => m.Package.Name == path);
+
+			if (map == null)
+				throw new InvalidOperationException("Could not find map '{0}'.".F(launchMap));
+
+			CreateAndStartLocalServer(map.Uid, orders);
+		}
+
+		public static void FinishBenchmark()
+		{
+			if (benchmark != null)
+			{
+				benchmark.Write();
+				Exit();
+			}
+		}
 	}
 }

OpenRA.Game/GameInformation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -12,8 +12,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Graphics;
 using OpenRA.Network;
+using OpenRA.Primitives;
 
 namespace OpenRA
 {
@@ -24,6 +24,7 @@ namespace OpenRA
 
 		public string MapUid;
 		public string MapTitle;
+		public int FinalGameTick;
 
 		/// <summary>Game start timestamp (when the recoding started).</summary>
 		public DateTime StartTimeUtc;
@@ -121,7 +122,8 @@ namespace OpenRA
 				Team = client.Team,
 				SpawnPoint = runtimePlayer.SpawnPoint,
 				IsRandomFaction = runtimePlayer.Faction.InternalName != client.Faction,
-				IsRandomSpawnPoint = runtimePlayer.SpawnPoint != client.SpawnPoint
+				IsRandomSpawnPoint = runtimePlayer.SpawnPoint != client.SpawnPoint,
+				Fingerprint = client.Fingerprint
 			};
 
 			playersByRuntime.Add(runtimePlayer, player);
@@ -131,9 +133,7 @@ namespace OpenRA
 		/// <summary>Gets the player information for the specified runtime player instance.</summary>
 		public Player GetPlayer(OpenRA.Player runtimePlayer)
 		{
-			Player player;
-
-			playersByRuntime.TryGetValue(runtimePlayer, out player);
+			playersByRuntime.TryGetValue(runtimePlayer, out var player);
 
 			return player;
 		}
@@ -154,7 +154,7 @@ namespace OpenRA
 
 			/// <summary>The faction ID, a.k.a. the faction's internal name.</summary>
 			public string FactionId;
-			public HSLColor Color;
+			public Color Color;
 
 			/// <summary>The team ID on start-up, or 0 if the player is not part of a team.</summary>
 			public int Team;
@@ -166,6 +166,9 @@ namespace OpenRA
 			/// <summary>True if the spawn point was chosen at random; otherwise, false.</summary>
 			public bool IsRandomSpawnPoint;
 
+			/// <summary>Player authentication fingerprint for the OpenRA forum.</summary>
+			public string Fingerprint;
+
 			#endregion
 
 			#region

OpenRA.Game/GameRules/ActorInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -22,6 +22,9 @@ namespace OpenRA
 	/// </summary>
 	public class ActorInfo
 	{
+		public const string AbstractActorPrefix = "^";
+		public const char TraitInstanceSeparator = '@';
+
 		/// <summary>
 		/// The actor name can be anything, but the sprites used in the Render*: traits default to this one.
 		/// If you add an ^ in front of the name, the engine will recognize this as a collection of traits
@@ -30,7 +33,7 @@ namespace OpenRA
 		/// </summary>
 		public readonly string Name;
 		readonly TypeDictionary traits = new TypeDictionary();
-		List<ITraitInfo> constructOrderCache = null;
+		List<TraitInfo> constructOrderCache = null;
 
 		public ActorInfo(ObjectCreator creator, string name, MiniYaml node)
 		{
@@ -38,19 +41,23 @@ namespace OpenRA
 			{
 				Name = name;
 
-				var abstractActorType = name.StartsWith("^");
 				foreach (var t in node.Nodes)
 				{
 					try
 					{
-						traits.Add(LoadTraitInfo(creator, t.Key.Split('@')[0], t.Value));
+						// 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, t.Value);
+						if (trait != null)
+							traits.Add(trait);
 					}
 					catch (FieldLoader.MissingFieldsException e)
 					{
-						if (!abstractActorType)
-							throw new YamlException(e.Message);
+						throw new YamlException(e.Message);
 					}
 				}
+
+				traits.TrimExcess();
 			}
 			catch (YamlException e)
 			{
@@ -58,21 +65,32 @@ namespace OpenRA
 			}
 		}
 
-		public ActorInfo(string name, params ITraitInfo[] traitInfos)
+		public ActorInfo(string name, params TraitInfo[] traitInfos)
 		{
 			Name = name;
 			foreach (var t in traitInfos)
 				traits.Add(t);
+			traits.TrimExcess();
 		}
 
-		static ITraitInfo LoadTraitInfo(ObjectCreator creator, string traitName, MiniYaml my)
+		static TraitInfo LoadTraitInfo(ObjectCreator creator, string traitName, MiniYaml my)
 		{
 			if (!string.IsNullOrEmpty(my.Value))
 				throw new YamlException("Junk value `{0}` on trait node {1}"
 				.F(my.Value, traitName));
-			var info = creator.CreateObject<ITraitInfo>(traitName + "Info");
+
+			// 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 traitInstance = traitName.Split(TraitInstanceSeparator);
+			var info = creator.CreateObject<TraitInfo>(traitInstance[0] + "Info");
+			if (info == null)
+				return null;
+
 			try
 			{
+				if (traitInstance.Length > 1)
+					info.GetType().GetField("InstanceName").SetValue(info, traitInstance[1]);
+
 				FieldLoader.Load(info, my);
 			}
 			catch (FieldLoader.MissingFieldsException e)
@@ -84,12 +102,12 @@ namespace OpenRA
 			return info;
 		}
 
-		public IEnumerable<ITraitInfo> TraitsInConstructOrder()
+		public IEnumerable<TraitInfo> TraitsInConstructOrder()
 		{
 			if (constructOrderCache != null)
 				return constructOrderCache;
 
-			var source = traits.WithInterface<ITraitInfo>().Select(i => new
+			var source = traits.WithInterface<TraitInfo>().Select(i => new
 			{
 				Trait = i,
 				Type = i.GetType(),
@@ -135,7 +153,7 @@ namespace OpenRA
 			return constructOrderCache;
 		}
 
-		public static IEnumerable<Type> PrerequisitesOf(ITraitInfo info)
+		public static IEnumerable<Type> PrerequisitesOf(TraitInfo info)
 		{
 			return info
 				.GetType()
@@ -144,23 +162,18 @@ namespace OpenRA
 				.Select(t => t.GetGenericArguments()[0]);
 		}
 
-		public IEnumerable<Pair<string, Type>> GetInitKeys()
-		{
-			var inits = traits.WithInterface<ITraitInfo>().SelectMany(
-				t => t.GetType().GetInterfaces()
-					.Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(UsesInit<>))
-					.Select(i => i.GetGenericArguments()[0])).ToList();
-
-			inits.Add(typeof(OwnerInit));		/* not exposed by a trait; this is used by the Actor itself */
-
-			return inits.Select(
-				i => Pair.New(
-					i.Name.Replace("Init", ""), i));
-		}
-
 		public bool HasTraitInfo<T>() where T : ITraitInfoInterface { return traits.Contains<T>(); }
 		public T TraitInfo<T>() where T : ITraitInfoInterface { return traits.Get<T>(); }
 		public T TraitInfoOrDefault<T>() where T : ITraitInfoInterface { return traits.GetOrDefault<T>(); }
 		public IEnumerable<T> TraitInfos<T>() where T : ITraitInfoInterface { return traits.WithInterface<T>(); }
+
+		public BitSet<TargetableType> GetAllTargetTypes()
+		{
+			// PERF: Avoid LINQ.
+			var targetTypes = default(BitSet<TargetableType>);
+			foreach (var targetable in TraitInfos<ITargetableInfo>())
+				targetTypes = targetTypes.Union(targetable.GetTargetTypes());
+			return targetTypes;
+		}
 	}
 }

OpenRA.Game/GameRules/MusicInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -10,7 +10,6 @@
 #endregion
 
 using System.IO;
-using OpenRA.FileFormats;
 using OpenRA.FileSystem;
 
 namespace OpenRA.GameRules
@@ -20,6 +19,7 @@ namespace OpenRA.GameRules
 		public readonly string Filename;
 		public readonly string Title;
 		public readonly bool Hidden;
+		public readonly float VolumeModifier = 1f;
 
 		public int Length { get; private set; } // seconds
 		public bool Exists { get; private set; }
@@ -32,14 +32,16 @@ namespace OpenRA.GameRules
 			if (nd.ContainsKey("Hidden"))
 				bool.TryParse(nd["Hidden"].Value, out Hidden);
 
+			if (nd.ContainsKey("VolumeModifier"))
+				VolumeModifier = FieldLoader.GetValue<float>("VolumeModifier", nd["VolumeModifier"].Value);
+
 			var ext = nd.ContainsKey("Extension") ? nd["Extension"].Value : "aud";
 			Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key) + "." + ext;
 		}
 
 		public void Load(IReadOnlyFileSystem fileSystem)
 		{
-			Stream stream;
-			if (!fileSystem.TryOpen(Filename, out stream))
+			if (!fileSystem.TryOpen(Filename, out var stream))
 				return;
 
 			try
@@ -47,8 +49,7 @@ namespace OpenRA.GameRules
 				Exists = true;
 				foreach (var loader in Game.ModData.SoundLoaders)
 				{
-					ISoundFormat soundFormat;
-					if (loader.TryParseSound(stream, out soundFormat))
+					if (loader.TryParseSound(stream, out var soundFormat))
 					{
 						Length = (int)soundFormat.LengthInSeconds;
 						soundFormat.Dispose();

OpenRA.Game/GameRules/Ruleset.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -29,6 +29,7 @@ namespace OpenRA
 		public readonly IReadOnlyDictionary<string, MusicInfo> Music;
 		public readonly TileSet TileSet;
 		public readonly SequenceProvider Sequences;
+		public readonly IReadOnlyDictionary<string, MiniYamlNode> ModelSequences;
 
 		public Ruleset(
 			IReadOnlyDictionary<string, ActorInfo> actors,
@@ -37,7 +38,8 @@ namespace OpenRA
 			IReadOnlyDictionary<string, SoundInfo> notifications,
 			IReadOnlyDictionary<string, MusicInfo> music,
 			TileSet tileSet,
-			SequenceProvider sequences)
+			SequenceProvider sequences,
+			IReadOnlyDictionary<string, MiniYamlNode> modelSequences)
 		{
 			Actors = actors;
 			Weapons = weapons;
@@ -46,6 +48,7 @@ namespace OpenRA
 			Music = music;
 			TileSet = tileSet;
 			Sequences = sequences;
+			ModelSequences = modelSequences;
 
 			foreach (var a in Actors.Values)
 			{
@@ -64,6 +67,19 @@ namespace OpenRA
 
 			foreach (var weapon in Weapons)
 			{
+				var projectileLoaded = weapon.Value.Projectile as IRulesetLoaded<WeaponInfo>;
+				if (projectileLoaded != null)
+				{
+					try
+					{
+						projectileLoaded.RulesetLoaded(this, weapon.Value);
+					}
+					catch (YamlException e)
+					{
+						throw new YamlException("Projectile type {0}: {1}".F(weapon.Key, e.Message));
+					}
+				}
+
 				foreach (var warhead in weapon.Value.Warheads)
 				{
 					var cacher = warhead as IRulesetLoaded<WeaponInfo>;
@@ -84,16 +100,24 @@ namespace OpenRA
 
 		public IEnumerable<KeyValuePair<string, MusicInfo>> InstalledMusic { get { return Music.Where(m => m.Value.Exists); } }
 
-		static IReadOnlyDictionary<string, T> MergeOrDefault<T>(string name, IReadOnlyFileSystem fileSystem, IEnumerable<string> files, MiniYaml additional,
-			IReadOnlyDictionary<string, T> defaults, Func<MiniYamlNode, T> makeObject)
+		static IReadOnlyDictionary<string, T> MergeOrDefault<T>(string name,
+			IReadOnlyFileSystem fileSystem,
+			IEnumerable<string> files,
+			MiniYaml additional,
+			IReadOnlyDictionary<string, T> defaults,
+			Func<MiniYamlNode, T> makeObject,
+			Func<MiniYamlNode, bool> filterNode = null)
 		{
 			if (additional == null && defaults != null)
 				return defaults;
 
-			var result = MiniYaml.Load(fileSystem, files, additional)
-				.ToDictionaryWithConflictLog(k => k.Key.ToLowerInvariant(), makeObject, "LoadFromManifest<" + name + ">");
+			IEnumerable<MiniYamlNode> yamlNodes = MiniYaml.Load(fileSystem, files, additional);
 
-			return new ReadOnlyDictionary<string, T>(result);
+			// Optionally, the caller can filter out elements from the loaded set of nodes. Default behavior is unfiltered.
+			if (filterNode != null)
+				yamlNodes = yamlNodes.Where(k => !filterNode(k));
+
+			return new ReadOnlyDictionary<string, T>(yamlNodes.ToDictionaryWithConflictLog(k => k.Key.ToLowerInvariant(), makeObject, "LoadFromManifest<" + name + ">"));
 		}
 
 		public static Ruleset LoadDefaults(ModData modData)
@@ -105,7 +129,8 @@ namespace OpenRA
 			Action f = () =>
 			{
 				var actors = MergeOrDefault("Manifest,Rules", fs, m.Rules, null, null,
-					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value));
+					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value),
+					filterNode: n => n.Key.StartsWith(ActorInfo.AbstractActorPrefix, StringComparison.Ordinal));
 
 				var weapons = MergeOrDefault("Manifest,Weapons", fs, m.Weapons, null, null,
 					k => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
@@ -119,8 +144,11 @@ namespace OpenRA
 				var music = MergeOrDefault("Manifest,Music", fs, m.Music, null, null,
 					k => new MusicInfo(k.Key, k.Value));
 
+				var modelSequences = MergeOrDefault("Manifest,ModelSequences", fs, m.ModelSequences, null, null,
+					k => k);
+
 				// The default ruleset does not include a preferred tileset or sequence set
-				ruleset = new Ruleset(actors, weapons, voices, notifications, music, null, null);
+				ruleset = new Ruleset(actors, weapons, voices, notifications, music, null, null, modelSequences);
 			};
 
 			if (modData.IsOnMainThread)
@@ -145,12 +173,13 @@ namespace OpenRA
 			var dr = modData.DefaultRules;
 			var ts = modData.DefaultTileSets[tileSet];
 			var sequences = modData.DefaultSequences[tileSet];
-			return new Ruleset(dr.Actors, dr.Weapons, dr.Voices, dr.Notifications, dr.Music, ts, sequences);
+
+			return new Ruleset(dr.Actors, dr.Weapons, dr.Voices, dr.Notifications, dr.Music, ts, sequences, dr.ModelSequences);
 		}
 
 		public static Ruleset Load(ModData modData, IReadOnlyFileSystem fileSystem, string tileSet,
 			MiniYaml mapRules, MiniYaml mapWeapons, MiniYaml mapVoices, MiniYaml mapNotifications,
-			MiniYaml mapMusic, MiniYaml mapSequences)
+			MiniYaml mapMusic, MiniYaml mapSequences, MiniYaml mapModelSequences)
 		{
 			var m = modData.Manifest;
 			var dr = modData.DefaultRules;
@@ -159,7 +188,8 @@ namespace OpenRA
 			Action f = () =>
 			{
 				var actors = MergeOrDefault("Rules", fileSystem, m.Rules, mapRules, dr.Actors,
-					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value));
+					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value),
+					filterNode: n => n.Key.StartsWith(ActorInfo.AbstractActorPrefix, StringComparison.Ordinal));
 
 				var weapons = MergeOrDefault("Weapons", fileSystem, m.Weapons, mapWeapons, dr.Weapons,
 					k => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
@@ -180,8 +210,12 @@ namespace OpenRA
 				var sequences = mapSequences == null ? modData.DefaultSequences[tileSet] :
 					new SequenceProvider(fileSystem, modData, ts, mapSequences);
 
-				// TODO: Add support for custom voxel sequences
-				ruleset = new Ruleset(actors, weapons, voices, notifications, music, ts, sequences);
+				var modelSequences = dr.ModelSequences;
+				if (mapModelSequences != null)
+					modelSequences = MergeOrDefault("ModelSequences", fileSystem, m.ModelSequences, mapModelSequences, dr.ModelSequences,
+						k => k);
+
+				ruleset = new Ruleset(actors, weapons, voices, notifications, music, ts, sequences, modelSequences);
 			};
 
 			if (modData.IsOnMainThread)
@@ -216,10 +250,13 @@ namespace OpenRA
 					{
 						var traitName = traitNode.Key.Split('@')[0];
 						var traitType = modData.ObjectCreator.FindType(traitName + "Info");
-						if (traitType.GetInterface("ILobbyCustomRulesIgnore") == null)
+						if (traitType != null && traitType.GetInterface("ILobbyCustomRulesIgnore") == null)
 							return true;
 					}
-					catch { }
+					catch (Exception ex)
+					{
+						Log.Write("debug", "Error in AnyFlaggedTraits\r\n" + ex.ToString());
+					}
 				}
 			}
 
@@ -230,7 +267,7 @@ namespace OpenRA
 			MiniYaml mapRules, MiniYaml mapWeapons, MiniYaml mapVoices, MiniYaml mapNotifications, MiniYaml mapSequences)
 		{
 			// Maps that define any weapon, voice, notification, or sequence overrides are always flagged
-			if (AnyCustomYaml(mapWeapons) || AnyCustomYaml(mapVoices) || AnyCustomYaml(mapNotifications) ||	AnyCustomYaml(mapSequences))
+			if (AnyCustomYaml(mapWeapons) || AnyCustomYaml(mapVoices) || AnyCustomYaml(mapNotifications) || AnyCustomYaml(mapSequences))
 				return true;
 
 			// Any trait overrides that aren't explicitly whitelisted are flagged

OpenRA.Game/GameRules/SoundInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -33,18 +33,39 @@ namespace OpenRA.GameRules
 		{
 			FieldLoader.Load(this, y);
 
-			VoicePools = Exts.Lazy(() => Voices.ToDictionary(a => a.Key, a => new SoundPool(a.Value)));
-			NotificationsPools = Exts.Lazy(() => Notifications.ToDictionary(a => a.Key, a => new SoundPool(a.Value)));
+			VoicePools = Exts.Lazy(() => Voices.ToDictionary(a => a.Key, a => new SoundPool(1f, a.Value)));
+			NotificationsPools = Exts.Lazy(() => ParseSoundPool(y, "Notifications"));
+		}
+
+		Dictionary<string, SoundPool> ParseSoundPool(MiniYaml y, string key)
+		{
+			var ret = new Dictionary<string, SoundPool>();
+			var classifiction = y.Nodes.First(x => x.Key == key);
+			foreach (var t in classifiction.Value.Nodes)
+			{
+				var volumeModifier = 1f;
+				var volumeModifierNode = t.Value.Nodes.FirstOrDefault(x => x.Key == "VolumeModifier");
+				if (volumeModifierNode != null)
+					volumeModifier = FieldLoader.GetValue<float>(volumeModifierNode.Key, volumeModifierNode.Value.Value);
+
+				var names = FieldLoader.GetValue<string[]>(t.Key, t.Value.Value);
+				var sp = new SoundPool(volumeModifier, names);
+				ret.Add(t.Key, sp);
+			}
+
+			return ret;
 		}
 	}
 
 	public class SoundPool
 	{
+		public readonly float VolumeModifier;
 		readonly string[] clips;
 		readonly List<string> liveclips = new List<string>();
 
-		public SoundPool(params string[] clips)
+		public SoundPool(float volumeModifier, params string[] clips)
 		{
+			VolumeModifier = volumeModifier;
 			this.clips = clips;
 		}
 
@@ -53,8 +74,9 @@ namespace OpenRA.GameRules
 			if (liveclips.Count == 0)
 				liveclips.AddRange(clips);
 
+			// Avoid crashing if there's no clips at all
 			if (liveclips.Count == 0)
-				return null;		/* avoid crashing if there's no clips at all */
+				return null;
 
 			var i = Game.CosmeticRandom.Next(liveclips.Count);
 			var s = liveclips[i];

OpenRA.Game/GameRules/WeaponInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -13,6 +13,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Effects;
+using OpenRA.Primitives;
 using OpenRA.Traits;
 
 namespace OpenRA.GameRules
@@ -23,7 +24,8 @@ namespace OpenRA.GameRules
 		public int[] DamageModifiers;
 		public int[] InaccuracyModifiers;
 		public int[] RangeModifiers;
-		public int Facing;
+		public WAngle Facing;
+		public Func<WAngle> CurrentMuzzleFacing;
 		public WPos Source;
 		public Func<WPos> CurrentSource;
 		public Actor SourceActor;
@@ -31,6 +33,40 @@ namespace OpenRA.GameRules
 		public Target GuidedTarget;
 	}
 
+	public class WarheadArgs
+	{
+		public WeaponInfo Weapon;
+		public int[] DamageModifiers = { };
+		public WPos? Source;
+		public WRot ImpactOrientation;
+		public WPos ImpactPosition;
+		public Actor SourceActor;
+		public Target WeaponTarget;
+
+		public WarheadArgs(ProjectileArgs args)
+		{
+			Weapon = args.Weapon;
+			DamageModifiers = args.DamageModifiers;
+			ImpactPosition = args.PassiveTarget;
+			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); }
 
@@ -39,9 +75,24 @@ namespace OpenRA.GameRules
 		[Desc("The maximum range the weapon can fire.")]
 		public readonly WDist Range = WDist.Zero;
 
-		[Desc("The sound played when the weapon is fired.")]
+		[Desc("First burst is aimed at this offset relative to target position.")]
+		public readonly WVec FirstBurstTargetOffset = WVec.Zero;
+
+		[Desc("Each burst after the first lands by this offset away from the previous burst.")]
+		public readonly WVec FollowingBurstTargetOffset = WVec.Zero;
+
+		[Desc("The sound played each time the weapon is fired.")]
 		public readonly string[] Report = null;
 
+		[Desc("Sound played only on first burst in a salvo.")]
+		public readonly string[] StartBurstReport = null;
+
+		[Desc("The sound played when the weapon is reloaded.")]
+		public readonly string[] AfterFireSound = null;
+
+		[Desc("Delay in ticks to play reloading sound.")]
+		public readonly int AfterFireSoundDelay = 0;
+
 		[Desc("Delay in ticks between reloading ammo magazines.")]
 		public readonly int ReloadDelay = 1;
 
@@ -49,17 +100,27 @@ namespace OpenRA.GameRules
 		public readonly int Burst = 1;
 
 		[Desc("What types of targets are affected.")]
-		public readonly HashSet<string> ValidTargets = new HashSet<string> { "Ground", "Water" };
+		public readonly BitSet<TargetableType> ValidTargets = new BitSet<TargetableType>("Ground", "Water");
 
 		[Desc("What types of targets are unaffected.", "Overrules ValidTargets.")]
-		public readonly HashSet<string> InvalidTargets = new HashSet<string>();
+		public readonly BitSet<TargetableType> InvalidTargets;
 
-		[Desc("Delay in ticks between firing shots from the same ammo magazine.")]
-		public readonly int BurstDelay = 5;
+		static readonly BitSet<TargetableType> TargetTypeAir = new BitSet<TargetableType>("Air");
+
+		[Desc("If weapon is not directly targeting an actor and targeted position is above this altitude,",
+			"the weapon will ignore terrain target types and only check TargetTypeAir for validity.")]
+		public readonly WDist AirThreshold = new WDist(128);
+
+		[Desc("Delay in ticks between firing shots from the same ammo magazine. If one entry, it will be used for all bursts.",
+			"If multiple entries, their number needs to match Burst - 1.")]
+		public readonly int[] BurstDelays = { 5 };
 
 		[Desc("The minimum range the weapon can fire.")]
 		public readonly WDist MinRange = WDist.Zero;
 
+		[Desc("Does this weapon aim at the target's center regardless of other targetable offsets?")]
+		public readonly bool TargetActorCenter = false;
+
 		[FieldLoader.LoadUsing("LoadProjectile")]
 		public readonly IProjectileInfo Projectile;
 
@@ -76,8 +137,7 @@ namespace OpenRA.GameRules
 
 		static object LoadProjectile(MiniYaml yaml)
 		{
-			MiniYaml proj;
-			if (!yaml.ToDictionary().TryGetValue("Projectile", out proj))
+			if (!yaml.ToDictionary().TryGetValue("Projectile", out var proj))
 				return null;
 			var ret = Game.CreateObject<IProjectileInfo>(proj.Value + "Info");
 			FieldLoader.Load(ret, proj);
@@ -97,7 +157,7 @@ namespace OpenRA.GameRules
 			return retList;
 		}
 
-		public bool IsValidTarget(IEnumerable<string> targetTypes)
+		public bool IsValidTarget(BitSet<TargetableType> targetTypes)
 		{
 			return ValidTargets.Overlaps(targetTypes) && !InvalidTargets.Overlaps(targetTypes);
 		}
@@ -113,6 +173,10 @@ namespace OpenRA.GameRules
 
 			if (target.Type == TargetType.Terrain)
 			{
+				var dat = world.Map.DistanceAboveTerrain(target.CenterPosition);
+				if (dat > AirThreshold)
+					return IsValidTarget(TargetTypeAir);
+
 				var cell = world.Map.CellContaining(target.CenterPosition);
 				if (!world.Map.Contains(cell))
 					return false;
@@ -156,17 +220,33 @@ namespace OpenRA.GameRules
 		}
 
 		/// <summary>Applies all the weapon's warheads to the target.</summary>
-		public void Impact(Target target, Actor firedBy, IEnumerable<int> damageModifiers)
+		public void Impact(Target target, WarheadArgs args)
 		{
+			var world = args.SourceActor.World;
 			foreach (var warhead in Warheads)
 			{
-				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)));
+				if (warhead.Delay > 0)
+					world.AddFrameEndTask(w => w.Add(new DelayedImpact(warhead.Delay, warhead, target, args)));
 				else
-					wh.DoImpact(target, firedBy, damageModifiers);
+					warhead.DoImpact(target, args);
 			}
 		}
+
+		/// <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-2017 The OpenRA Developers (see AUTHORS)
+ * 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

OpenRA.Game/GlobalChat.cs

@@ -1,391 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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;
-using System.Linq;
-using System.Threading;
-using Meebey.SmartIrc4net;
-using OpenRA.Primitives;
-
-namespace OpenRA.Chat
-{
-	public enum ChatConnectionStatus { Disconnected, Connecting, Connected, Disconnecting, Joined, Error }
-	public enum ChatMessageType { Message, Notification }
-
-	public sealed class ChatUser
-	{
-		public readonly string Name;
-		public bool IsOp;
-		public bool IsVoiced;
-
-		public ChatUser(string name, bool isOp, bool isVoice)
-		{
-			Name = name;
-			IsOp = isOp;
-			IsVoiced = isVoice;
-		}
-	}
-
-	public sealed class ChatMessage
-	{
-		static long nextUID;
-
-		public readonly DateTime Time;
-		public readonly ChatMessageType Type;
-		public readonly string Nick;
-		public readonly string Message;
-		public readonly string UID;
-
-		public ChatMessage(DateTime time, ChatMessageType type, string nick, string message)
-		{
-			Time = time;
-			Type = type;
-			Nick = nick;
-			Message = message;
-
-			UID = Interlocked.Increment(ref nextUID).ToString();
-		}
-
-		public override string ToString()
-		{
-			var time = Time.ToString(Game.Settings.Chat.TimestampFormat);
-			if (Type == ChatMessageType.Notification)
-				return "{0} {1}".F(time, Message);
-
-			return "{0} {1}: {2}".F(time, Nick, Message);
-		}
-	}
-
-	public sealed class GlobalChat : IDisposable
-	{
-		readonly IrcClient client = new IrcClient();
-		volatile Channel channel;
-
-		public readonly ObservableSortedDictionary<string, ChatUser> Users = new ObservableSortedDictionary<string, ChatUser>(StringComparer.InvariantCultureIgnoreCase);
-		public readonly ObservableList<ChatMessage> History = new ObservableList<ChatMessage>();
-
-		volatile string topic;
-		public string Topic { get { return topic; } }
-
-		volatile ChatConnectionStatus connectionStatus = ChatConnectionStatus.Disconnected;
-		public ChatConnectionStatus ConnectionStatus { get { return connectionStatus; } }
-
-		public GlobalChat()
-		{
-			client.Encoding = System.Text.Encoding.UTF8;
-			client.SendDelay = 100;
-			client.ActiveChannelSyncing = true;
-
-			client.OnConnecting += OnConnecting;
-			client.OnConnected += OnConnected;
-			client.OnDisconnecting += OnDisconnecting;
-			client.OnDisconnected += OnDisconnected;
-			client.OnError += OnError;
-			client.OnKick += OnKick;
-
-			client.OnRawMessage += (_, e) => Game.RunAfterTick(() => Log.Write("irc", e.Data.RawMessage));
-			client.OnJoin += OnJoin;
-			client.OnChannelActiveSynced += OnChannelActiveSynced;
-			client.OnTopic += (_, e) => topic = e.Topic;
-			client.OnTopicChange += (_, e) => topic = e.NewTopic;
-			client.OnNickChange += OnNickChange;
-
-			client.OnChannelMessage += (_, e) => AddMessage(e.Data.Nick, e.Data.Message);
-			client.OnOp += (_, e) => SetUserOp(e.Whom, true);
-			client.OnDeop += (_, e) => SetUserOp(e.Whom, false);
-			client.OnVoice += (_, e) => SetUserVoiced(e.Whom, true);
-			client.OnDevoice += (_, e) => SetUserVoiced(e.Whom, false);
-			client.OnPart += OnPart;
-			client.OnQuit += OnQuit;
-
-			TrySetNickname(Game.Settings.Player.Name);
-		}
-
-		void SetUserOp(string whom, bool isOp)
-		{
-			Game.RunAfterTick(() =>
-			{
-				ChatUser user;
-				if (Users.TryGetValue(whom, out user))
-					user.IsOp = isOp;
-			});
-		}
-
-		void SetUserVoiced(string whom, bool isVoiced)
-		{
-			Game.RunAfterTick(() =>
-			{
-				ChatUser user;
-				if (Users.TryGetValue(whom, out user))
-					user.IsVoiced = isVoiced;
-			});
-		}
-
-		public void Connect()
-		{
-			if (client.IsConnected)
-				return;
-
-			new Thread(() =>
-			{
-				try
-				{
-					client.Connect(Game.Settings.Chat.Hostname, Game.Settings.Chat.Port);
-				}
-				catch (Exception e)
-				{
-					connectionStatus = ChatConnectionStatus.Error;
-					AddNotification(e.Message);
-					Game.RunAfterTick(() => Log.Write("irc", e.ToString()));
-
-					return;
-				}
-
-				client.Listen();
-			}) { Name = "IrcListenThread", IsBackground = true }.Start();
-		}
-
-		void AddNotification(string text)
-		{
-			var message = new ChatMessage(DateTime.Now, ChatMessageType.Notification, null, text);
-			Game.RunAfterTick(() =>
-			{
-				History.Add(message);
-				Log.Write("irc", text);
-			});
-		}
-
-		void AddMessage(string nick, string text)
-		{
-			var message = new ChatMessage(DateTime.Now, ChatMessageType.Message, nick, text);
-			Game.RunAfterTick(() =>
-			{
-				History.Add(message);
-				Log.Write("irc", text);
-			});
-		}
-
-		void OnConnecting(object sender, EventArgs e)
-		{
-			AddNotification("Connecting to {0}:{1}...".F(Game.Settings.Chat.Hostname, Game.Settings.Chat.Port));
-			connectionStatus = ChatConnectionStatus.Connecting;
-		}
-
-		void OnConnected(object sender, EventArgs e)
-		{
-			AddNotification("Connected.");
-			connectionStatus = ChatConnectionStatus.Connected;
-
-			// Guard against settings.yaml modification
-			var nick = SanitizedName(Game.Settings.Chat.Nickname);
-			if (nick != Game.Settings.Chat.Nickname)
-				Game.RunAfterTick(() => Game.Settings.Chat.Nickname = nick);
-
-			client.Login(nick, "in-game IRC client", 0, "OpenRA");
-			client.RfcJoin("#" + Game.Settings.Chat.Channel);
-		}
-
-		void OnDisconnecting(object sender, EventArgs e)
-		{
-			if (connectionStatus != ChatConnectionStatus.Error)
-				connectionStatus = ChatConnectionStatus.Disconnecting;
-		}
-
-		void OnDisconnected(object sender, EventArgs e)
-		{
-			Game.RunAfterTick(Users.Clear);
-
-			// Keep the chat window open if there is an error
-			// It will be cleared by the Disconnect button
-			if (connectionStatus != ChatConnectionStatus.Error)
-			{
-				Game.RunAfterTick(History.Clear);
-				topic = null;
-				connectionStatus = ChatConnectionStatus.Disconnected;
-			}
-		}
-
-		void OnError(object sender, ErrorEventArgs e)
-		{
-			// Ignore any errors that happen during disconnect
-			if (connectionStatus != ChatConnectionStatus.Disconnecting)
-			{
-				connectionStatus = ChatConnectionStatus.Error;
-				AddNotification("Error: " + e.ErrorMessage);
-			}
-		}
-
-		void OnKick(object sender, KickEventArgs e)
-		{
-			if (e.Whom == client.Nickname)
-			{
-				Disconnect();
-				connectionStatus = ChatConnectionStatus.Error;
-				AddNotification("You were kicked from the chat by {0}. ({1})".F(e.Who, e.KickReason));
-			}
-			else
-			{
-				Users.Remove(e.Whom);
-				AddNotification("{0} was kicked from the chat by {1}. ({2})".F(e.Whom, e.Who, e.KickReason));
-			}
-		}
-
-		void OnJoin(object sender, JoinEventArgs e)
-		{
-			if (e.Who == client.Nickname || channel == null || e.Channel != channel.Name)
-				return;
-
-			AddNotification("{0} joined the chat.".F(e.Who));
-			Game.RunAfterTick(() => Users.Add(e.Who, new ChatUser(e.Who, false, false)));
-		}
-
-		void OnChannelActiveSynced(object sender, IrcEventArgs e)
-		{
-			channel = client.GetChannel(e.Data.Channel);
-			AddNotification("{0} users online".F(channel.Users.Count));
-			connectionStatus = ChatConnectionStatus.Joined;
-
-			foreach (DictionaryEntry user in channel.Users)
-			{
-				var u = (ChannelUser)user.Value;
-				Game.RunAfterTick(() => Users.Add(u.Nick, new ChatUser(u.Nick, u.IsOp, u.IsVoice)));
-			}
-		}
-
-		void OnNickChange(object sender, NickChangeEventArgs e)
-		{
-			AddNotification("{0} is now known as {1}.".F(e.OldNickname, e.NewNickname));
-
-			Game.RunAfterTick(() =>
-			{
-				ChatUser user;
-				if (!Users.TryGetValue(e.OldNickname, out user))
-					return;
-
-				Users.Remove(e.OldNickname);
-				Users.Add(e.NewNickname, new ChatUser(e.NewNickname, user.IsOp, user.IsVoiced));
-			});
-		}
-
-		void OnQuit(object sender, QuitEventArgs e)
-		{
-			AddNotification("{0} left the chat.".F(e.Who));
-			Game.RunAfterTick(() => Users.Remove(e.Who));
-		}
-
-		void OnPart(object sender, PartEventArgs e)
-		{
-			if (channel == null || e.Data.Channel != channel.Name)
-				return;
-
-			AddNotification("{0} left the chat.".F(e.Who));
-			Game.RunAfterTick(() => Users.Remove(e.Who));
-		}
-
-		public string SanitizedName(string dirty)
-		{
-			if (string.IsNullOrEmpty(dirty))
-				return null;
-
-			// There is no need to mangle the nick if it is already valid
-			if (Rfc2812.IsValidNickname(dirty))
-				return dirty;
-
-			// TODO: some special chars are allowed as well, but not at every position
-			var clean = new string(dirty.Where(c => char.IsLetterOrDigit(c)).ToArray());
-
-			if (string.IsNullOrEmpty(clean))
-				return null;
-
-			if (char.IsDigit(clean[0]))
-				return SanitizedName(clean.Substring(1));
-
-			// Source: https://tools.ietf.org/html/rfc2812#section-1.2.1
-			if (clean.Length > 9)
-				clean = clean.Substring(0, 9);
-
-			return clean;
-		}
-
-		public bool IsValidNickname(string name)
-		{
-			return Rfc2812.IsValidNickname(name);
-		}
-
-		public void SendMessage(string text)
-		{
-			if (connectionStatus != ChatConnectionStatus.Joined)
-				return;
-
-			// Guard against a last-moment disconnection
-			try
-			{
-				client.SendMessage(SendType.Message, channel.Name, text);
-				AddMessage(client.Nickname, text);
-			}
-			catch (NotConnectedException) { }
-		}
-
-		public bool TrySetNickname(string nick)
-		{
-			// TODO: This is inconsistent with the other check
-			if (Rfc2812.IsValidNickname(nick))
-			{
-				client.RfcNick(nick);
-				Game.Settings.Chat.Nickname = nick;
-				return true;
-			}
-
-			return false;
-		}
-
-		public void Disconnect()
-		{
-			// Error is an alias for disconnect, but keeps the panel open
-			// so that clients can see the error
-			if (connectionStatus == ChatConnectionStatus.Error)
-			{
-				Game.RunAfterTick(History.Clear);
-				topic = null;
-				connectionStatus = ChatConnectionStatus.Disconnected;
-			}
-			else
-				connectionStatus = ChatConnectionStatus.Disconnecting;
-
-			if (!client.IsConnected)
-				return;
-
-			client.RfcQuit(Game.Settings.Chat.QuitMessage);
-
-			AddNotification("Disconnecting from {0}...".F(client.Address));
-
-			Game.RunAfterTick(() => Game.Settings.Chat.ConnectAutomatically = false);
-		}
-
-		public void Dispose()
-		{
-			// HACK: The IRC library we are using has terrible thread-handling code that relies on Thread.Abort.
-			// There is a thread reading from the network socket which is aborted, however on Windows this is inside
-			// native code so this abort call hangs until the network socket reads something and returns to managed
-			// code where it can then be aborted.
-			//
-			// This means we may hang for several seconds during shutdown (until we receive something over IRC!) before
-			// closing.
-			//
-			// Since our IRC client currently lives forever, the only time we call this Dispose method is during the
-			// shutdown of our process. Therefore, we can work around the problem by just not bothering to disconnect
-			// properly. Since our process is about to die anyway, it's not like anyone will care.
-			////if (client.IsConnected)
-			////	client.Disconnect();
-		}
-	}
-}

OpenRA.Game/Graphics/Animation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -10,8 +10,8 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Primitives;
 using OpenRA.Support;
 
 namespace OpenRA.Graphics
@@ -23,7 +23,7 @@ namespace OpenRA.Graphics
 		public bool IsDecoration { get; set; }
 
 		readonly SequenceProvider sequenceProvider;
-		readonly Func<int> facingFunc;
+		readonly Func<WAngle> 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, () => 0) { }
+			: this(world, name, () => WAngle.Zero) { }
 
-		public Animation(World world, string name, Func<int> facingFunc)
+		public Animation(World world, string name, Func<WAngle> facingFunc)
 			: this(world, name, facingFunc, null) { }
 
 		public Animation(World world, string name, Func<bool> paused)
-			: this(world, name, () => 0, paused) { }
+			: this(world, name, () => WAngle.Zero, paused) { }
 
-		public Animation(World world, string name, Func<int> facingFunc, Func<bool> paused)
+		public Animation(World world, string name, Func<WAngle> facingFunc, Func<bool> paused)
 		{
 			sequenceProvider = world.Map.Rules.Sequences;
 			Name = name.ToLowerInvariant();
@@ -49,24 +49,52 @@ namespace OpenRA.Graphics
 			this.paused = paused;
 		}
 
-		public int CurrentFrame { get { return backwards ? CurrentSequence.Start + CurrentSequence.Length - frame - 1 : frame; } }
+		public int CurrentFrame { get { return backwards ? CurrentSequence.Length - frame - 1 : frame; } }
 		public Sprite Image { get { return CurrentSequence.GetSprite(CurrentFrame, facingFunc()); } }
 
-		public IEnumerable<IRenderable> Render(WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale)
+		public IRenderable[] Render(WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale)
 		{
-			var imageRenderable = new SpriteRenderable(Image, pos, offset, CurrentSequence.ZOffset + zOffset, palette, scale, IsDecoration);
+			var imageRenderable = new SpriteRenderable(Image, pos, offset, CurrentSequence.ZOffset + zOffset, palette, scale, IsDecoration, CurrentSequence.IgnoreWorldTint);
 
 			if (CurrentSequence.ShadowStart >= 0)
 			{
 				var shadow = CurrentSequence.GetShadow(CurrentFrame, facingFunc());
-				var shadowRenderable = new SpriteRenderable(shadow, pos, offset, CurrentSequence.ShadowZOffset + zOffset, palette, scale, true);
+				var shadowRenderable = new SpriteRenderable(shadow, pos, offset, CurrentSequence.ShadowZOffset + zOffset, palette, scale, true, CurrentSequence.IgnoreWorldTint);
 				return new IRenderable[] { shadowRenderable, imageRenderable };
 			}
 
 			return new IRenderable[] { imageRenderable };
 		}
 
-		public IEnumerable<IRenderable> Render(WPos pos, PaletteReference palette)
+		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);
+			var cb = CurrentSequence.Bounds;
+			return Rectangle.FromLTRB(
+				xy.X + (int)(cb.Left * scale),
+				xy.Y + (int)(cb.Top * scale),
+				xy.X + (int)(cb.Right * scale),
+				xy.Y + (int)(cb.Bottom * scale));
+		}
+
+		public IRenderable[] Render(WPos pos, PaletteReference palette)
 		{
 			return Render(pos, WVec.Zero, 0, palette, 1f);
 		}
@@ -128,7 +156,7 @@ namespace OpenRA.Graphics
 				{
 					frame = CurrentSequence.Length - 1;
 					tickFunc = () => { };
-					if (after != null) after();
+					after?.Invoke();
 				}
 			};
 		}

OpenRA.Game/Graphics/AnimationWithOffset.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -10,7 +10,7 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -35,7 +35,7 @@ namespace OpenRA.Graphics
 			ZOffset = zOffset;
 		}
 
-		public IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr, PaletteReference pal, float scale)
+		public IRenderable[] Render(Actor self, WorldRenderer wr, PaletteReference pal, float scale)
 		{
 			var center = self.CenterPosition;
 			var offset = OffsetFunc != null ? OffsetFunc() : WVec.Zero;
@@ -44,9 +44,17 @@ namespace OpenRA.Graphics
 			return Animation.Render(center, offset, z, pal, scale);
 		}
 
+		public Rectangle ScreenBounds(Actor self, WorldRenderer wr, float scale)
+		{
+			var center = self.CenterPosition;
+			var offset = OffsetFunc != null ? OffsetFunc() : WVec.Zero;
+
+			return Animation.ScreenBounds(wr, center, offset, scale);
+		}
+
 		public static implicit operator AnimationWithOffset(Animation a)
 		{
 			return new AnimationWithOffset(a, null, null, null);
 		}
 	}
-}
+}

OpenRA.Game/Graphics/ChromeProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -9,81 +9,140 @@
  */
 #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
 	{
-		struct Collection
+		public class Collection
 		{
-			public string Src;
-			public Dictionary<string, MappedImage> Regions;
+			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 static IReadOnlyDictionary<string, Collection> Collections { get; private set; }
 		static Dictionary<string, Collection> collections;
-		static Dictionary<string, Sheet> cachedSheets;
+		static Dictionary<string, (Sheet Sheet, int Density)> cachedSheets;
 		static Dictionary<string, Dictionary<string, Sprite>> cachedSprites;
+		static Dictionary<string, Sprite[]> cachedPanelSprites;
+		static Dictionary<Collection, (Sheet 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, Sheet>();
+			cachedSheets = new Dictionary<string, (Sheet, int)>();
 			cachedSprites = new Dictionary<string, Dictionary<string, Sprite>>();
+			cachedPanelSprites = new Dictionary<string, Sprite[]>();
+			cachedCollectionSheets = new Dictionary<Collection, (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)
-				LoadCollection(c.Key, c.Value);
+				if (!c.Key.StartsWith("^", StringComparison.Ordinal))
+					LoadCollection(c.Key, c.Value);
 		}
 
 		public static void Deinitialize()
 		{
 			if (cachedSheets != null)
 				foreach (var sheet in cachedSheets.Values)
-					sheet.Dispose();
+					sheet.Sheet.Dispose();
 
 			collections = null;
 			cachedSheets = null;
 			cachedSprites = 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);
+			cachedPanelSprites = null;
+			cachedCollectionSheets = null;
 		}
 
 		static void LoadCollection(string name, MiniYaml yaml)
 		{
 			if (Game.ModData.LoadScreen != null)
 				Game.ModData.LoadScreen.Display();
-			var collection = new Collection()
-			{
-				Src = yaml.Value,
-				Regions = yaml.Nodes.ToDictionary(n => n.Key, n => new MappedImage(yaml.Value, n.Value))
-			};
 
-			collections.Add(name, collection);
+			collections.Add(name, FieldLoader.Load<Collection>(yaml));
+		}
+
+		static (Sheet Sheet, int Density) SheetForCollection(Collection c)
+		{
+			// Outer cache avoids recalculating image names
+			if (!cachedCollectionSheets.TryGetValue(c, out (Sheet, int) sheetDensity))
+			{
+				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;
+				}
+
+				// 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 = (sheet, density);
+					cachedSheets.Add(image, sheetDensity);
+				}
+
+				cachedCollectionSheets.Add(c, sheetDensity);
+			}
+
+			return sheetDensity;
 		}
 
 		public static Sprite GetImage(string collectionName, string imageName)
@@ -92,45 +151,135 @@ namespace OpenRA.Graphics
 				return null;
 
 			// Cached sprite
-			Dictionary<string, Sprite> cachedCollection;
-			Sprite sprite;
-			if (cachedSprites.TryGetValue(collectionName, out cachedCollection) && cachedCollection.TryGetValue(imageName, out sprite))
+			if (cachedSprites.TryGetValue(collectionName, out var cachedCollection) && cachedCollection.TryGetValue(imageName, out var sprite))
 				return sprite;
 
-			Collection collection;
-			if (!collections.TryGetValue(collectionName, out collection))
+			if (!collections.TryGetValue(collectionName, out var collection))
 			{
 				Log.Write("debug", "Could not find collection '{0}'", collectionName);
 				return null;
 			}
 
-			MappedImage mi;
-			if (!collection.Regions.TryGetValue(imageName, out mi))
+			if (!collection.Regions.TryGetValue(imageName, out var 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 = mi.GetImage(sheet);
+			var image = new Sprite(sheetDensity.Sheet, sheetDensity.Density * mi, TextureChannel.RGBA, 1f / sheetDensity.Density);
 			cachedCollection.Add(imageName, image);
 
 			return image;
 		}
+
+		public static Sprite[] GetPanelImages(string collectionName)
+		{
+			if (string.IsNullOrEmpty(collectionName))
+				return null;
+
+			// Cached sprite
+			if (cachedPanelSprites.TryGetValue(collectionName, out var cachedSprites))
+				return cachedSprites;
+
+			if (!collections.TryGetValue(collectionName, out var 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 (PanelSides PanelSides, Rectangle Bounds)[]
+				{
+					(PanelSides.Top | PanelSides.Left, new Rectangle(pr[0], pr[1], pr[2], pr[3])),
+					(PanelSides.Top, new Rectangle(pr[0] + pr[2], pr[1], pr[4], pr[3])),
+					(PanelSides.Top | PanelSides.Right, new Rectangle(pr[0] + pr[2] + pr[4], pr[1], pr[6], pr[3])),
+					(PanelSides.Left, new Rectangle(pr[0], pr[1] + pr[3], pr[2], pr[5])),
+					(PanelSides.Center, new Rectangle(pr[0] + pr[2], pr[1] + pr[3], pr[4], pr[5])),
+					(PanelSides.Right, new Rectangle(pr[0] + pr[2] + pr[4], pr[1] + pr[3], pr[6], pr[5])),
+					(PanelSides.Bottom | PanelSides.Left, new Rectangle(pr[0], pr[1] + pr[3] + pr[5], pr[2], pr[7])),
+					(PanelSides.Bottom, new Rectangle(pr[0] + pr[2], pr[1] + pr[3] + pr[5], pr[4], pr[7])),
+					(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.PanelSides) ? new Sprite(sheetDensity.Sheet, sheetDensity.Density * x.Bounds, TextureChannel.RGBA, 1f / sheetDensity.Density) : 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);
+
+			if (!collections.TryGetValue(collectionName, out var 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

@@ -0,0 +1,299 @@
+#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-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -12,6 +12,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {
@@ -26,21 +27,19 @@ namespace OpenRA.Graphics
 			var sequenceYaml = MiniYaml.Merge(modData.Manifest.Cursors.Select(
 				s => MiniYaml.FromStream(fileSystem.Open(s), s)));
 
-			var shadowIndex = new int[] { };
-
 			var nodesDict = new MiniYaml(null, sequenceYaml).ToDictionary();
-			if (nodesDict.ContainsKey("ShadowIndex"))
-			{
-				Array.Resize(ref shadowIndex, shadowIndex.Length + 1);
-				Exts.TryParseIntegerInvariant(nodesDict["ShadowIndex"].Value,
-					out shadowIndex[shadowIndex.Length - 1]);
-			}
 
-			var palettes = new Dictionary<string, ImmutablePalette>();
-			foreach (var p in nodesDict["Palettes"].Nodes)
-				palettes.Add(p.Key, new ImmutablePalette(fileSystem.Open(p.Value.Value), shadowIndex));
+			// Overwrite previous definitions if there are duplicates
+			var pals = new Dictionary<string, IProvidesCursorPaletteInfo>();
+			foreach (var p in modData.DefaultRules.Actors["world"].TraitInfos<IProvidesCursorPaletteInfo>())
+				if (p.Palette != null)
+					pals[p.Palette] = p;
 
-			Palettes = palettes.AsReadOnly();
+			Palettes = nodesDict["Cursors"].Nodes.Select(n => n.Value.Value)
+				.Where(p => p != null)
+				.Distinct()
+				.ToDictionary(p => p, p => pals[p].ReadPalette(modData.DefaultFileSystem))
+				.AsReadOnly();
 
 			var frameCache = new FrameCache(fileSystem, modData.SpriteLoaders);
 			var cursors = new Dictionary<string, CursorSequence>();
@@ -51,8 +50,6 @@ 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-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -47,15 +47,13 @@ namespace OpenRA.Graphics
 
 			if (d.ContainsKey("X"))
 			{
-				int x;
-				Exts.TryParseIntegerInvariant(d["X"].Value, out x);
+				Exts.TryParseIntegerInvariant(d["X"].Value, out var x);
 				Hotspot = Hotspot.WithX(x);
 			}
 
 			if (d.ContainsKey("Y"))
 			{
-				int y;
-				Exts.TryParseIntegerInvariant(d["Y"].Value, out y);
+				Exts.TryParseIntegerInvariant(d["Y"].Value, out var y);
 				Hotspot = Hotspot.WithY(y);
 			}
 		}

OpenRA.Game/Graphics/HSLColor.cs

@@ -1,146 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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.Drawing;
-using System.Globalization;
-using OpenRA.Scripting;
-
-namespace OpenRA.Graphics
-{
-	public struct HSLColor : IScriptBindable
-	{
-		public readonly byte H;
-		public readonly byte S;
-		public readonly byte L;
-		public readonly Color RGB;
-
-		public static HSLColor FromHSV(float h, float s, float v)
-		{
-			var ll = 0.5f * (2 - s) * v;
-			var ss = (ll >= 1 || v <= 0) ? 0 : 0.5f * s * v / (ll <= 0.5f ? ll : 1 - ll);
-			return new HSLColor((byte)(255 * h), (byte)(255 * ss), (byte)(255 * ll));
-		}
-
-		public HSLColor(Color color)
-		{
-			RGB = color;
-			H = (byte)((color.GetHue() / 360.0f) * 255);
-			S = (byte)(color.GetSaturation() * 255);
-			L = (byte)(color.GetBrightness() * 255);
-		}
-
-		public static HSLColor FromRGB(int r, int g, int b)
-		{
-			return new HSLColor(Color.FromArgb(r, g, b));
-		}
-
-		public static Color RGBFromHSL(float h, float s, float l)
-		{
-			// Convert from HSL to RGB
-			var q = (l < 0.5f) ? l * (1 + s) : l + s - (l * s);
-			var p = 2 * l - q;
-
-			float[] trgb = { h + 1 / 3.0f, h, h - 1 / 3.0f };
-			float[] rgb = { 0, 0, 0 };
-
-			for (var k = 0; k < 3; k++)
-			{
-				while (trgb[k] < 0) trgb[k] += 1.0f;
-				while (trgb[k] > 1) trgb[k] -= 1.0f;
-			}
-
-			for (var k = 0; k < 3; k++)
-			{
-				if (trgb[k] < 1 / 6.0f)
-					rgb[k] = p + ((q - p) * 6 * trgb[k]);
-				else if (trgb[k] >= 1 / 6.0f && trgb[k] < 0.5)
-					rgb[k] = q;
-				else if (trgb[k] >= 0.5f && trgb[k] < 2.0f / 3)
-					rgb[k] = p + ((q - p) * 6 * (2.0f / 3 - trgb[k]));
-				else
-					rgb[k] = p;
-			}
-
-			return Color.FromArgb((int)(rgb[0] * 255), (int)(rgb[1] * 255), (int)(rgb[2] * 255));
-		}
-
-		public static bool TryParseRGB(string value, out Color color)
-		{
-			color = new Color();
-			value = value.Trim();
-			if (value.Length != 6 && value.Length != 8)
-				return false;
-
-			byte red, green, blue, alpha = 255;
-			if (!byte.TryParse(value.Substring(0, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out red)
-				|| !byte.TryParse(value.Substring(2, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out green)
-				|| !byte.TryParse(value.Substring(4, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out blue))
-				return false;
-
-			if (value.Length == 8
-				&& !byte.TryParse(value.Substring(6, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out alpha))
-				return false;
-
-			color = Color.FromArgb(alpha, red, green, blue);
-			return true;
-		}
-
-		public static bool operator ==(HSLColor me, HSLColor other)
-		{
-			return me.H == other.H && me.S == other.S && me.L == other.L;
-		}
-
-		public static bool operator !=(HSLColor me, HSLColor other) { return !(me == other); }
-
-		public HSLColor(byte h, byte s, byte l)
-		{
-			H = h;
-			S = s;
-			L = l;
-			RGB = RGBFromHSL(H / 255f, S / 255f, L / 255f);
-		}
-
-		public void ToHSV(out float h, out float s, out float v)
-		{
-			var ll = 2 * L / 255f;
-			var ss = S / 255f * ((ll <= 1) ? ll : 2 - ll);
-
-			h = H / 255f;
-			s = (2 * ss) / (ll + ss);
-			v = (ll + ss) / 2;
-		}
-
-		public override string ToString()
-		{
-			return "{0},{1},{2}".F(H, S, L);
-		}
-
-		public static string ToHexString(Color color)
-		{
-			if (color.A == 255)
-				return color.R.ToString("X2") + color.G.ToString("X2") + color.B.ToString("X2");
-			return color.R.ToString("X2") + color.G.ToString("X2") + color.B.ToString("X2") + color.A.ToString("X2");
-		}
-
-		public string ToHexString()
-		{
-			return ToHexString(RGB);
-		}
-
-		public override int GetHashCode() { return H.GetHashCode() ^ S.GetHashCode() ^ L.GetHashCode(); }
-
-		public override bool Equals(object obj)
-		{
-			var o = obj as HSLColor?;
-			return o != null && o == this;
-		}
-	}
-}

OpenRA.Game/Graphics/HardwareCursor.cs

@@ -1,137 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-
-namespace OpenRA.Graphics
-{
-	public sealed class HardwareCursor : ICursor
-	{
-		readonly Dictionary<string, IHardwareCursor[]> hardwareCursors = new Dictionary<string, IHardwareCursor[]>();
-		readonly CursorProvider cursorProvider;
-		CursorSequence cursor;
-
-		public HardwareCursor(CursorProvider cursorProvider)
-		{
-			this.cursorProvider = cursorProvider;
-
-			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);
-			}
-
-			Update();
-		}
-
-		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.Device.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)
-				Game.Renderer.Device.SetHardwareCursor(null);
-			else
-			{
-				if (frame >= cursor.Length)
-					frame = frame % cursor.Length;
-
-				Game.Renderer.Device.SetHardwareCursor(hardwareCursors[cursor.Name][frame]);
-			}
-		}
-
-		public void Render(Renderer renderer) { }
-
-		public void Dispose()
-		{
-			foreach (var cursors in hardwareCursors)
-				foreach (var cursor in cursors.Value)
-					cursor.Dispose();
-
-			hardwareCursors.Clear();
-		}
-	}
-}

OpenRA.Game/Graphics/HardwarePalette.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -27,7 +27,7 @@ namespace OpenRA.Graphics
 
 		public HardwarePalette()
 		{
-			Texture = Game.Renderer.Device.CreateTexture();
+			Texture = Game.Renderer.Context.CreateTexture();
 			readOnlyModifiablePalettes = modifiablePalettes.AsReadOnly();
 		}
 
@@ -38,19 +38,16 @@ namespace OpenRA.Graphics
 
 		public IPalette GetPalette(string name)
 		{
-			MutablePalette mutable;
-			if (modifiablePalettes.TryGetValue(name, out mutable))
+			if (modifiablePalettes.TryGetValue(name, out var mutable))
 				return mutable.AsReadOnly();
-			ImmutablePalette immutable;
-			if (palettes.TryGetValue(name, out immutable))
+			if (palettes.TryGetValue(name, out var immutable))
 				return immutable;
 			throw new InvalidOperationException("Palette `{0}` does not exist".F(name));
 		}
 
 		public int GetPaletteIndex(string name)
 		{
-			int ret;
-			if (!indices.TryGetValue(name, out ret))
+			if (!indices.TryGetValue(name, out var ret))
 				throw new InvalidOperationException("Palette `{0}` does not exist".F(name));
 			return ret;
 		}

OpenRA.Game/Graphics/MappedImage.cs

@@ -1,44 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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 System.Drawing;
-
-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.Alpha);
-		}
-
-		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

@@ -0,0 +1,87 @@
+#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 OpenRA.FileSystem;
+using OpenRA.Primitives;
+
+namespace OpenRA.Graphics
+{
+	public interface IModel
+	{
+		uint Frames { get; }
+		uint Sections { get; }
+
+		float[] TransformationMatrix(uint section, uint frame);
+		float[] Size { get; }
+		float[] Bounds(uint frame);
+		ModelRenderData RenderData(uint section);
+
+		/// <summary>Returns the smallest rectangle that covers all rotations of all frames in a model</summary>
+		Rectangle AggregateBounds { get; }
+	}
+
+	public struct ModelRenderData
+	{
+		public readonly int Start;
+		public readonly int Count;
+		public readonly Sheet Sheet;
+
+		public ModelRenderData(int start, int count, Sheet sheet)
+		{
+			Start = start;
+			Count = count;
+			Sheet = sheet;
+		}
+	}
+
+	public interface IModelCache : IDisposable
+	{
+		IModel GetModelSequence(string model, string sequence);
+		bool HasModelSequence(string model, string sequence);
+		IVertexBuffer<Vertex> VertexBuffer { get; }
+	}
+
+	public interface IModelSequenceLoader
+	{
+		Action<string> OnMissingModelError { get; set; }
+		IModelCache CacheModels(IReadOnlyFileSystem fileSystem, ModData modData, IReadOnlyDictionary<string, MiniYamlNode> modelDefinitions);
+	}
+
+	public class PlaceholderModelSequenceLoader : IModelSequenceLoader
+	{
+		public Action<string> OnMissingModelError { get; set; }
+
+		class PlaceholderModelCache : IModelCache
+		{
+			public IVertexBuffer<Vertex> VertexBuffer { get { throw new NotImplementedException(); } }
+
+			public void Dispose() { }
+
+			public IModel GetModelSequence(string model, string sequence)
+			{
+				throw new NotImplementedException();
+			}
+
+			public bool HasModelSequence(string model, string sequence)
+			{
+				throw new NotImplementedException();
+			}
+		}
+
+		public PlaceholderModelSequenceLoader(ModData modData) { }
+
+		public IModelCache CacheModels(IReadOnlyFileSystem fileSystem, ModData modData, IReadOnlyDictionary<string, MiniYamlNode> modelDefinitions)
+		{
+			return new PlaceholderModelCache();
+		}
+	}
+}

OpenRA.Game/Graphics/ModelAnimation.cs

@@ -0,0 +1,57 @@
+#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 OpenRA.Primitives;
+
+namespace OpenRA.Graphics
+{
+	public struct ModelAnimation
+	{
+		public readonly IModel Model;
+		public readonly Func<WVec> OffsetFunc;
+		public readonly Func<WRot> RotationFunc;
+		public readonly Func<bool> DisableFunc;
+		public readonly Func<uint> FrameFunc;
+		public readonly bool ShowShadow;
+
+		public ModelAnimation(IModel model, Func<WVec> offset, Func<WRot> rotation, Func<bool> disable, Func<uint> frame, bool showshadow)
+		{
+			Model = model;
+			OffsetFunc = offset;
+			RotationFunc = rotation;
+			DisableFunc = disable;
+			FrameFunc = frame;
+			ShowShadow = showshadow;
+		}
+
+		public Rectangle ScreenBounds(WPos pos, WorldRenderer wr, float scale)
+		{
+			var r = Model.AggregateBounds;
+			var offset = OffsetFunc != null ? OffsetFunc() : WVec.Zero;
+			var xy = wr.ScreenPxPosition(pos) + wr.ScreenPxOffset(offset);
+
+			return Rectangle.FromLTRB(
+				xy.X + (int)(r.Left * scale),
+				xy.Y + (int)(r.Top * scale),
+				xy.X + (int)(r.Right * scale),
+				xy.Y + (int)(r.Bottom * scale));
+		}
+
+		public bool IsVisible
+		{
+			get
+			{
+				return DisableFunc == null || !DisableFunc();
+			}
+		}
+	}
+}

OpenRA.Game/Graphics/ModelRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -11,20 +11,19 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
-	public class VoxelRenderProxy
+	public class ModelRenderProxy
 	{
 		public readonly Sprite Sprite;
 		public readonly Sprite ShadowSprite;
 		public readonly float ShadowDirection;
 		public readonly float3[] ProjectedShadowBounds;
 
-		public VoxelRenderProxy(Sprite sprite, Sprite shadowSprite, float3[] projectedShadowBounds, float shadowDirection)
+		public ModelRenderProxy(Sprite sprite, Sprite shadowSprite, float3[] projectedShadowBounds, float shadowDirection)
 		{
 			Sprite = sprite;
 			ShadowSprite = shadowSprite;
@@ -33,7 +32,7 @@ namespace OpenRA.Graphics
 		}
 	}
 
-	public sealed class VoxelRenderer : IDisposable
+	public sealed class ModelRenderer : IDisposable
 	{
 		// Static constants
 		static readonly float[] ShadowDiffuse = new float[] { 0, 0, 0 };
@@ -49,11 +48,12 @@ namespace OpenRA.Graphics
 
 		readonly Dictionary<Sheet, IFrameBuffer> mappedBuffers = new Dictionary<Sheet, IFrameBuffer>();
 		readonly Stack<KeyValuePair<Sheet, IFrameBuffer>> unmappedBuffers = new Stack<KeyValuePair<Sheet, IFrameBuffer>>();
-		readonly List<Pair<Sheet, Action>> doRender = new List<Pair<Sheet, Action>>();
+		readonly List<(Sheet Sheet, Action Func)> doRender = new List<(Sheet, Action)>();
 
-		SheetBuilder sheetBuilder;
+		SheetBuilder sheetBuilderForFrame;
+		bool isInFrame;
 
-		public VoxelRenderer(Renderer renderer, IShader shader)
+		public ModelRenderer(Renderer renderer, IShader shader)
 		{
 			this.renderer = renderer;
 			this.shader = shader;
@@ -64,10 +64,10 @@ namespace OpenRA.Graphics
 			shader.SetTexture("Palette", palette);
 		}
 
-		public void SetViewportParams(Size screen, float zoom, int2 scroll)
+		public void SetViewportParams(Size screen, int2 scroll)
 		{
 			var a = 2f / renderer.SheetSize;
-			var view = new float[]
+			var view = new[]
 			{
 				a, 0, 0, 0,
 				0, -a, 0, 0,
@@ -78,11 +78,14 @@ namespace OpenRA.Graphics
 			shader.SetMatrix("View", view);
 		}
 
-		public VoxelRenderProxy RenderAsync(
-			WorldRenderer wr, IEnumerable<VoxelAnimation> voxels, WRot camera, float scale,
+		public ModelRenderProxy RenderAsync(
+			WorldRenderer wr, IEnumerable<ModelAnimation> models, WRot camera, float scale,
 			float[] groundNormal, WRot lightSource, float[] lightAmbientColor, float[] lightDiffuseColor,
 			PaletteReference color, PaletteReference normals, PaletteReference shadowPalette)
 		{
+			if (!isInFrame)
+				throw new InvalidOperationException("BeginFrame has not been called. You cannot render until a frame has been started.");
+
 			// Correct for inverted y-axis
 			var scaleTransform = Util.ScaleMatrix(scale, scale, scale);
 
@@ -105,18 +108,17 @@ namespace OpenRA.Graphics
 			var stl = new float2(float.MaxValue, float.MaxValue);
 			var sbr = new float2(float.MinValue, float.MinValue);
 
-			foreach (var v in voxels)
+			foreach (var m in models)
 			{
 				// Convert screen offset back to world coords
-				var offsetVec = Util.MatrixVectorMultiply(invCameraTransform, wr.ScreenVector(v.OffsetFunc()));
+				var offsetVec = Util.MatrixVectorMultiply(invCameraTransform, wr.ScreenVector(m.OffsetFunc()));
 				var offsetTransform = Util.TranslationMatrix(offsetVec[0], offsetVec[1], offsetVec[2]);
 
-				var worldTransform = v.RotationFunc().Aggregate(Util.IdentityMatrix(),
-					(x, y) => Util.MatrixMultiply(Util.MakeFloatMatrix(y.AsMatrix()), x));
+				var worldTransform = Util.MakeFloatMatrix(m.RotationFunc().AsMatrix());
 				worldTransform = Util.MatrixMultiply(scaleTransform, worldTransform);
 				worldTransform = Util.MatrixMultiply(offsetTransform, worldTransform);
 
-				var bounds = v.Voxel.Bounds(v.FrameFunc());
+				var bounds = m.Model.Bounds(m.FrameFunc());
 				var worldBounds = Util.MatrixAABBMultiply(worldTransform, bounds);
 				var screenBounds = Util.MatrixAABBMultiply(cameraTransform, worldBounds);
 				var shadowBounds = Util.MatrixAABBMultiply(shadowTransform, worldBounds);
@@ -158,13 +160,14 @@ namespace OpenRA.Graphics
 			}
 
 			// Shadows are rendered at twice the resolution to reduce artifacts
-			Size spriteSize, shadowSpriteSize;
-			int2 spriteOffset, shadowSpriteOffset;
-			CalculateSpriteGeometry(tl, br, 1, out spriteSize, out spriteOffset);
-			CalculateSpriteGeometry(stl, sbr, 2, out shadowSpriteSize, out shadowSpriteOffset);
+			CalculateSpriteGeometry(tl, br, 1, out var spriteSize, out var spriteOffset);
+			CalculateSpriteGeometry(stl, sbr, 2, out var shadowSpriteSize, out var shadowSpriteOffset);
 
-			var sprite = sheetBuilder.Allocate(spriteSize, 0, spriteOffset);
-			var shadowSprite = sheetBuilder.Allocate(shadowSpriteSize, 0, shadowSpriteOffset);
+			if (sheetBuilderForFrame == null)
+				sheetBuilderForFrame = new SheetBuilder(SheetType.BGRA, AllocateSheet);
+
+			var sprite = sheetBuilderForFrame.Allocate(spriteSize, 0, spriteOffset);
+			var shadowSprite = sheetBuilderForFrame.Allocate(shadowSpriteSize, 0, shadowSpriteOffset);
 			var sb = sprite.Bounds;
 			var ssb = shadowSprite.Bounds;
 			var spriteCenter = new float2(sb.Left + sb.Width / 2, sb.Top + sb.Height / 2);
@@ -175,16 +178,15 @@ namespace OpenRA.Graphics
 			var correctionTransform = Util.MatrixMultiply(translateMtx, FlipMtx);
 			var shadowCorrectionTransform = Util.MatrixMultiply(shadowTranslateMtx, ShadowScaleFlipMtx);
 
-			doRender.Add(Pair.New<Sheet, Action>(sprite.Sheet, () =>
+			doRender.Add((sprite.Sheet, () =>
 			{
-				foreach (var v in voxels)
+				foreach (var m in models)
 				{
 					// Convert screen offset to world offset
-					var offsetVec = Util.MatrixVectorMultiply(invCameraTransform, wr.ScreenVector(v.OffsetFunc()));
+					var offsetVec = Util.MatrixVectorMultiply(invCameraTransform, wr.ScreenVector(m.OffsetFunc()));
 					var offsetTransform = Util.TranslationMatrix(offsetVec[0], offsetVec[1], offsetVec[2]);
 
-					var rotations = v.RotationFunc().Aggregate(Util.IdentityMatrix(),
-						(x, y) => Util.MatrixMultiply(Util.MakeFloatMatrix(y.AsMatrix()), x));
+					var rotations = Util.MakeFloatMatrix(m.RotationFunc().AsMatrix());
 					var worldTransform = Util.MatrixMultiply(scaleTransform, rotations);
 					worldTransform = Util.MatrixMultiply(offsetTransform, worldTransform);
 
@@ -196,11 +198,11 @@ namespace OpenRA.Graphics
 
 					var lightTransform = Util.MatrixMultiply(Util.MatrixInverse(rotations), invShadowTransform);
 
-					var frame = v.FrameFunc();
-					for (uint i = 0; i < v.Voxel.Limbs; i++)
+					var frame = m.FrameFunc();
+					for (uint i = 0; i < m.Model.Sections; i++)
 					{
-						var rd = v.Voxel.RenderData(i);
-						var t = v.Voxel.TransformationMatrix(i, frame);
+						var rd = m.Model.RenderData(i);
+						var t = m.Model.TransformationMatrix(i, frame);
 						var it = Util.MatrixInverse(t);
 						if (it == null)
 							throw new InvalidOperationException("Failed to invert the transformed matrix of frame {0} during RenderAsync.".F(i));
@@ -208,12 +210,12 @@ namespace OpenRA.Graphics
 						// Transform light vector from shadow -> world -> limb coords
 						var lightDirection = ExtractRotationVector(Util.MatrixMultiply(it, lightTransform));
 
-						Render(rd, Util.MatrixMultiply(transform, t), lightDirection,
+						Render(rd, wr.World.ModelCache, Util.MatrixMultiply(transform, t), lightDirection,
 							lightAmbientColor, lightDiffuseColor, color.TextureMidIndex, normals.TextureMidIndex);
 
 						// Disable shadow normals by forcing zero diffuse and identity ambient light
-						if (v.ShowShadow)
-							Render(rd, Util.MatrixMultiply(shadow, t), lightDirection,
+						if (m.ShowShadow)
+							Render(rd, wr.World.ModelCache, Util.MatrixMultiply(shadow, t), lightDirection,
 								ShadowAmbient, ShadowDiffuse, shadowPalette.TextureMidIndex, normals.TextureMidIndex);
 					}
 				}
@@ -221,7 +223,7 @@ namespace OpenRA.Graphics
 
 			var screenLightVector = Util.MatrixVectorMultiply(invShadowTransform, ZVector);
 			screenLightVector = Util.MatrixVectorMultiply(cameraTransform, screenLightVector);
-			return new VoxelRenderProxy(sprite, shadowSprite, screenCorners, -screenLightVector[2] / screenLightVector[1]);
+			return new ModelRenderProxy(sprite, shadowSprite, screenCorners, -screenLightVector[2] / screenLightVector[1]);
 		}
 
 		static void CalculateSpriteGeometry(float2 tl, float2 br, float scale, out Size size, out int2 offset)
@@ -258,7 +260,8 @@ namespace OpenRA.Graphics
 		}
 
 		void Render(
-			VoxelRenderData renderData,
+			ModelRenderData renderData,
+			IModelCache cache,
 			float[] t, float[] lightDirection,
 			float[] ambientLight, float[] diffuseLight,
 			float colorPaletteTextureMidIndex, float normalsPaletteTextureMidIndex)
@@ -270,17 +273,20 @@ namespace OpenRA.Graphics
 			shader.SetVec("AmbientLight", ambientLight, 3);
 			shader.SetVec("DiffuseLight", diffuseLight, 3);
 
-			shader.Render(() => renderer.DrawBatch(Game.ModData.VoxelLoader.VertexBuffer, renderData.Start, renderData.Count, PrimitiveType.TriangleList));
+			shader.PrepareRender();
+			renderer.DrawBatch(cache.VertexBuffer, renderData.Start, renderData.Count, PrimitiveType.TriangleList);
 		}
 
 		public void BeginFrame()
 		{
+			if (isInFrame)
+				throw new InvalidOperationException("BeginFrame has already been called. A new frame cannot be started until EndFrame has been called.");
+
+			isInFrame = true;
+
 			foreach (var kv in mappedBuffers)
 				unmappedBuffers.Push(kv);
 			mappedBuffers.Clear();
-
-			sheetBuilder = new SheetBuilder(SheetType.BGRA, AllocateSheet);
-			doRender.Clear();
 		}
 
 		IFrameBuffer EnableFrameBuffer(Sheet s)
@@ -289,19 +295,25 @@ namespace OpenRA.Graphics
 			Game.Renderer.Flush();
 			fbo.Bind();
 
-			Game.Renderer.Device.EnableDepthBuffer();
+			Game.Renderer.Context.EnableDepthBuffer();
 			return fbo;
 		}
 
 		void DisableFrameBuffer(IFrameBuffer fbo)
 		{
 			Game.Renderer.Flush();
-			Game.Renderer.Device.DisableDepthBuffer();
+			Game.Renderer.Context.DisableDepthBuffer();
 			fbo.Unbind();
 		}
 
 		public void EndFrame()
 		{
+			if (!isInFrame)
+				throw new InvalidOperationException("BeginFrame has not been called. There is no frame to end.");
+
+			isInFrame = false;
+			sheetBuilderForFrame = null;
+
 			if (doRender.Count == 0)
 				return;
 
@@ -310,20 +322,22 @@ namespace OpenRA.Graphics
 			foreach (var v in doRender)
 			{
 				// Change sheet
-				if (v.First != currentSheet)
+				if (v.Sheet != currentSheet)
 				{
 					if (fbo != null)
 						DisableFrameBuffer(fbo);
 
-					currentSheet = v.First;
+					currentSheet = v.Sheet;
 					fbo = EnableFrameBuffer(currentSheet);
 				}
 
-				v.Second();
+				v.Func();
 			}
 
 			if (fbo != null)
 				DisableFrameBuffer(fbo);
+
+			doRender.Clear();
 		}
 
 		public Sheet AllocateSheet()
@@ -337,7 +351,7 @@ namespace OpenRA.Graphics
 			}
 
 			var size = new Size(renderer.SheetSize, renderer.SheetSize);
-			var framebuffer = renderer.Device.CreateFrameBuffer(size);
+			var framebuffer = renderer.Context.CreateFrameBuffer(size);
 			var sheet = new Sheet(SheetType.BGRA, framebuffer.Texture);
 			mappedBuffers.Add(sheet, framebuffer);
 

OpenRA.Game/Graphics/Palette.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -11,11 +11,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -36,35 +33,6 @@ namespace OpenRA.Graphics
 			return Color.FromArgb((int)palette[index]);
 		}
 
-		public static ColorPalette AsSystemPalette(this IPalette palette)
-		{
-			ColorPalette pal;
-			using (var b = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
-				pal = b.Palette;
-
-			for (var i = 0; i < Size; i++)
-				pal.Entries[i] = palette.GetColor(i);
-
-			// hack around a mono bug -- the palette flags get set wrong.
-			if (Platform.CurrentPlatform != PlatformType.Windows)
-				typeof(ColorPalette).GetField("flags",
-					BindingFlags.Instance | BindingFlags.NonPublic).SetValue(pal, 1);
-
-			return pal;
-		}
-
-		public static Bitmap AsBitmap(this IPalette palette)
-		{
-			var b = new Bitmap(Size, 1, PixelFormat.Format32bppArgb);
-			var data = b.LockBits(new Rectangle(0, 0, b.Width, b.Height),
-								  ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-			var temp = new uint[Size];
-			palette.CopyToArray(temp, 0);
-			Marshal.Copy((int[])(object)temp, 0, data.Scan0, Size);
-			b.UnlockBits(data);
-			return b;
-		}
-
 		public static IPalette AsReadOnly(this IPalette palette)
 		{
 			if (palette is ImmutablePalette)
@@ -117,6 +85,12 @@ namespace OpenRA.Graphics
 					var r = (byte)(reader.ReadByte() << 2);
 					var g = (byte)(reader.ReadByte() << 2);
 					var b = (byte)(reader.ReadByte() << 2);
+
+					// Replicate high bits into the (currently zero) low bits.
+					r |= (byte)(r >> 6);
+					g |= (byte)(g >> 6);
+					b |= (byte)(b >> 6);
+
 					colors[i] = (uint)((255 << 24) | (r << 16) | (g << 8) | b);
 				}
 

OpenRA.Game/Graphics/PaletteReference.cs

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

OpenRA.Game/Graphics/PlatformInterfaces.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -10,15 +10,23 @@
 #endregion
 
 using System;
-using System.Drawing;
 using OpenRA.Graphics;
+using OpenRA.Primitives;
 
 namespace OpenRA
 {
+	public enum GLProfile
+	{
+		Modern,
+		Embedded,
+		Legacy
+	}
+
 	public interface IPlatform
 	{
-		IGraphicsDevice CreateGraphics(Size size, WindowMode windowMode);
+		IPlatformWindow CreateWindow(Size size, WindowMode windowMode, float scaleModifier, int batchSize, int videoDisplay, GLProfile profile);
 		ISoundEngine CreateSound(string device);
+		IFont CreateFont(byte[] data);
 	}
 
 	public interface IHardwareCursor : IDisposable { }
@@ -31,44 +39,61 @@ namespace OpenRA
 		Subtractive,
 		Multiply,
 		Multiplicative,
-		DoubleMultiplicative
+		DoubleMultiplicative,
+		LowAdditive,
+		Screen,
+		Translucent
 	}
 
-	public interface IGraphicsDevice : IDisposable
+	public interface IPlatformWindow : IDisposable
 	{
-		IVertexBuffer<Vertex> CreateVertexBuffer(int length);
-		ITexture CreateTexture(Bitmap bitmap);
-		ITexture CreateTexture();
-		IFrameBuffer CreateFrameBuffer(Size s);
-		IShader CreateShader(string name);
+		IGraphicsContext Context { get; }
 
-		Size WindowSize { get; }
-		float WindowScale { get; }
-		event Action<float, float> OnWindowScaleChanged;
+		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;
 
-		void Clear();
-		void Present();
-		Bitmap TakeScreenshot();
 		void PumpInput(IInputHandler inputHandler);
 		string GetClipboardText();
 		bool SetClipboardText(string text);
-		void DrawPrimitives(PrimitiveType type, int firstVertex, int numVertices);
-
-		void EnableScissor(int left, int top, int width, int height);
-		void DisableScissor();
-
-		void EnableDepthBuffer();
-		void DisableDepthBuffer();
-		void ClearDepthBuffer();
-
-		void SetBlendMode(BlendMode mode);
 
 		void GrabWindowMouseFocus();
 		void ReleaseWindowMouseFocus();
 
-		IHardwareCursor CreateHardwareCursor(string name, Size size, byte[] data, int2 hotspot);
+		IHardwareCursor CreateHardwareCursor(string name, Size size, byte[] data, int2 hotspot, bool pixelDouble);
 		void SetHardwareCursor(IHardwareCursor cursor);
+		void SetRelativeMouseMode(bool mode);
+		void SetScaleModifier(float scale);
 
+		GLProfile GLProfile { get; }
+
+		GLProfile[] SupportedGLProfiles { get; }
+	}
+
+	public interface IGraphicsContext : IDisposable
+	{
+		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 DisableScissor();
+		void Present();
+		void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices);
+		void Clear();
+		void EnableDepthBuffer();
+		void DisableDepthBuffer();
+		void ClearDepthBuffer();
+		void SetBlendMode(BlendMode mode);
+		void SetVSyncEnabled(bool enabled);
 		string GLVersion { get; }
 	}
 
@@ -89,14 +114,13 @@ namespace OpenRA
 		void SetVec(string name, float[] vec, int length);
 		void SetTexture(string param, ITexture texture);
 		void SetMatrix(string param, float[] mtx);
-		void Render(Action a);
+		void PrepareRender();
 	}
 
 	public enum TextureScaleFilter { Nearest, Linear }
 
 	public interface ITexture : IDisposable
 	{
-		void SetData(Bitmap bitmap);
 		void SetData(uint[,] colors);
 		void SetData(byte[] colors, int width, int height);
 		byte[] GetData();
@@ -108,6 +132,8 @@ namespace OpenRA
 	{
 		void Bind();
 		void Unbind();
+		void EnableScissor(Rectangle rect);
+		void DisableScissor();
 		ITexture Texture { get; }
 	}
 
@@ -130,4 +156,17 @@ namespace OpenRA
 		Fullscreen,
 		PseudoFullscreen,
 	}
+
+	public interface IFont : IDisposable
+	{
+		FontGlyph CreateGlyph(char c, int size, float deviceScale);
+	}
+
+	public struct FontGlyph
+	{
+		public int2 Offset;
+		public Size Size;
+		public float Advance;
+		public byte[] Data;
+	}
 }

OpenRA.Game/Graphics/PlayerColorRemap.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -11,7 +11,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using OpenRA.Primitives;
 
@@ -26,12 +25,16 @@ namespace OpenRA.Graphics
 			return ramp[i];
 		}
 
-		public PlayerColorRemap(int[] ramp, HSLColor c, float rampFraction)
+		public PlayerColorRemap(int[] ramp, Color c, float rampFraction)
 		{
+			var h = c.GetHue() / 360.0f;
+			var s = c.GetSaturation();
+			var l = c.GetBrightness();
+
 			// Increase luminosity if required to represent the full ramp
-			var rampRange = (byte)((1 - rampFraction) * c.L);
-			var c1 = new HSLColor(c.H, c.S, Math.Max(rampRange, c.L)).RGB;
-			var c2 = new HSLColor(c.H, c.S, (byte)Math.Max(0, c.L - rampRange)).RGB;
+			var rampRange = (byte)((1 - rampFraction) * l);
+			var c1 = Color.FromAhsl(h, s, Math.Max(rampRange, l));
+			var c2 = Color.FromAhsl(h, s, (byte)Math.Max(0, l - rampRange));
 			var baseIndex = ramp[0];
 			var remapRamp = ramp.Select(r => r - ramp[0]);
 			var rampMaxIndex = ramp.Length - 1;
@@ -44,14 +47,13 @@ namespace OpenRA.Graphics
 					remapRamp = ramp.Select(r => r - ramp[rampMaxIndex]);
 			}
 
-			remapColors = remapRamp.Select((x, i) => Pair.New(baseIndex + i, Exts.ColorLerp(x / (float)ramp.Length, c1, c2)))
-				.ToDictionary(u => u.First, u => u.Second);
+			remapColors = remapRamp.Select((x, i) => (baseIndex + i, Exts.ColorLerp(x / (float)ramp.Length, c1, c2)))
+				.ToDictionary(u => u.Item1, u => u.Item2);
 		}
 
 		public Color GetRemappedColor(Color original, int index)
 		{
-			Color c;
-			return remapColors.TryGetValue(index, out c)
+			return remapColors.TryGetValue(index, out var c)
 				? c : original;
 		}
 	}

OpenRA.Game/Graphics/Renderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -9,7 +9,7 @@
  */
 #endregion
 
-using System.Drawing;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -28,6 +28,11 @@ namespace OpenRA.Graphics
 		IFinalizedRenderable PrepareRender(WorldRenderer wr);
 	}
 
+	public interface ITintableRenderable
+	{
+		IRenderable WithTint(float3 newTint);
+	}
+
 	public interface IFinalizedRenderable
 	{
 		void Render(WorldRenderer wr);

OpenRA.Game/Graphics/RgbaColorRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -11,49 +11,25 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
-	public class RgbaColorRenderer : Renderer.IBatchRenderer
+	public class RgbaColorRenderer
 	{
-		static readonly float2 Offset = new float2(0.5f, 0.5f);
+		static readonly float3 Offset = new float3(0.5f, 0.5f, 0f);
 
-		readonly Renderer renderer;
-		readonly IShader shader;
-		readonly Action renderAction;
+		readonly SpriteRenderer parent;
+		readonly Vertex[] vertices = new Vertex[6];
 
-		readonly Vertex[] vertices;
-		int nv = 0;
-
-		public RgbaColorRenderer(Renderer renderer, IShader shader)
+		public RgbaColorRenderer(SpriteRenderer parent)
 		{
-			this.renderer = renderer;
-			this.shader = shader;
-			vertices = new Vertex[renderer.TempBufferSize];
-			renderAction = () => renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList);
-		}
-
-		public void Flush()
-		{
-			if (nv > 0)
-			{
-				renderer.Device.SetBlendMode(BlendMode.Alpha);
-				shader.Render(renderAction);
-				renderer.Device.SetBlendMode(BlendMode.None);
-
-				nv = 0;
-			}
+			this.parent = parent;
 		}
 
 		public void DrawLine(float3 start, float3 end, float width, Color startColor, Color endColor)
 		{
-			renderer.CurrentBatchRenderer = this;
-
-			if (nv + 6 > renderer.TempBufferSize)
-				Flush();
-
 			var delta = (end - start) / (end - start).XY.Length;
 			var corner = width / 2 * new float3(-delta.Y, delta.X, delta.Z);
 
@@ -69,21 +45,18 @@ namespace OpenRA.Graphics
 			var eb = endColor.B / 255.0f;
 			var ea = endColor.A / 255.0f;
 
-			vertices[nv++] = new Vertex(start - corner + Offset, sr, sg, sb, sa, 0, 0);
-			vertices[nv++] = new Vertex(start + corner + Offset, sr, sg, sb, sa, 0, 0);
-			vertices[nv++] = new Vertex(end + corner + Offset, er, eg, eb, ea, 0, 0);
-			vertices[nv++] = new Vertex(end + corner + Offset, er, eg, eb, ea, 0, 0);
-			vertices[nv++] = new Vertex(end - corner + Offset, er, eg, eb, ea, 0, 0);
-			vertices[nv++] = new Vertex(start - corner + Offset, sr, sg, sb, sa, 0, 0);
+			vertices[0] = new Vertex(start - corner + Offset, sr, sg, sb, sa, 0, 0);
+			vertices[1] = new Vertex(start + corner + Offset, sr, sg, sb, sa, 0, 0);
+			vertices[2] = new Vertex(end + corner + Offset, er, eg, eb, ea, 0, 0);
+			vertices[3] = new Vertex(end + corner + Offset, er, eg, eb, ea, 0, 0);
+			vertices[4] = new Vertex(end - corner + Offset, er, eg, eb, ea, 0, 0);
+			vertices[5] = new Vertex(start - corner + Offset, sr, sg, sb, sa, 0, 0);
+
+			parent.DrawRGBAVertices(vertices);
 		}
 
 		public void DrawLine(float3 start, float3 end, float width, Color color)
 		{
-			renderer.CurrentBatchRenderer = this;
-
-			if (nv + 6 > renderer.TempBufferSize)
-				Flush();
-
 			var delta = (end - start) / (end - start).XY.Length;
 			var corner = width / 2 * new float2(-delta.Y, delta.X);
 
@@ -93,12 +66,13 @@ namespace OpenRA.Graphics
 			var b = color.B / 255.0f;
 			var a = color.A / 255.0f;
 
-			vertices[nv++] = new Vertex(start - corner + Offset, r, g, b, a, 0, 0);
-			vertices[nv++] = new Vertex(start + corner + Offset, r, g, b, a, 0, 0);
-			vertices[nv++] = new Vertex(end + corner + Offset, r, g, b, a, 0, 0);
-			vertices[nv++] = new Vertex(end + corner + Offset, r, g, b, a, 0, 0);
-			vertices[nv++] = new Vertex(end - corner + Offset, r, g, b, a, 0, 0);
-			vertices[nv++] = new Vertex(start - corner + Offset, r, g, b, a, 0, 0);
+			vertices[0] = new Vertex(start - corner + Offset, r, g, b, a, 0, 0);
+			vertices[1] = new Vertex(start + corner + Offset, r, g, b, a, 0, 0);
+			vertices[2] = new Vertex(end + corner + Offset, r, g, b, a, 0, 0);
+			vertices[3] = new Vertex(end + corner + Offset, r, g, b, a, 0, 0);
+			vertices[4] = new Vertex(end - corner + Offset, r, g, b, a, 0, 0);
+			vertices[5] = new Vertex(start - corner + Offset, r, g, b, a, 0, 0);
+			parent.DrawRGBAVertices(vertices);
 		}
 
 		/// <summary>
@@ -146,7 +120,6 @@ namespace OpenRA.Graphics
 				return;
 			}
 
-			renderer.CurrentBatchRenderer = this;
 			color = Util.PremultiplyAlpha(color);
 			var r = color.R / 255.0f;
 			var g = color.G / 255.0f;
@@ -180,19 +153,17 @@ 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 ? IntersectionOf(end + corner, dir, end + nextCorner, nextDir) : end + corner;
-				var cd = closed || i < limit ? IntersectionOf(end - corner, dir, end - nextCorner, nextDir) : end - corner;
+				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;
 
 				// Fill segment
-				if (nv + 6 > renderer.TempBufferSize)
-					Flush();
-
-				vertices[nv++] = new Vertex(ca + Offset, r, g, b, a, 0, 0);
-				vertices[nv++] = new Vertex(cb + Offset, r, g, b, a, 0, 0);
-				vertices[nv++] = new Vertex(cc + Offset, r, g, b, a, 0, 0);
-				vertices[nv++] = new Vertex(cc + Offset, r, g, b, a, 0, 0);
-				vertices[nv++] = new Vertex(cd + Offset, r, g, b, a, 0, 0);
-				vertices[nv++] = new Vertex(ca + Offset, r, g, b, a, 0, 0);
+				vertices[0] = new Vertex(ca + Offset, r, g, b, a, 0, 0);
+				vertices[1] = new Vertex(cb + Offset, r, g, b, a, 0, 0);
+				vertices[2] = new Vertex(cc + Offset, r, g, b, a, 0, 0);
+				vertices[3] = new Vertex(cc + Offset, r, g, b, a, 0, 0);
+				vertices[4] = new Vertex(cd + Offset, r, g, b, a, 0, 0);
+				vertices[5] = new Vertex(ca + Offset, r, g, b, a, 0, 0);
+				parent.DrawRGBAVertices(vertices);
 
 				// Advance line segment
 				end = next;
@@ -204,11 +175,6 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public void DrawLine(IEnumerable<float2> points, float width, Color color, bool connectSegments = false)
-		{
-			DrawLine(points.Select(p => new float3(p, 0)), width, color, connectSegments);
-		}
-
 		public void DrawLine(IEnumerable<float3> points, float width, Color color, bool connectSegments = false)
 		{
 			if (!connectSegments)
@@ -234,6 +200,20 @@ namespace OpenRA.Graphics
 			DrawPolygon(new[] { tl, tr, br, bl }, width, color);
 		}
 
+		public void FillTriangle(float3 a, float3 b, float3 c, Color color)
+		{
+			color = Util.PremultiplyAlpha(color);
+			var cr = color.R / 255.0f;
+			var cg = color.G / 255.0f;
+			var cb = color.B / 255.0f;
+			var ca = color.A / 255.0f;
+
+			vertices[0] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[1] = new Vertex(b + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[2] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
+			parent.DrawRGBAVertices(vertices);
+		}
+
 		public void FillRect(float3 tl, float3 br, Color color)
 		{
 			var tr = new float3(br.X, tl.Y, tl.Z);
@@ -243,23 +223,42 @@ namespace OpenRA.Graphics
 
 		public void FillRect(float3 a, float3 b, float3 c, float3 d, Color color)
 		{
-			renderer.CurrentBatchRenderer = this;
-
-			if (nv + 6 > renderer.TempBufferSize)
-				Flush();
-
 			color = Util.PremultiplyAlpha(color);
 			var cr = color.R / 255.0f;
 			var cg = color.G / 255.0f;
 			var cb = color.B / 255.0f;
 			var ca = color.A / 255.0f;
 
-			vertices[nv++] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
-			vertices[nv++] = new Vertex(b + Offset, cr, cg, cb, ca, 0, 0);
-			vertices[nv++] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
-			vertices[nv++] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
-			vertices[nv++] = new Vertex(d + Offset, cr, cg, cb, ca, 0, 0);
-			vertices[nv++] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[0] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[1] = new Vertex(b + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[2] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[3] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[4] = new Vertex(d + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[5] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
+			parent.DrawRGBAVertices(vertices);
+		}
+
+		public void FillRect(float3 a, float3 b, float3 c, float3 d, Color topLeftColor, Color topRightColor, Color bottomRightColor, Color bottomLeftColor)
+		{
+			vertices[0] = VertexWithColor(a + Offset, topLeftColor);
+			vertices[1] = VertexWithColor(b + Offset, topRightColor);
+			vertices[2] = VertexWithColor(c + Offset, bottomRightColor);
+			vertices[3] = VertexWithColor(c + Offset, bottomRightColor);
+			vertices[4] = VertexWithColor(d + Offset, bottomLeftColor);
+			vertices[5] = VertexWithColor(a + Offset, topLeftColor);
+
+			parent.DrawRGBAVertices(vertices);
+		}
+
+		static Vertex VertexWithColor(float3 xyz, Color color)
+		{
+			color = Util.PremultiplyAlpha(color);
+			var cr = color.R / 255.0f;
+			var cg = color.G / 255.0f;
+			var cb = color.B / 255.0f;
+			var ca = color.A / 255.0f;
+
+			return new Vertex(xyz, cr, cg, cb, ca, 0, 0);
 		}
 
 		public void FillEllipse(float3 tl, float3 br, Color color, int vertices = 32)
@@ -276,20 +275,5 @@ namespace OpenRA.Graphics
 				DrawLine(new float3(xc - dx, y, z), new float3(xc + dx, y, z), 1, color);
 			}
 		}
-
-		public void SetViewportParams(Size screen, float depthScale, float depthOffset, float zoom, int2 scroll)
-		{
-			shader.SetVec("Scroll", scroll.X, scroll.Y, scroll.Y);
-			shader.SetVec("r1",
-				zoom * 2f / screen.Width,
-				-zoom * 2f / screen.Height,
-				-depthScale * zoom / screen.Height);
-			shader.SetVec("r2", -1, 1, 1 - depthOffset);
-		}
-
-		public void SetDepthPreviewEnabled(bool enabled)
-		{
-			shader.SetBool("EnableDepthPreview", enabled);
-		}
 	}
 }

OpenRA.Game/Graphics/RgbaSpriteRenderer.cs

@@ -0,0 +1,65 @@
+#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;
+
+namespace OpenRA.Graphics
+{
+	public class RgbaSpriteRenderer
+	{
+		readonly SpriteRenderer parent;
+
+		public RgbaSpriteRenderer(SpriteRenderer parent)
+		{
+			this.parent = parent;
+		}
+
+		public void DrawSprite(Sprite s, float3 location, float3 size)
+		{
+			if (s.Channel != TextureChannel.RGBA)
+				throw new InvalidOperationException("DrawRGBASprite requires a RGBA sprite.");
+
+			parent.DrawSprite(s, location, 0, size);
+		}
+
+		public void DrawSprite(Sprite s, float3 location)
+		{
+			if (s.Channel != TextureChannel.RGBA)
+				throw new InvalidOperationException("DrawRGBASprite requires a RGBA sprite.");
+
+			parent.DrawSprite(s, location, 0, s.Size);
+		}
+
+		public void DrawSprite(Sprite s, float3 a, float3 b, float3 c, float3 d)
+		{
+			if (s.Channel != TextureChannel.RGBA)
+				throw new InvalidOperationException("DrawRGBASprite requires a RGBA sprite.");
+
+			parent.DrawSprite(s, a, b, c, d);
+		}
+
+		public void DrawSpriteWithTint(Sprite s, float3 location, float3 size, float3 tint)
+		{
+			if (s.Channel != TextureChannel.RGBA)
+				throw new InvalidOperationException("DrawRGBASprite requires a RGBA sprite.");
+
+			parent.DrawSpriteWithTint(s, location, 0, size, tint);
+		}
+
+		public void DrawSpriteWithTint(Sprite s, float3 a, float3 b, float3 c, float3 d, float3 tint)
+		{
+			if (s.Channel != TextureChannel.RGBA)
+				throw new InvalidOperationException("DrawRGBASprite requires a RGBA sprite.");
+
+			parent.DrawSpriteWithTint(s, a, b, c, d, tint);
+		}
+	}
+}

OpenRA.Game/Graphics/SequenceProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -11,8 +11,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using OpenRA.FileSystem;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -31,10 +31,12 @@ namespace OpenRA.Graphics
 		int ShadowStart { get; }
 		int ShadowZOffset { get; }
 		int[] Frames { get; }
+		Rectangle Bounds { get; }
+		bool IgnoreWorldTint { get; }
 
 		Sprite GetSprite(int frame);
-		Sprite GetSprite(int frame, int facing);
-		Sprite GetShadow(int frame, int facing);
+		Sprite GetSprite(int frame, WAngle facing);
+		Sprite GetShadow(int frame, WAngle facing);
 	}
 
 	public interface ISpriteSequenceLoader
@@ -63,17 +65,15 @@ namespace OpenRA.Graphics
 					return Load(fileSystem, additionalSequences);
 			});
 
-			spriteCache = Exts.Lazy(() => new SpriteCache(fileSystem, modData.SpriteLoaders, new SheetBuilder(SheetType.Indexed)));
+			spriteCache = Exts.Lazy(() => new SpriteCache(fileSystem, modData.SpriteLoaders));
 		}
 
 		public ISpriteSequence GetSequence(string unitName, string sequenceName)
 		{
-			UnitSequences unitSeq;
-			if (!sequences.Value.TryGetValue(unitName, out unitSeq))
+			if (!sequences.Value.TryGetValue(unitName, out var unitSeq))
 				throw new InvalidOperationException("Unit `{0}` does not have any sequences defined.".F(unitName));
 
-			ISpriteSequence seq;
-			if (!unitSeq.Value.TryGetValue(sequenceName, out seq))
+			if (!unitSeq.Value.TryGetValue(sequenceName, out var seq))
 				throw new InvalidOperationException("Unit `{0}` does not have a sequence named `{1}`".F(unitName, sequenceName));
 
 			return seq;
@@ -86,8 +86,7 @@ namespace OpenRA.Graphics
 
 		public bool HasSequence(string unitName, string sequenceName)
 		{
-			UnitSequences unitSeq;
-			if (!sequences.Value.TryGetValue(unitName, out unitSeq))
+			if (!sequences.Value.TryGetValue(unitName, out var unitSeq))
 				throw new InvalidOperationException("Unit `{0}` does not have any sequences defined.".F(unitName));
 
 			return unitSeq.Value.ContainsKey(sequenceName);
@@ -95,8 +94,7 @@ namespace OpenRA.Graphics
 
 		public IEnumerable<string> Sequences(string unitName)
 		{
-			UnitSequences unitSeq;
-			if (!sequences.Value.TryGetValue(unitName, out unitSeq))
+			if (!sequences.Value.TryGetValue(unitName, out var unitSeq))
 				throw new InvalidOperationException("Unit `{0}` does not have any sequences defined.".F(unitName));
 
 			return unitSeq.Value.Keys;
@@ -113,8 +111,7 @@ namespace OpenRA.Graphics
 
 				var key = node.Value.ToLines(node.Key).JoinWith("|");
 
-				UnitSequences t;
-				if (sequenceCache.TryGetValue(key, out t))
+				if (sequenceCache.TryGetValue(key, out var t))
 					items.Add(node.Key, t);
 				else
 				{
@@ -129,16 +126,21 @@ namespace OpenRA.Graphics
 
 		public void Preload()
 		{
-			SpriteCache.SheetBuilder.Current.CreateBuffer();
+			foreach (var sb in SpriteCache.SheetBuilders.Values)
+				sb.Current.CreateBuffer();
+
 			foreach (var unitSeq in sequences.Value.Values)
 				foreach (var seq in unitSeq.Value.Values) { }
-			SpriteCache.SheetBuilder.Current.ReleaseBuffer();
+
+			foreach (var sb in SpriteCache.SheetBuilders.Values)
+				sb.Current.ReleaseBuffer();
 		}
 
 		public void Dispose()
 		{
 			if (spriteCache.IsValueCreated)
-				spriteCache.Value.SheetBuilder.Dispose();
+				foreach (var sb in SpriteCache.SheetBuilders.Values)
+					sb.Dispose();
 		}
 	}
 }

OpenRA.Game/Graphics/Sheet.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -10,10 +10,9 @@
 #endregion
 
 using System;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
-using System.Runtime.InteropServices;
+using OpenRA.FileFormats;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -50,13 +49,10 @@ namespace OpenRA.Graphics
 
 		public Sheet(SheetType type, Stream stream)
 		{
-			using (var bitmap = (Bitmap)Image.FromStream(stream))
-			{
-				Size = bitmap.Size;
-				data = new byte[4 * Size.Width * Size.Height];
-
-				Util.FastCopyIntoSprite(new Sprite(this, bitmap.Bounds(), TextureChannel.Red), bitmap);
-			}
+			var png = new Png(stream);
+			Size = new Size(png.Width, png.Height);
+			data = new byte[4 * Size.Width * Size.Height];
+			Util.FastCopyIntoSprite(new Sprite(this, new Rectangle(0, 0, png.Width, png.Height), TextureChannel.Red), png);
 
 			Type = type;
 			ReleaseBuffer();
@@ -66,7 +62,7 @@ namespace OpenRA.Graphics
 		{
 			if (texture == null)
 			{
-				texture = Game.Renderer.Device.CreateTexture();
+				texture = Game.Renderer.Context.CreateTexture();
 				dirty = true;
 			}
 
@@ -81,48 +77,37 @@ namespace OpenRA.Graphics
 			return texture;
 		}
 
-		public Bitmap AsBitmap()
+		public Png AsPng()
 		{
-			var d = GetData();
-			var dataStride = 4 * Size.Width;
-			var bitmap = new Bitmap(Size.Width, Size.Height);
+			var data = GetData();
 
-			var bd = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-			for (var y = 0; y < Size.Height; y++)
-				Marshal.Copy(d, y * dataStride, IntPtr.Add(bd.Scan0, y * bd.Stride), dataStride);
-			bitmap.UnlockBits(bd);
-
-			return bitmap;
-		}
-
-		public Bitmap AsBitmap(TextureChannel channel, IPalette pal)
-		{
-			var d = GetData();
-			var dataStride = 4 * Size.Width;
-			var bitmap = new Bitmap(Size.Width, Size.Height);
-			var channelOffset = (int)channel;
-
-			var bd = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-			unsafe
+			// Convert BGRA to RGBA
+			for (var i = 0; i < Size.Width * Size.Height; i++)
 			{
-				var colors = (uint*)bd.Scan0;
-				for (var y = 0; y < Size.Height; y++)
-				{
-					var dataRowIndex = y * dataStride + channelOffset;
-					var bdRowIndex = y * bd.Stride / 4;
-					for (var x = 0; x < Size.Width; x++)
-					{
-						var paletteIndex = d[dataRowIndex + 4 * x];
-						colors[bdRowIndex + x] = pal[paletteIndex];
-					}
-				}
+				var temp = data[i * 4];
+				data[i * 4] = data[i * 4 + 2];
+				data[i * 4 + 2] = temp;
 			}
 
-			bitmap.UnlockBits(bd);
+			return new Png(data, Size.Width, Size.Height);
+		}
 
-			return bitmap;
+		public Png AsPng(TextureChannel channel, IPalette pal)
+		{
+			var d = GetData();
+			var plane = new byte[Size.Width * Size.Height];
+			var dataStride = 4 * Size.Width;
+			var channelOffset = (int)channel;
+
+			for (var y = 0; y < Size.Height; y++)
+				for (var x = 0; x < Size.Width; x++)
+					plane[y * Size.Width + x] = d[y * dataStride + channelOffset + 4 * x];
+
+			var palColors = new Color[Palette.Size];
+			for (var i = 0; i < Palette.Size; i++)
+				palColors[i] = pal.GetColor(i);
+
+			return new Png(plane, Size.Width, Size.Height, palColors);
 		}
 
 		public void CreateBuffer()
@@ -153,12 +138,15 @@ namespace OpenRA.Graphics
 				return;
 			dirty = true;
 			releaseBufferOnCommit = true;
+
+			// Commit data from the buffer to the texture, allowing the buffer to be released and reclaimed by GC.
+			if (Game.Renderer != null)
+				GetTexture();
 		}
 
 		public void Dispose()
 		{
-			if (texture != null)
-				texture.Dispose();
+			texture?.Dispose();
 		}
 	}
 }

OpenRA.Game/Graphics/SheetBuilder.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -11,7 +11,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
+using OpenRA.FileFormats;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -35,30 +36,42 @@ 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;
 		int rowHeight = 0;
-		Point p;
+		int2 p;
 
 		public static Sheet AllocateSheet(SheetType type, int sheetSize)
 		{
 			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)
-			: this(t, () => AllocateSheet(t, sheetSize)) { }
+		public SheetBuilder(SheetType t, int sheetSize, int margin = 1)
+			: this(t, () => AllocateSheet(t, sheetSize), margin) { }
 
-		public SheetBuilder(SheetType t, Func<Sheet> allocateSheet)
+		public SheetBuilder(SheetType t, Func<Sheet> allocateSheet, int margin = 1)
 		{
-			channel = TextureChannel.Red;
+			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); }
@@ -75,9 +88,9 @@ namespace OpenRA.Graphics
 			return rect;
 		}
 
-		public Sprite Add(Bitmap src)
+		public Sprite Add(Png src, float scale = 1f)
 		{
-			var rect = Allocate(src.Size);
+			var rect = Allocate(new Size(src.Width, src.Height),  scale);
 			Util.FastCopyIntoSprite(rect, src);
 			current.CommitBufferedData();
 			return rect;
@@ -101,19 +114,19 @@ namespace OpenRA.Graphics
 			return (TextureChannel)nextChannel;
 		}
 
-		public Sprite Allocate(Size imageSize) { return Allocate(imageSize, 0, float3.Zero); }
-		public Sprite Allocate(Size imageSize, float zRamp, float3 spriteOffset)
+		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)
 		{
-			if (imageSize.Width + p.X > current.Size.Width)
+			if (imageSize.Width + p.X + margin > current.Size.Width)
 			{
-				p = new Point(0, p.Y + rowHeight);
+				p = new int2(0, p.Y + rowHeight + margin);
 				rowHeight = imageSize.Height;
 			}
 
 			if (imageSize.Height > rowHeight)
 				rowHeight = imageSize.Height;
 
-			if (p.Y + imageSize.Height > current.Size.Height)
+			if (p.Y + imageSize.Height + margin > current.Size.Height)
 			{
 				var next = NextChannel(channel);
 				if (next == null)
@@ -121,22 +134,24 @@ namespace OpenRA.Graphics
 					current.ReleaseBuffer();
 					current = allocateSheet();
 					sheets.Add(current);
-					channel = TextureChannel.Red;
+					channel = Type == SheetType.Indexed ? TextureChannel.Red : TextureChannel.RGBA;
 				}
 				else
 					channel = next.Value;
 
 				rowHeight = imageSize.Height;
-				p = new Point(0, 0);
+				p = int2.Zero;
 			}
 
-			var rect = new Sprite(current, new Rectangle(p, imageSize), zRamp, spriteOffset, channel, BlendMode.Alpha);
-			p.X += imageSize.Width;
+			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);
 
 			return rect;
 		}
 
 		public Sheet Current { get { return current; } }
+		public TextureChannel CurrentChannel { get { return channel; } }
+		public IEnumerable<Sheet> AllSheets { get { return sheets; } }
 
 		public void Dispose()
 		{

OpenRA.Game/Graphics/SoftwareCursor.cs

@@ -1,100 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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();
-	}
-
-	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;
-
-		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.Device.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);
-			renderer.SpriteRenderer.DrawSprite(cursorSprite,
-				Viewport.LastMousePos - cursorOffset,
-				paletteReferences[cursorSequence.Palette],
-				cursorSize);
-		}
-
-		public void Dispose()
-		{
-			palette.Dispose();
-			sheetBuilder.Dispose();
-		}
-	}
-}

OpenRA.Game/Graphics/Sprite.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -10,7 +10,7 @@
 #endregion
 
 using System;
-using System.Drawing;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -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)
-			: this(sheet, bounds, 0, float2.Zero, channel) { }
+		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, float zRamp, float3 offset, TextureChannel channel, BlendMode blendMode = BlendMode.Alpha)
+		public Sprite(Sheet sheet, Rectangle bounds, float zRamp, float3 offset, TextureChannel channel, BlendMode blendMode = BlendMode.Alpha, float scale = 1f)
 		{
 			Sheet = sheet;
 			Bounds = bounds;
 			Offset = offset;
 			ZRamp = zRamp;
 			Channel = channel;
-			Size = new float3(bounds.Size.Width, bounds.Size.Height, bounds.Size.Height * zRamp);
+			Size = scale * 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);
@@ -50,13 +50,15 @@ namespace OpenRA.Graphics
 
 	public class SpriteWithSecondaryData : Sprite
 	{
+		public readonly Sheet SecondarySheet;
 		public readonly Rectangle SecondaryBounds;
 		public readonly TextureChannel SecondaryChannel;
 		public readonly float SecondaryTop, SecondaryLeft, SecondaryBottom, SecondaryRight;
 
-		public SpriteWithSecondaryData(Sprite s, Rectangle secondaryBounds, TextureChannel secondaryChannel)
+		public SpriteWithSecondaryData(Sprite s, Sheet secondarySheet, Rectangle secondaryBounds, TextureChannel secondaryChannel)
 			: base(s.Sheet, s.Bounds, s.ZRamp, s.Offset, s.Channel, s.BlendMode)
 		{
+			SecondarySheet = secondarySheet;
 			SecondaryBounds = secondaryBounds;
 			SecondaryChannel = secondaryChannel;
 			SecondaryLeft = (float)Math.Min(secondaryBounds.Left, secondaryBounds.Right) / s.Sheet.Size.Width;
@@ -72,5 +74,6 @@ namespace OpenRA.Graphics
 		Green = 1,
 		Blue = 2,
 		Alpha = 3,
+		RGBA = 4
 	}
 }

OpenRA.Game/Graphics/SpriteFont.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -10,28 +10,26 @@
 #endregion
 
 using System;
-using System.Drawing;
 using System.Linq;
 using OpenRA.Primitives;
 using OpenRA.Support;
-using OpenRA.Widgets;
-using SharpFont;
 
 namespace OpenRA.Graphics
 {
 	public sealed class SpriteFont : IDisposable
 	{
-		static readonly Library Library = new Library();
-
+		public int TopOffset { get; private set; }
 		readonly int size;
 		readonly SheetBuilder builder;
 		readonly Func<string, float> lineWidth;
-		readonly Face face;
-		readonly Cache<Pair<char, Color>, GlyphInfo> glyphs;
+		readonly IFont font;
+		readonly Cache<char, GlyphInfo> glyphs;
+		readonly Cache<(char C, int Radius), Sprite> contrastGlyphs;
+		readonly Cache<int, float[]> dilationElements;
 
 		float deviceScale;
 
-		public SpriteFont(string name, byte[] data, int size, float scale, SheetBuilder builder)
+		public SpriteFont(string name, byte[] data, int size, int ascender, float scale, SheetBuilder builder)
 		{
 			if (builder.Type != SheetType.BGRA)
 				throw new ArgumentException("The sheet builder must create BGRA sheets.", "builder");
@@ -40,87 +38,199 @@ namespace OpenRA.Graphics
 			this.size = size;
 			this.builder = builder;
 
-			face = new Face(Library, data, 0);
-			face.SetPixelSizes((uint)(size * deviceScale), (uint)(size * deviceScale));
-
-			glyphs = new Cache<Pair<char, Color>, GlyphInfo>(CreateGlyph, Pair<char, Color>.EqualityComparer);
+			font = Game.Renderer.CreateFont(data);
+			glyphs = new Cache<char, GlyphInfo>(CreateGlyph);
+			contrastGlyphs = new Cache<(char, 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;
+			Func<char, float> characterWidth = character => glyphs[character].Advance;
 			lineWidth = line => line.Sum(characterWidth) / deviceScale;
 
-			PrecacheColor(Color.White, name);
-			PrecacheColor(Color.Red, name);
+			// Pre-cache small font sizes so glyphs are immediately available when we need them
+			if (size <= 24)
+				using (new PerfTimer("Precache {0} {1}px".F(name, size)))
+					for (var n = (char)0x20; n < (char)0x7f; n++)
+						if (glyphs[n] == null)
+							throw new InvalidOperationException();
+
+			TopOffset = size - ascender;
 		}
 
 		public void SetScale(float scale)
 		{
 			deviceScale = scale;
-			face.SetPixelSizes((uint)(size * deviceScale), (uint)(size * deviceScale));
 			glyphs.Clear();
+			contrastGlyphs.Clear();
 		}
 
-		void PrecacheColor(Color c, string name)
+		void DrawTextContrast(string text, float2 location, Color contrastColor, int contrastOffset)
 		{
-			using (new PerfTimer("PrecacheColor {0} {1}px {2}".F(name, size, c.Name)))
-				for (var n = (char)0x20; n < (char)0x7f; n++)
-					if (glyphs[Pair.New(n, c)] == null)
-						throw new InvalidOperationException();
-		}
+			// Offset from the baseline position to the top-left of the glyph for rendering
+			location += new float2(0, size);
 
-		public void DrawText(string text, float2 location, Color c)
-		{
-			location.Y += size;	// baseline vs top
-
-			var p = location;
+			// 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);
+			var tint = new float3(contrastColor.R / 255f, contrastColor.G / 255f, contrastColor.B / 255f);
 			foreach (var s in text)
 			{
 				if (s == '\n')
 				{
-					location.Y += size;
-					p = location;
+					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, c)];
-				Game.Renderer.RgbaSpriteRenderer.DrawSprite(g.Sprite,
-					new float2(
-						(int)Math.Round(p.X * deviceScale + g.Offset.X, 0) / deviceScale,
-						p.Y + g.Offset.Y / deviceScale),
-						g.Sprite.Size / deviceScale);
-				p.X += g.Advance / deviceScale;
+				var g = glyphs[s];
+
+				// Convert screen coordinates back to UI coordinates for drawing
+				if (g.Sprite != null)
+				{
+					var contrastSprite = contrastGlyphs[(s, screenContrast)];
+					Game.Renderer.RgbaSpriteRenderer.DrawSpriteWithTint(contrastSprite,
+						(screen + g.Offset - contrastVector) / deviceScale,
+						contrastSprite.Size / deviceScale,
+						tint);
+				}
+
+				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 tint = new float3(c.R / 255f, c.G / 255f, c.B / 255f);
+			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[s];
+
+				// Convert screen coordinates back to UI coordinates for drawing
+				if (g.Sprite != null)
+					Game.Renderer.RgbaSpriteRenderer.DrawSpriteWithTint(g.Sprite,
+					(screen + g.Offset).ToFloat2() / deviceScale,
+					g.Sprite.Size / deviceScale,
+					tint);
+
+				screen += new int2((int)(g.Advance + 0.5f), 0);
+			}
+		}
+
+		float2 Rotate(float2 v, float sina, float cosa, float2 offset)
+		{
+			return new float2(
+				v.X * cosa - v.Y * sina + offset.X,
+				v.X * sina + v.Y * cosa + offset.Y);
+		}
+
+		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);
+			var tint = new float3(c.R / 255f, c.G / 255f, c.B / 255f);
+
+			var p = offset;
+			foreach (var s in text)
+			{
+				if (s == '\n')
+				{
+					offset += new float2(0, size);
+					p = offset;
+					continue;
+				}
+
+				var g = glyphs[s];
+				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 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.DrawSpriteWithTint(g.Sprite,
+						ra + screenOffset,
+						rb + screenOffset,
+						rc + screenOffset,
+						rd + screenOffset,
+						tint);
+				}
+
+				p += new float2(g.Advance / deviceScale, 0);
 			}
 		}
 
 		public void DrawTextWithContrast(string text, float2 location, Color fg, Color bg, int offset)
 		{
 			if (offset > 0)
-			{
-				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);
-			}
+				DrawTextContrast(text, location, bg, offset);
 
 			DrawText(text, location, fg);
 		}
 
 		public void DrawTextWithContrast(string text, float2 location, Color fg, Color bgDark, Color bgLight, int offset)
 		{
-			DrawTextWithContrast(text, location, fg, WidgetUtils.GetContrastColor(fg, bgDark, bgLight), offset);
+			DrawTextWithContrast(text, location, fg, GetContrastColor(fg, bgDark, bgLight), offset);
 		}
 
 		public void DrawTextWithShadow(string text, float2 location, Color fg, Color bg, int offset)
 		{
 			if (offset != 0)
-				DrawText(text, location + new float2(offset, offset), bg);
+			{
+				// 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, fg);
 		}
 
 		public void DrawTextWithShadow(string text, float2 location, Color fg, Color bgDark, Color bgLight, int offset)
 		{
-			DrawTextWithShadow(text, location, fg, WidgetUtils.GetContrastColor(fg, bgDark, bgLight), offset);
+			DrawTextWithShadow(text, location, fg, GetContrastColor(fg, bgDark, bgLight), offset);
+		}
+
+		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, fg, angle);
+		}
+
+		public void DrawTextWithShadow(string text, float2 location, Color fg, Color bgDark, Color bgLight, int offset, float angle)
+		{
+			DrawTextWithShadow(text, location, fg, GetContrastColor(fg, bgDark, bgLight), offset, angle);
 		}
 
 		public int2 Measure(string text)
@@ -132,47 +242,42 @@ namespace OpenRA.Graphics
 			return new int2((int)Math.Ceiling(lines.Max(lineWidth)), lines.Length * size);
 		}
 
-		GlyphInfo CreateGlyph(Pair<char, Color> c)
+		GlyphInfo CreateGlyph(char c)
 		{
-			face.LoadChar(c.First, LoadFlags.Default, LoadTarget.Normal);
-			face.Glyph.RenderGlyph(RenderMode.Normal);
-
-			var size = new Size((int)face.Glyph.Metrics.Width, (int)face.Glyph.Metrics.Height);
-			var s = builder.Allocate(size);
+			var glyph = font.CreateGlyph(c, size, deviceScale);
+			if (glyph.Data == null)
+			{
+				return new GlyphInfo
+				{
+					Sprite = null,
+					Advance = 0,
+					Offset = int2.Zero
+				};
+			}
 
+			var s = builder.Allocate(glyph.Size);
 			var g = new GlyphInfo
 			{
 				Sprite = s,
-				Advance = (float)face.Glyph.Metrics.HorizontalAdvance,
-				Offset = new int2(face.Glyph.BitmapLeft, -face.Glyph.BitmapTop)
+				Advance = glyph.Advance,
+				Offset = glyph.Offset
 			};
 
-			// A new bitmap is generated each time this property is accessed, so we do need to dispose it.
-			using (var bitmap = face.Glyph.Bitmap)
+			var dest = s.Sheet.GetData();
+			var destStride = s.Sheet.Size.Width * 4;
+
+			for (var j = 0; j < s.Size.Y; j++)
 			{
-				unsafe
+				for (var i = 0; i < s.Size.X; i++)
 				{
-					var p = (byte*)bitmap.Buffer;
-					var dest = s.Sheet.GetData();
-					var destStride = s.Sheet.Size.Width * 4;
-
-					for (var j = 0; j < s.Size.Y; j++)
+					var p = glyph.Data[j * glyph.Size.Width + i];
+					if (p != 0)
 					{
-						for (var i = 0; i < s.Size.X; i++)
-						{
-							if (p[i] != 0)
-							{
-								var q = destStride * (j + s.Bounds.Top) + 4 * (i + s.Bounds.Left);
-								var pmc = Util.PremultiplyAlpha(Color.FromArgb(p[i], c.Second));
-
-								dest[q] = pmc.B;
-								dest[q + 1] = pmc.G;
-								dest[q + 2] = pmc.R;
-								dest[q + 3] = pmc.A;
-							}
-						}
-
-						p += bitmap.Pitch;
+						var q = destStride * (j + s.Bounds.Top) + 4 * (i + s.Bounds.Left);
+						dest[q] = p;
+						dest[q + 1] = p;
+						dest[q + 2] = p;
+						dest[q + 3] = p;
 					}
 				}
 			}
@@ -182,9 +287,131 @@ 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((char C, int Radius) c)
+		{
+			var glyph = glyphs[c.C];
+			var r = c.Radius;
+
+			var s = builder.Allocate(new Size(glyph.Sprite.Bounds.Width + 2 * r, glyph.Sprite.Bounds.Height + 2 * r));
+			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);
+						dest[q] = alpha;
+						dest[q + 1] = alpha;
+						dest[q + 2] = alpha;
+						dest[q + 3] = alpha;
+					}
+				}
+			}
+
+			s.Sheet.CommitBufferedData();
+			return s;
+		}
+
+		static Color GetContrastColor(Color fgColor, Color bgDark, Color bgLight)
+		{
+			return fgColor == Color.White || fgColor.GetBrightness() > 0.33 ? bgDark : bgLight;
+		}
+
 		public void Dispose()
 		{
-			face.Dispose();
+			font.Dispose();
 		}
 	}
 

OpenRA.Game/Graphics/SpriteLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -9,8 +9,8 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using OpenRA.FileSystem;
@@ -18,13 +18,17 @@ using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
+	public enum SpriteFrameType { Indexed, BGRA }
+
 	public interface ISpriteLoader
 	{
-		bool TryParseSprite(Stream s, out ISpriteFrame[] frames);
+		bool TryParseSprite(Stream s, out ISpriteFrame[] frames, out TypeDictionary metadata);
 	}
 
 	public interface ISpriteFrame
 	{
+		SpriteFrameType Type { get; }
+
 		/// <summary>
 		/// Size of the frame's `Data`.
 		/// </summary>
@@ -43,47 +47,89 @@ namespace OpenRA.Graphics
 
 	public class SpriteCache
 	{
-		public readonly SheetBuilder SheetBuilder;
+		public readonly Cache<SpriteFrameType, SheetBuilder> SheetBuilders;
 		readonly ISpriteLoader[] loaders;
 		readonly IReadOnlyFileSystem fileSystem;
 
 		readonly Dictionary<string, List<Sprite[]>> sprites = new Dictionary<string, List<Sprite[]>>();
+		readonly Dictionary<string, ISpriteFrame[]> unloadedFrames = new Dictionary<string, ISpriteFrame[]>();
+		readonly Dictionary<string, TypeDictionary> metadata = new Dictionary<string, TypeDictionary>();
 
-		public SpriteCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders, SheetBuilder sheetBuilder)
+		public SpriteCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders)
 		{
-			SheetBuilder = sheetBuilder;
+			SheetBuilders = new Cache<SpriteFrameType, SheetBuilder>(t => new SheetBuilder(SheetBuilder.FrameTypeToSheetType(t)));
+
 			this.fileSystem = fileSystem;
 			this.loaders = loaders;
 		}
 
-		Sprite[] LoadSprite(string filename, List<Sprite[]> cache)
-		{
-			var sprite = SpriteLoader.GetSprites(fileSystem, filename, loaders, SheetBuilder);
-			cache.Add(sprite);
-			return sprite;
-		}
-
-		/// <summary>Returns the first set of sprites with the given filename.</summary>
-		public Sprite[] this[string filename]
+		/// <summary>
+		/// Returns the first set of sprites with the given filename.
+		/// If getUsedFrames is defined then the indices returned by the function call
+		/// are guaranteed to be loaded.  The value of other indices in the returned
+		/// array are undefined and should never be accessed.
+		/// </summary>
+		public Sprite[] this[string filename, Func<int, IEnumerable<int>> getUsedFrames = null]
 		{
 			get
 			{
 				var allSprites = sprites.GetOrAdd(filename);
 				var sprite = allSprites.FirstOrDefault();
-				return sprite ?? LoadSprite(filename, allSprites);
+
+				if (!unloadedFrames.TryGetValue(filename, out var unloaded))
+					unloaded = null;
+
+				// This is the first time that the file has been requested
+				// Load all of the frames into the unused buffer and initialize
+				// the loaded cache (initially empty)
+				if (sprite == null)
+				{
+					unloaded = FrameLoader.GetFrames(fileSystem, filename, loaders, out var fileMetadata);
+					unloadedFrames[filename] = unloaded;
+					metadata[filename] = fileMetadata;
+
+					sprite = new Sprite[unloaded.Length];
+					allSprites.Add(sprite);
+				}
+
+				// HACK: The sequence code relies on side-effects from getUsedFrames
+				var indices = getUsedFrames != null ? getUsedFrames(sprite.Length) :
+					Enumerable.Range(0, sprite.Length);
+
+				// Load any unused frames into the SheetBuilder
+				if (unloaded != null)
+				{
+					foreach (var i in indices)
+					{
+						if (unloaded[i] != null)
+						{
+							sprite[i] = SheetBuilders[unloaded[i].Type].Add(unloaded[i]);
+							unloaded[i] = null;
+						}
+					}
+
+					// All frames have been loaded
+					if (unloaded.All(f => f == null))
+						unloadedFrames.Remove(filename);
+				}
+
+				return sprite;
 			}
 		}
 
-		/// <summary>Returns all instances of sets of sprites with the given filename</summary>
-		public IEnumerable<Sprite[]> AllCached(string filename)
+		/// <summary>
+		/// Returns a TypeDictionary containing any metadata defined by the frame
+		/// or null if the frame does not define metadata.
+		/// </summary>
+		public TypeDictionary FrameMetadata(string filename)
 		{
-			return sprites.GetOrAdd(filename);
-		}
+			if (!metadata.TryGetValue(filename, out var fileMetadata))
+			{
+				FrameLoader.GetFrames(fileSystem, filename, loaders, out fileMetadata);
+				metadata[filename] = fileMetadata;
+			}
 
-		/// <summary>Loads and caches a new instance of sprites with the given filename</summary>
-		public Sprite[] Reload(string filename)
-		{
-			return LoadSprite(filename, sprites.GetOrAdd(filename));
+			return fileMetadata;
 		}
 	}
 
@@ -93,24 +139,19 @@ namespace OpenRA.Graphics
 
 		public FrameCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders)
 		{
-			frames = new Cache<string, ISpriteFrame[]>(filename => SpriteLoader.GetFrames(fileSystem, filename, loaders));
+			frames = new Cache<string, ISpriteFrame[]>(filename => FrameLoader.GetFrames(fileSystem, filename, loaders, out _));
 		}
 
 		public ISpriteFrame[] this[string filename] { get { return frames[filename]; } }
 	}
 
-	public static class SpriteLoader
+	public static class FrameLoader
 	{
-		public static Sprite[] GetSprites(IReadOnlyFileSystem fileSystem, string filename, ISpriteLoader[] loaders, SheetBuilder sheetBuilder)
-		{
-			return GetFrames(fileSystem, filename, loaders).Select(a => sheetBuilder.Add(a)).ToArray();
-		}
-
-		public static ISpriteFrame[] GetFrames(IReadOnlyFileSystem fileSystem, string filename, ISpriteLoader[] loaders)
+		public static ISpriteFrame[] GetFrames(IReadOnlyFileSystem fileSystem, string filename, ISpriteLoader[] loaders, out TypeDictionary metadata)
 		{
 			using (var stream = fileSystem.Open(filename))
 			{
-				var spriteFrames = GetFrames(stream, loaders);
+				var spriteFrames = GetFrames(stream, loaders, out metadata);
 				if (spriteFrames == null)
 					throw new InvalidDataException(filename + " is not a valid sprite file!");
 
@@ -118,11 +159,12 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public static ISpriteFrame[] GetFrames(Stream stream, ISpriteLoader[] loaders)
+		public static ISpriteFrame[] GetFrames(Stream stream, ISpriteLoader[] loaders, out TypeDictionary metadata)
 		{
-			ISpriteFrame[] frames;
+			metadata = null;
+
 			foreach (var loader in loaders)
-				if (loader.TryParseSprite(stream, out frames))
+				if (loader.TryParseSprite(stream, out var frames, out metadata))
 					return frames;
 
 			return null;

OpenRA.Game/Graphics/SpriteRenderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -10,14 +10,13 @@
 #endregion
 
 using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
-	public struct SpriteRenderable : IRenderable, IFinalizedRenderable
+	public struct SpriteRenderable : IRenderable, ITintableRenderable, IFinalizedRenderable
 	{
-		public static readonly IEnumerable<IRenderable> None = new IRenderable[0].AsEnumerable();
+		public static readonly IEnumerable<IRenderable> None = new IRenderable[0];
 
 		readonly Sprite sprite;
 		readonly WPos pos;
@@ -25,9 +24,17 @@ namespace OpenRA.Graphics
 		readonly int zOffset;
 		readonly PaletteReference palette;
 		readonly float scale;
+		readonly float3 tint;
 		readonly bool isDecoration;
+		readonly bool ignoreWorldTint;
 
 		public SpriteRenderable(Sprite sprite, WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale, bool isDecoration)
+			: this(sprite, pos, offset, zOffset, palette, scale, float3.Ones, isDecoration, false) { }
+
+		public SpriteRenderable(Sprite sprite, WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale, bool isDecoration, bool ignoreWorldTint)
+			: this(sprite, pos, offset, zOffset, palette, scale, float3.Ones, isDecoration, ignoreWorldTint) { }
+
+		public SpriteRenderable(Sprite sprite, WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale, float3 tint, bool isDecoration, bool ignoreWorldTint)
 		{
 			this.sprite = sprite;
 			this.pos = pos;
@@ -35,7 +42,9 @@ namespace OpenRA.Graphics
 			this.zOffset = zOffset;
 			this.palette = palette;
 			this.scale = scale;
+			this.tint = tint;
 			this.isDecoration = isDecoration;
+			this.ignoreWorldTint = ignoreWorldTint;
 		}
 
 		public WPos Pos { get { return pos + offset; } }
@@ -44,10 +53,12 @@ namespace OpenRA.Graphics
 		public int ZOffset { get { return zOffset; } }
 		public bool IsDecoration { get { return isDecoration; } }
 
-		public IRenderable WithPalette(PaletteReference newPalette) { return new SpriteRenderable(sprite, pos, offset, zOffset, newPalette, scale, isDecoration); }
-		public IRenderable WithZOffset(int newOffset) { return new SpriteRenderable(sprite, pos, offset, newOffset, palette, scale, isDecoration); }
-		public IRenderable OffsetBy(WVec vec) { return new SpriteRenderable(sprite, pos + vec, offset, zOffset, palette, scale, isDecoration); }
-		public IRenderable AsDecoration() { return new SpriteRenderable(sprite, pos, offset, zOffset, palette, scale, true); }
+		public IRenderable WithPalette(PaletteReference newPalette) { return new SpriteRenderable(sprite, pos, offset, zOffset, newPalette, scale, tint, isDecoration, ignoreWorldTint); }
+		public IRenderable WithZOffset(int newOffset) { return new SpriteRenderable(sprite, pos, offset, newOffset, palette, scale, tint, isDecoration, ignoreWorldTint); }
+		public IRenderable OffsetBy(WVec vec) { return new SpriteRenderable(sprite, pos + vec, offset, zOffset, palette, scale, tint, isDecoration, ignoreWorldTint); }
+		public IRenderable AsDecoration() { return new SpriteRenderable(sprite, pos, offset, zOffset, palette, scale, tint, true, ignoreWorldTint); }
+
+		public IRenderable WithTint(float3 newTint) { return new SpriteRenderable(sprite, pos, offset, zOffset, palette, scale, newTint, isDecoration, ignoreWorldTint); }
 
 		float3 ScreenPosition(WorldRenderer wr)
 		{
@@ -60,13 +71,25 @@ namespace OpenRA.Graphics
 		public IFinalizedRenderable PrepareRender(WorldRenderer wr) { return this; }
 		public void Render(WorldRenderer wr)
 		{
-			Game.Renderer.WorldSpriteRenderer.DrawSprite(sprite, ScreenPosition(wr), palette, scale * sprite.Size);
+			var wsr = Game.Renderer.WorldSpriteRenderer;
+			if (ignoreWorldTint)
+				wsr.DrawSprite(sprite, ScreenPosition(wr), palette, scale * sprite.Size);
+			else
+			{
+				var t = tint;
+				if (wr.TerrainLighting != null)
+					t *= wr.TerrainLighting.TintAt(pos);
+
+				wsr.DrawSpriteWithTint(sprite, ScreenPosition(wr), palette, scale * sprite.Size, t);
+			}
 		}
 
 		public void RenderDebugGeometry(WorldRenderer wr)
 		{
-			var screenOffset = ScreenPosition(wr) + sprite.Offset;
-			Game.Renderer.WorldRgbaColorRenderer.DrawRect(screenOffset, screenOffset + sprite.Size, 1 / wr.Viewport.Zoom, Color.Red);
+			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);
 		}
 
 		public Rectangle ScreenBounds(WorldRenderer wr)

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -10,7 +10,7 @@
 #endregion
 
 using System;
-using System.Drawing;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -18,45 +18,97 @@ namespace OpenRA.Graphics
 	{
 		readonly Renderer renderer;
 		readonly IShader shader;
-		readonly Action renderAction;
 
 		readonly Vertex[] vertices;
-		Sheet currentSheet;
+		readonly Sheet[] sheets = new Sheet[7];
+
 		BlendMode currentBlend = BlendMode.Alpha;
 		int nv = 0;
+		int ns = 0;
 
 		public SpriteRenderer(Renderer renderer, IShader shader)
 		{
 			this.renderer = renderer;
 			this.shader = shader;
 			vertices = new Vertex[renderer.TempBufferSize];
-			renderAction = () => renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList);
 		}
 
 		public void Flush()
 		{
 			if (nv > 0)
 			{
-				shader.SetTexture("DiffuseTexture", currentSheet.GetTexture());
+				for (var i = 0; i < ns; i++)
+				{
+					shader.SetTexture("Texture{0}".F(i), sheets[i].GetTexture());
+					sheets[i] = null;
+				}
 
-				renderer.Device.SetBlendMode(currentBlend);
-				shader.Render(renderAction);
-				renderer.Device.SetBlendMode(BlendMode.None);
+				renderer.Context.SetBlendMode(currentBlend);
+				shader.PrepareRender();
+				renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList);
+				renderer.Context.SetBlendMode(BlendMode.None);
 
 				nv = 0;
-				currentSheet = null;
+				ns = 0;
 			}
 		}
 
-		void SetRenderStateForSprite(Sprite s)
+		int2 SetRenderStateForSprite(Sprite s)
 		{
 			renderer.CurrentBatchRenderer = this;
 
-			if (s.BlendMode != currentBlend || s.Sheet != currentSheet || nv + 6 > renderer.TempBufferSize)
+			if (s.BlendMode != currentBlend || nv + 6 > renderer.TempBufferSize)
 				Flush();
 
 			currentBlend = s.BlendMode;
-			currentSheet = s.Sheet;
+
+			// Check if the sheet (or secondary data sheet) have already been mapped
+			var sheet = s.Sheet;
+			var sheetIndex = 0;
+			for (; sheetIndex < ns; sheetIndex++)
+				if (sheets[sheetIndex] == sheet)
+					break;
+
+			var secondarySheetIndex = 0;
+			var ss = s as SpriteWithSecondaryData;
+			if (ss != null)
+			{
+				var secondarySheet = ss.SecondarySheet;
+				for (; secondarySheetIndex < ns; secondarySheetIndex++)
+					if (sheets[secondarySheetIndex] == secondarySheet)
+						break;
+			}
+
+			// Make sure that we have enough free samplers to map both if needed, otherwise flush
+			var needSamplers = (sheetIndex == ns ? 1 : 0) + (secondarySheetIndex == ns ? 1 : 0);
+			if (ns + needSamplers >= sheets.Length)
+			{
+				Flush();
+				sheetIndex = 0;
+				if (ss != null)
+					secondarySheetIndex = 1;
+			}
+
+			if (sheetIndex >= ns)
+			{
+				sheets[sheetIndex] = sheet;
+				ns += 1;
+			}
+
+			if (secondarySheetIndex >= ns && ss != null)
+			{
+				sheets[secondarySheetIndex] = ss.SecondarySheet;
+				ns += 1;
+			}
+
+			return new int2(sheetIndex, secondarySheetIndex);
+		}
+
+		internal void DrawSprite(Sprite s, float3 location, float paletteTextureIndex, float3 size)
+		{
+			var samplers = SetRenderStateForSprite(s);
+			Util.FastCreateQuad(vertices, location + s.FractionalOffset * size, s, samplers, paletteTextureIndex, nv, size, float3.Ones);
+			nv += 6;
 		}
 
 		public void DrawSprite(Sprite s, float3 location, PaletteReference pal)
@@ -69,44 +121,52 @@ namespace OpenRA.Graphics
 			DrawSprite(s, location, pal.TextureIndex, size);
 		}
 
-		void DrawSprite(Sprite s, float3 location, float paletteTextureIndex, float3 size)
-		{
-			SetRenderStateForSprite(s);
-			Util.FastCreateQuad(vertices, location + s.FractionalOffset * size, s, paletteTextureIndex, nv, size);
-			nv += 6;
-		}
-
-		// For RGBASpriteRenderer, which doesn't use palettes
-		public void DrawSprite(Sprite s, float3 location)
-		{
-			DrawSprite(s, location, 0, s.Size);
-		}
-
-		public void DrawSprite(Sprite s, float3 location, float3 size)
-		{
-			DrawSprite(s, location, 0, size);
-		}
-
 		public void DrawSprite(Sprite s, float3 a, float3 b, float3 c, float3 d)
 		{
-			SetRenderStateForSprite(s);
-			Util.FastCreateQuad(vertices, a, b, c, d, s, 0, nv);
+			var samplers = SetRenderStateForSprite(s);
+			Util.FastCreateQuad(vertices, a, b, c, d, s, samplers, 0, float3.Ones, nv);
 			nv += 6;
 		}
 
-		public void DrawSprite(Sprite s, Vertex[] sourceVertices, int offset)
+		internal void DrawSpriteWithTint(Sprite s, float3 location, float paletteTextureIndex, float3 size, float3 tint)
 		{
-			SetRenderStateForSprite(s);
-			Array.Copy(sourceVertices, offset, vertices, nv, 6);
+			var samplers = SetRenderStateForSprite(s);
+			Util.FastCreateQuad(vertices, location + s.FractionalOffset * size, s, samplers, paletteTextureIndex, nv, size, tint);
+			nv += 6;
+		}
+
+		public void DrawSpriteWithTint(Sprite s, float3 location, PaletteReference pal, float3 size, float3 tint)
+		{
+			DrawSpriteWithTint(s, location, pal.TextureIndex, size, tint);
+		}
+
+		public void DrawSpriteWithTint(Sprite s, float3 a, float3 b, float3 c, float3 d, float3 tint)
+		{
+			var samplers = SetRenderStateForSprite(s);
+			Util.FastCreateQuad(vertices, a, b, c, d, s, samplers, 0, tint, nv);
 			nv += 6;
 		}
 
 		public void DrawVertexBuffer(IVertexBuffer<Vertex> buffer, int start, int length, PrimitiveType type, Sheet sheet, BlendMode blendMode)
 		{
-			shader.SetTexture("DiffuseTexture", sheet.GetTexture());
-			renderer.Device.SetBlendMode(blendMode);
-			shader.Render(() => renderer.DrawBatch(buffer, start, length, type));
-			renderer.Device.SetBlendMode(BlendMode.None);
+			shader.SetTexture("Texture0", sheet.GetTexture());
+			renderer.Context.SetBlendMode(blendMode);
+			shader.PrepareRender();
+			renderer.DrawBatch(buffer, start, length, type);
+			renderer.Context.SetBlendMode(BlendMode.None);
+		}
+
+		// For RGBAColorRenderer
+		internal void DrawRGBAVertices(Vertex[] v)
+		{
+			renderer.CurrentBatchRenderer = this;
+
+			if (currentBlend != BlendMode.Alpha || nv + v.Length > renderer.TempBufferSize)
+				Flush();
+
+			currentBlend = BlendMode.Alpha;
+			Array.Copy(v, 0, vertices, nv, v.Length);
+			nv += v.Length;
 		}
 
 		public void SetPalette(ITexture palette)
@@ -114,22 +174,27 @@ namespace OpenRA.Graphics
 			shader.SetTexture("Palette", palette);
 		}
 
-		public void SetViewportParams(Size screen, float depthScale, float depthOffset, float zoom, int2 scroll)
+		public void SetViewportParams(Size screen, float depthScale, float depthOffset, int2 scroll)
 		{
 			shader.SetVec("Scroll", scroll.X, scroll.Y, scroll.Y);
 			shader.SetVec("r1",
-				zoom * 2f / screen.Width,
-				-zoom * 2f / screen.Height,
-				-depthScale * zoom / screen.Height);
-			shader.SetVec("r2", -1, 1, 1 - depthOffset);
+				2f / screen.Width,
+				2f / screen.Height,
+				-depthScale / screen.Height);
+			shader.SetVec("r2", -1, -1, 1 - depthOffset);
 
 			// Texture index is sampled as a float, so convert to pixels then scale
-			shader.SetVec("DepthTextureScale", 128 * depthScale * zoom / screen.Height);
+			shader.SetVec("DepthTextureScale", 128 * depthScale / 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-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -10,8 +10,8 @@
 #endregion
 
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -19,11 +19,15 @@ namespace OpenRA.Graphics
 	{
 		readonly IEnumerable<WPos> waypoints;
 		readonly Color color;
+		readonly int width;
+		readonly int markerSize;
 
-		public TargetLineRenderable(IEnumerable<WPos> waypoints, Color color)
+		public TargetLineRenderable(IEnumerable<WPos> waypoints, Color color, int width = 1, int markerSize = 1)
 		{
 			this.waypoints = waypoints;
 			this.color = color;
+			this.width = width;
+			this.markerSize = markerSize;
 		}
 
 		public WPos Pos { get { return waypoints.First(); } }
@@ -42,26 +46,24 @@ namespace OpenRA.Graphics
 			if (!waypoints.Any())
 				return;
 
-			var iz = 1 / wr.Viewport.Zoom;
-			var first = wr.Screen3DPosition(waypoints.First());
+			var first = wr.Viewport.WorldToViewPx(wr.Screen3DPosition(waypoints.First()));
 			var a = first;
-			foreach (var b in waypoints.Skip(1).Select(pos => wr.Screen3DPosition(pos)))
+			foreach (var b in waypoints.Skip(1).Select(pos => wr.Viewport.WorldToViewPx(wr.Screen3DPosition(pos))))
 			{
-				Game.Renderer.WorldRgbaColorRenderer.DrawLine(a, b, iz, color);
-				DrawTargetMarker(wr, color, b);
+				Game.Renderer.RgbaColorRenderer.DrawLine(a, b, width, color);
+				DrawTargetMarker(wr, color, b, markerSize);
 				a = b;
 			}
 
 			DrawTargetMarker(wr, color, first);
 		}
 
-		public static void DrawTargetMarker(WorldRenderer wr, Color color, float3 location)
+		public static void DrawTargetMarker(WorldRenderer wr, Color color, int2 screenPos, int size = 1)
 		{
-			var iz = 1 / wr.Viewport.Zoom;
-			var offset = new float2(iz, iz);
-			var tl = location - offset;
-			var br = location + offset;
-			Game.Renderer.WorldRgbaColorRenderer.FillRect(tl, br, color);
+			var offset = new int2(size, size);
+			var tl = screenPos - offset;
+			var br = screenPos + offset;
+			Game.Renderer.RgbaColorRenderer.FillRect(tl, br, color);
 		}
 
 		public void RenderDebugGeometry(WorldRenderer wr) { }

OpenRA.Game/Graphics/TerrainSpriteLayer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -11,13 +11,15 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
 	public sealed class TerrainSpriteLayer : IDisposable
 	{
+		static readonly int[] CornerVertexMap = { 0, 1, 2, 2, 3, 0 };
+
 		public readonly Sheet Sheet;
 		public readonly BlendMode BlendMode;
 
@@ -25,6 +27,7 @@ namespace OpenRA.Graphics
 
 		readonly IVertexBuffer<Vertex> vertexBuffer;
 		readonly Vertex[] vertices;
+		readonly bool[] ignoreTint;
 		readonly HashSet<int> dirtyRows = new HashSet<int>();
 		readonly int rowStride;
 		readonly bool restrictToBounds;
@@ -46,10 +49,16 @@ namespace OpenRA.Graphics
 			rowStride = 6 * map.MapSize.X;
 
 			vertices = new Vertex[rowStride * map.MapSize.Y];
-			vertexBuffer = Game.Renderer.Device.CreateVertexBuffer(vertices.Length);
+			vertexBuffer = Game.Renderer.Context.CreateVertexBuffer(vertices.Length);
 			emptySprite = new Sprite(sheet, Rectangle.Empty, TextureChannel.Alpha);
 
 			wr.PaletteInvalidated += UpdatePaletteIndices;
+
+			if (wr.TerrainLighting != null)
+			{
+				ignoreTint = new bool[rowStride * map.MapSize.Y];
+				wr.TerrainLighting.CellChanged += UpdateTint;
+			}
 		}
 
 		void UpdatePaletteIndices()
@@ -59,22 +68,76 @@ namespace OpenRA.Graphics
 			for (var i = 0; i < vertices.Length; i++)
 			{
 				var v = vertices[i];
-				vertices[i] = new Vertex(v.X, v.Y, v.Z, v.S, v.T, v.U, v.V, palette.TextureIndex, v.C);
+				vertices[i] = new Vertex(v.X, v.Y, v.Z, v.S, v.T, v.U, v.V, palette.TextureIndex, v.C, v.R, v.G, v.B);
 			}
 
 			for (var row = 0; row < map.MapSize.Y; row++)
 				dirtyRows.Add(row);
 		}
 
-		public void Update(CPos cell, Sprite sprite)
+		public void Clear(CPos cell)
 		{
-			var xyz = sprite == null ? float3.Zero :
-				worldRenderer.Screen3DPosition(map.CenterOfCell(cell)) + sprite.Offset - 0.5f * sprite.Size;
-
-			Update(cell.ToMPos(map.Grid.Type), sprite, xyz);
+			Update(cell, null, true);
 		}
 
-		public void Update(MPos uv, Sprite sprite, float3 pos)
+		public void Update(CPos cell, ISpriteSequence sequence, int frame)
+		{
+			Update(cell, sequence.GetSprite(frame), sequence.IgnoreWorldTint);
+		}
+
+		public void Update(CPos cell, Sprite sprite, bool ignoreTint)
+		{
+			var xyz = float3.Zero;
+			if (sprite != null)
+			{
+				var cellOrigin = map.CenterOfCell(cell) - new WVec(0, 0, map.Grid.Ramps[map.Ramp[cell]].CenterHeightOffset);
+				xyz = worldRenderer.Screen3DPosition(cellOrigin) + sprite.Offset - 0.5f * sprite.Size;
+			}
+
+			Update(cell.ToMPos(map.Grid.Type), sprite, xyz, ignoreTint);
+		}
+
+		void UpdateTint(MPos uv)
+		{
+			var offset = rowStride * uv.V + 6 * uv.U;
+			if (ignoreTint[offset])
+			{
+				var noTint = float3.Ones;
+				for (var i = 0; i < 6; i++)
+				{
+					var v = vertices[offset + i];
+					vertices[offset + i] = new Vertex(v.X, v.Y, v.Z, v.S, v.T, v.U, v.V, palette.TextureIndex, v.C, noTint);
+				}
+
+				return;
+			}
+
+			// Allow the terrain tint to vary linearly across the cell to smooth out the staircase effect
+			// This is done by sampling the lighting the corners of the sprite, even though those pixels are
+			// transparent for isometric tiles
+			var tl = worldRenderer.TerrainLighting;
+			var pos = map.CenterOfCell(uv.ToCPos(map));
+			var step = map.Grid.Type == MapGridType.RectangularIsometric ? 724 : 512;
+			var weights = new[]
+			{
+				tl.TintAt(pos + new WVec(-step, -step, 0)),
+				tl.TintAt(pos + new WVec(step, -step, 0)),
+				tl.TintAt(pos + new WVec(step, step, 0)),
+				tl.TintAt(pos + new WVec(-step, step, 0))
+			};
+
+			// Apply tint directly to the underlying vertices
+			// This saves us from having to re-query the sprite information, which has not changed
+			for (var i = 0; i < 6; i++)
+			{
+				var v = vertices[offset + i];
+				vertices[offset + i] = new Vertex(v.X, v.Y, v.Z, v.S, v.T, v.U, v.V, palette.TextureIndex, v.C, weights[CornerVertexMap[i]]);
+			}
+
+			dirtyRows.Add(uv.V);
+		}
+
+		public void Update(MPos uv, Sprite sprite, float3 pos, bool ignoreTint)
 		{
 			if (sprite != null)
 			{
@@ -92,7 +155,13 @@ namespace OpenRA.Graphics
 				return;
 
 			var offset = rowStride * uv.V + 6 * uv.U;
-			Util.FastCreateQuad(vertices, pos, sprite, palette.TextureIndex, offset, sprite.Size);
+			Util.FastCreateQuad(vertices, pos, sprite, int2.Zero, palette.TextureIndex, offset, sprite.Size, float3.Ones);
+
+			if (worldRenderer.TerrainLighting != null)
+			{
+				this.ignoreTint[offset] = ignoreTint;
+				UpdateTint(uv);
+			}
 
 			dirtyRows.Add(uv.V);
 		}
@@ -135,6 +204,9 @@ namespace OpenRA.Graphics
 		public void Dispose()
 		{
 			worldRenderer.PaletteInvalidated -= UpdatePaletteIndices;
+			if (worldRenderer.TerrainLighting != null)
+				worldRenderer.TerrainLighting.CellChanged -= UpdateTint;
+
 			vertexBuffer.Dispose();
 		}
 	}

OpenRA.Game/Graphics/Theater.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -11,8 +11,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
+using System.IO;
 using System.Linq;
+using OpenRA.Primitives;
 using OpenRA.Support;
 
 namespace OpenRA.Graphics
@@ -34,7 +35,7 @@ namespace OpenRA.Graphics
 	public sealed class Theater : IDisposable
 	{
 		readonly Dictionary<ushort, TheaterTemplate> templates = new Dictionary<ushort, TheaterTemplate>();
-		readonly SheetBuilder sheetBuilder;
+		SheetBuilder sheetBuilder;
 		readonly Sprite missingTile;
 		readonly MersenneTwister random;
 		TileSet tileset;
@@ -53,7 +54,6 @@ 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,6 +75,15 @@ 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);
 
@@ -85,7 +94,7 @@ namespace OpenRA.Graphics
 
 							// s and ss are guaranteed to use the same sheet
 							// because of the custom terrain sheet allocation
-							s = new SpriteWithSecondaryData(s, ss.Bounds, ss.Channel);
+							s = new SpriteWithSecondaryData(s, s.Sheet, ss.Bounds, ss.Channel);
 						}
 
 						return s;
@@ -102,15 +111,14 @@ namespace OpenRA.Graphics
 			}
 
 			// 1x1px transparent tile
-			missingTile = sheetBuilder.Add(new byte[1], new Size(1, 1));
+			missingTile = sheetBuilder.Add(new byte[sheetBuilder.Type == SheetType.BGRA ? 4 : 1], new Size(1, 1));
 
 			Sheet.ReleaseBuffer();
 		}
 
 		public Sprite TileSprite(TerrainTile r, int? variant = null)
 		{
-			TheaterTemplate template;
-			if (!templates.TryGetValue(r.Type, out template))
+			if (!templates.TryGetValue(r.Type, out var template))
 				return missingTile;
 
 			if (r.Index >= template.Stride)

OpenRA.Game/Graphics/UISpriteRenderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -9,7 +9,7 @@
  */
 #endregion
 
-using System.Drawing;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {

OpenRA.Game/Graphics/Util.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -10,8 +10,8 @@
 #endregion
 
 using System;
-using System.Drawing;
-using System.Drawing.Imaging;
+using OpenRA.FileFormats;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -19,24 +19,28 @@ namespace OpenRA.Graphics
 	{
 		// yes, our channel order is nuts.
 		static readonly int[] ChannelMasks = { 2, 1, 0, 3 };
-		static readonly float[] ChannelSelect = { 0.2f, 0.4f, 0.6f, 0.8f };
 
-		public static void FastCreateQuad(Vertex[] vertices, float3 o, Sprite r, float paletteTextureIndex, int nv, float3 size)
+		public static void FastCreateQuad(Vertex[] vertices, float3 o, Sprite r, int2 samplers, float paletteTextureIndex, int nv, float3 size, float3 tint)
 		{
 			var b = new float3(o.X + size.X, o.Y, o.Z);
 			var c = new float3(o.X + size.X, o.Y + size.Y, o.Z + size.Z);
 			var d = new float3(o.X, o.Y + size.Y, o.Z + size.Z);
-			FastCreateQuad(vertices, o, b, c, d, r, paletteTextureIndex, nv);
+			FastCreateQuad(vertices, o, b, c, d, r, samplers, paletteTextureIndex, tint, nv);
 		}
 
-		public static void FastCreateQuad(Vertex[] vertices, float3 a, float3 b, float3 c, float3 d, Sprite r, float paletteTextureIndex, int nv)
+		public static void FastCreateQuad(Vertex[] vertices,
+			float3 a, float3 b, float3 c, float3 d,
+			Sprite r, int2 samplers, float paletteTextureIndex,
+			float3 tint, int nv)
 		{
 			float sl = 0;
 			float st = 0;
 			float sr = 0;
 			float sb = 0;
-			var attribC = ChannelSelect[(int)r.Channel];
 
+			// See shp.vert for documentation on the channel attribute format
+			var attribC = r.Channel == TextureChannel.RGBA ? 0x02 : ((byte)r.Channel) << 1 | 0x01;
+			attribC |= samplers.X << 6;
 			var ss = r as SpriteWithSecondaryData;
 			if (ss != null)
 			{
@@ -44,62 +48,31 @@ namespace OpenRA.Graphics
 				st = ss.SecondaryTop;
 				sr = ss.SecondaryRight;
 				sb = ss.SecondaryBottom;
-				attribC = -(attribC + ChannelSelect[(int)ss.SecondaryChannel] / 10);
+
+				attribC |= ((byte)ss.SecondaryChannel) << 4 | 0x08;
+				attribC |= samplers.Y << 9;
 			}
 
-			vertices[nv] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, attribC);
-			vertices[nv + 1] = new Vertex(b, r.Right, r.Top, sr, st, paletteTextureIndex, attribC);
-			vertices[nv + 2] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, attribC);
-			vertices[nv + 3] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, attribC);
-			vertices[nv + 4] = new Vertex(d, r.Left, r.Bottom, sl, sb, paletteTextureIndex, attribC);
-			vertices[nv + 5] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, attribC);
+			var fAttribC = (float)attribC;
+			vertices[nv] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, fAttribC, tint);
+			vertices[nv + 1] = new Vertex(b, r.Right, r.Top, sr, st, paletteTextureIndex, fAttribC, tint);
+			vertices[nv + 2] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, fAttribC, tint);
+			vertices[nv + 3] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, fAttribC, tint);
+			vertices[nv + 4] = new Vertex(d, r.Left, r.Bottom, sl, sb, paletteTextureIndex, fAttribC, tint);
+			vertices[nv + 5] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, fAttribC, tint);
 		}
 
 		public static void FastCopyIntoChannel(Sprite dest, byte[] src)
 		{
-			var data = dest.Sheet.GetData();
-			var srcStride = dest.Bounds.Width;
-			var destStride = dest.Sheet.Size.Width * 4;
-			var destOffset = destStride * dest.Bounds.Top + dest.Bounds.Left * 4 + ChannelMasks[(int)dest.Channel];
-			var destSkip = destStride - 4 * srcStride;
+			var destData = dest.Sheet.GetData();
+			var width = dest.Bounds.Width;
 			var height = dest.Bounds.Height;
 
-			var srcOffset = 0;
-			for (var j = 0; j < height; j++)
+			if (dest.Channel == TextureChannel.RGBA)
 			{
-				for (var i = 0; i < srcStride; i++, srcOffset++)
-				{
-					data[destOffset] = src[srcOffset];
-					destOffset += 4;
-				}
-
-				destOffset += destSkip;
-			}
-		}
-
-		public static void FastCopyIntoSprite(Sprite dest, Bitmap src)
-		{
-			var createdTempBitmap = false;
-			if (src.PixelFormat != PixelFormat.Format32bppArgb)
-			{
-				src = src.CloneWith32bbpArgbPixelFormat();
-				createdTempBitmap = true;
-			}
-
-			try
-			{
-				var destData = dest.Sheet.GetData();
 				var destStride = dest.Sheet.Size.Width;
-				var width = dest.Bounds.Width;
-				var height = dest.Bounds.Height;
-
-				var srcData = src.LockBits(src.Bounds(),
-					ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-
 				unsafe
 				{
-					var c = (int*)srcData.Scan0;
-
 					// Cast the data to an int array so we can copy the src data directly
 					fixed (byte* bd = &destData[0])
 					{
@@ -107,23 +80,80 @@ namespace OpenRA.Graphics
 						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 cc = Color.FromArgb(*(c + (j * srcData.Stride >> 2) + 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();
 							}
 						}
 					}
 				}
-
-				src.UnlockBits(srcData);
 			}
-			finally
+			else
 			{
-				if (createdTempBitmap)
-					src.Dispose();
+				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;
+				}
+			}
+		}
+
+		public static void FastCopyIntoSprite(Sprite dest, Png src)
+		{
+			var destData = dest.Sheet.GetData();
+			var destStride = dest.Sheet.Size.Width;
+			var width = dest.Bounds.Width;
+			var height = dest.Bounds.Height;
+
+			unsafe
+			{
+				// 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++)
+						{
+							Color cc;
+							if (src.Palette == null)
+							{
+								var r = src.Data[k++];
+								var g = src.Data[k++];
+								var b = src.Data[k++];
+								var a = src.Data[k++];
+								cc = Color.FromArgb(a, r, g, b);
+							}
+							else
+								cc = src.Palette[src.Data[k++]];
+
+							data[(y + j) * destStride + x + i] = PremultiplyAlpha(cc).ToArgb();
+						}
+					}
+				}
 			}
 		}
 
@@ -323,12 +353,31 @@ namespace OpenRA.Graphics
 			return mtx;
 		}
 
-		public static float[] MakeFloatMatrix(int[] imtx)
+		public static float[] MakeFloatMatrix(Int32Matrix4x4 imtx)
 		{
-			var fmtx = new float[16];
-			for (var i = 0; i < 16; i++)
-				fmtx[i] = imtx[i] * 1f / imtx[15];
-			return fmtx;
+			var multipler = 1f / imtx.M44;
+			return new[]
+			{
+				imtx.M11 * multipler,
+				imtx.M12 * multipler,
+				imtx.M13 * multipler,
+				imtx.M14 * multipler,
+
+				imtx.M21 * multipler,
+				imtx.M22 * multipler,
+				imtx.M23 * multipler,
+				imtx.M24 * multipler,
+
+				imtx.M31 * multipler,
+				imtx.M32 * multipler,
+				imtx.M33 * multipler,
+				imtx.M34 * multipler,
+
+				imtx.M41 * multipler,
+				imtx.M42 * multipler,
+				imtx.M43 * multipler,
+				imtx.M44 * multipler,
+			};
 		}
 
 		public static float[] MatrixAABBMultiply(float[] mtx, float[] bounds)
@@ -339,13 +388,16 @@ namespace OpenRA.Graphics
 			var iz = new uint[] { 2, 5, 2, 5, 2, 5, 2, 5 };
 
 			// Vectors to opposing corner
-			var ret = new float[] { float.MaxValue, float.MaxValue, float.MaxValue,
-				float.MinValue, float.MinValue, float.MinValue };
+			var ret = new[]
+			{
+				float.MaxValue, float.MaxValue, float.MaxValue,
+				float.MinValue, float.MinValue, float.MinValue
+			};
 
 			// Transform vectors and find new bounding box
 			for (var i = 0; i < 8; i++)
 			{
-				var vec = new float[] { bounds[ix[i]], bounds[iy[i]], bounds[iz[i]], 1 };
+				var vec = new[] { bounds[ix[i]], bounds[iy[i]], bounds[iz[i]], 1 };
 				var tvec = MatrixVectorMultiply(mtx, vec);
 
 				ret[0] = Math.Min(ret[0], tvec[0] / tvec[3]);

OpenRA.Game/Graphics/Vertex.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -16,17 +16,34 @@ namespace OpenRA.Graphics
 	[StructLayout(LayoutKind.Sequential)]
 	public struct Vertex
 	{
-		public readonly float X, Y, Z, S, T, U, V, P, C;
+		// 3d position
+		public readonly float X, Y, Z;
+
+		// Primary and secondary texture coordinates or RGBA color
+		public readonly float S, T, U, V;
+
+		// Palette and channel flags
+		public readonly float P, C;
+
+		// Color tint
+		public readonly float R, G, B;
 
 		public Vertex(float3 xyz, float s, float t, float u, float v, float p, float c)
-			: this(xyz.X, xyz.Y, xyz.Z, s, t, u, v, p, c) { }
+			: this(xyz.X, xyz.Y, xyz.Z, s, t, u, v, p, c, float3.Ones) { }
 
-		public Vertex(float x, float y, float z, float s, float t, float u, float v, float p, float c)
+		public Vertex(float3 xyz, float s, float t, float u, float v, float p, float c, float3 tint)
+			: this(xyz.X, xyz.Y, xyz.Z, s, t, u, v, p, c, tint.X, tint.Y, tint.Z) { }
+
+		public Vertex(float x, float y, float z, float s, float t, float u, float v, float p, float c, float3 tint)
+			: this(x, y, z, s, t, u, v, p, c, tint.X, tint.Y, tint.Z) { }
+
+		public Vertex(float x, float y, float z, float s, float t, float u, float v, float p, float c, float r, float g, float b)
 		{
 			X = x; Y = y; Z = z;
 			S = s; T = t;
 			U = u; V = v;
 			P = p; C = c;
+			R = r; G = g; B = b;
 		}
 	}
 }

OpenRA.Game/Graphics/Viewport.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -11,14 +11,19 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
+using OpenRA.Primitives;
 
 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)
@@ -36,6 +41,8 @@ namespace OpenRA.Graphics
 	public class Viewport
 	{
 		readonly WorldRenderer worldRenderer;
+		readonly WorldViewportSizes viewportSizes;
+		readonly GraphicSettings graphicSettings;
 
 		// Map bounds (world-px)
 		readonly Rectangle mapBounds;
@@ -46,6 +53,7 @@ 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;
@@ -54,14 +62,16 @@ namespace OpenRA.Graphics
 
 		ProjectedCellRegion allCells;
 		bool allCellsDirty = true;
-		readonly float[] availableZoomSteps = new[] { 2f, 1f, 0.5f, 0.25f };
+
+		WorldViewport lastViewportDistance;
 
 		float zoom = 1f;
+		float minZoom = 1f;
+		float maxZoom = 2f;
 
-		public float[] AvailableZoomSteps
-		{
-			get { return availableZoomSteps; }
-		}
+		bool unlockMinZoom;
+		float unlockedMinZoomScale;
+		float unlockedMinZoom = 1f;
 
 		public float Zoom
 		{
@@ -70,17 +80,48 @@ namespace OpenRA.Graphics
 				return zoom;
 			}
 
-			set
+			private set
 			{
-				var newValue = ClosestTo(AvailableZoomSteps, value);
-				zoom = newValue;
-				viewportSize = (1f / zoom * new float2(Game.Renderer.Resolution)).ToInt2();
+				zoom = value;
+				viewportSize = (1f / zoom * new float2(Game.Renderer.NativeResolution)).ToInt2();
 				cellsDirty = true;
 				allCellsDirty = true;
 			}
 		}
 
-		public static long TicksSinceLastMove = 0;
+		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 AdjustZoom(float dz, int2 center)
+		{
+			var oldCenter = worldRenderer.Viewport.ViewToWorldPx(center);
+			AdjustZoom(dz);
+			var newCenter = worldRenderer.Viewport.ViewToWorldPx(center);
+			CenterLocation += oldCenter - newCenter;
+		}
+
+		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;
 
 		float ClosestTo(float[] collection, float target)
@@ -119,6 +160,8 @@ 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)
@@ -140,8 +183,78 @@ 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)
@@ -149,7 +262,6 @@ namespace OpenRA.Graphics
 			var world = worldRenderer.Viewport.ViewToWorldPx(view);
 			var map = worldRenderer.World.Map;
 			var candidates = CandidateMouseoverCells(world).ToList();
-			var tileSet = worldRenderer.World.Map.Rules.TileSet;
 
 			foreach (var uv in candidates)
 			{
@@ -158,18 +270,9 @@ namespace OpenRA.Graphics
 				var s = worldRenderer.ScreenPxPosition(p);
 				if (Math.Abs(s.X - world.X) <= tileSize.Width && Math.Abs(s.Y - world.Y) <= tileSize.Height)
 				{
-					var ramp = 0;
-					if (map.Contains(uv))
-					{
-						var ti = tileSet.GetTileInfo(map.Tiles[uv]);
-						if (ti != null)
-							ramp = ti.RampType;
-					}
-
-					var corners = map.Grid.CellCorners[ramp];
-					var pos = map.CenterOfCell(uv.ToCPos(map));
-					var screen = corners.Select(c => worldRenderer.ScreenPxPosition(pos + c)).ToArray();
-
+					var ramp = map.Grid.Ramps[map.Ramp.Contains(uv) ? map.Ramp[uv] : 0];
+					var pos = map.CenterOfCell(uv.ToCPos(map)) - new WVec(0, 0, ramp.CenterHeightOffset);
+					var screen = ramp.Corners.Select(c => worldRenderer.ScreenPxPosition(pos + c)).ToArray();
 					if (screen.PolygonContains(world))
 						return uv.ToCPos(map);
 				}
@@ -209,8 +312,9 @@ namespace OpenRA.Graphics
 					yield return new MPos(u, v);
 		}
 
-		public int2 ViewToWorldPx(int2 view) { return (1f / Zoom * view.ToFloat2()).ToInt2() + TopLeft; }
-		public int2 WorldToViewPx(int2 world) { return (Zoom * (world - TopLeft).ToFloat2()).ToInt2(); }
+		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 void Center(IEnumerable<Actor> actors)
 		{
@@ -239,7 +343,6 @@ 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)
@@ -249,12 +352,12 @@ namespace OpenRA.Graphics
 			var cbr = map.CenterOfCell(((MPos)bounds.BottomRight).ToCPos(map)) + new WVec(512, 512, 0);
 
 			// Convert to screen coordinates
-			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);
+			var tl = worldRenderer.ScreenPxPosition(ctl - new WVec(0, 0, ctl.Z)) - TopLeft;
+			var br = worldRenderer.ScreenPxPosition(cbr - new WVec(0, 0, cbr.Z)) - TopLeft;
 
-			// 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);
+			// 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);
 		}
 
 		ProjectedCellRegion CalculateVisibleCells(bool insideBounds)
@@ -311,4 +414,4 @@ namespace OpenRA.Graphics
 			}
 		}
 	}
-}
+}

OpenRA.Game/Graphics/VoxelAnimation.cs

@@ -1,36 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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;
-
-namespace OpenRA.Graphics
-{
-	public struct VoxelAnimation
-	{
-		public readonly Voxel Voxel;
-		public readonly Func<WVec> OffsetFunc;
-		public readonly Func<IEnumerable<WRot>> RotationFunc;
-		public readonly Func<bool> DisableFunc;
-		public readonly Func<uint> FrameFunc;
-		public readonly bool ShowShadow;
-
-		public VoxelAnimation(Voxel voxel, Func<WVec> offset, Func<IEnumerable<WRot>> rotation, Func<bool> disable, Func<uint> frame, bool showshadow)
-		{
-			Voxel = voxel;
-			OffsetFunc = offset;
-			RotationFunc = rotation;
-			DisableFunc = disable;
-			FrameFunc = frame;
-			ShowShadow = showshadow;
-		}
-	}
-}

OpenRA.Game/Graphics/VoxelProvider.cs

@@ -1,84 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using OpenRA.FileSystem;
-
-namespace OpenRA.Graphics
-{
-	public static class VoxelProvider
-	{
-		static Dictionary<string, Dictionary<string, Voxel>> units;
-
-		public static void Initialize(VoxelLoader loader, IReadOnlyFileSystem fileSystem, List<MiniYamlNode> sequences)
-		{
-			units = new Dictionary<string, Dictionary<string, Voxel>>();
-			foreach (var s in sequences)
-				LoadVoxelsForUnit(loader, s.Key, s.Value);
-
-			loader.RefreshBuffer();
-		}
-
-		static Voxel LoadVoxel(VoxelLoader voxelLoader, string unit, MiniYaml info)
-		{
-			var vxl = unit;
-			var hva = unit;
-			if (info.Value != null)
-			{
-				var fields = info.Value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				if (fields.Length >= 1)
-					vxl = hva = fields[0].Trim();
-
-				if (fields.Length >= 2)
-					hva = fields[1].Trim();
-			}
-
-			return voxelLoader.Load(vxl, hva);
-		}
-
-		static void LoadVoxelsForUnit(VoxelLoader loader, string unit, MiniYaml sequences)
-		{
-			Game.ModData.LoadScreen.Display();
-			try
-			{
-				var seq = sequences.ToDictionary(my => LoadVoxel(loader, unit, my));
-				units.Add(unit, seq);
-			}
-			catch (FileNotFoundException) { } // Do nothing; we can crash later if we actually wanted art
-		}
-
-		public static Voxel GetVoxel(string unitName, string voxelName)
-		{
-			try { return units[unitName][voxelName]; }
-			catch (KeyNotFoundException)
-			{
-				if (units.ContainsKey(unitName))
-					throw new InvalidOperationException(
-						"Unit `{0}` does not have a voxel `{1}`".F(unitName, voxelName));
-				else
-					throw new InvalidOperationException(
-						"Unit `{0}` does not have any voxels defined.".F(unitName));
-			}
-		}
-
-		public static bool HasVoxel(string unit, string seq)
-		{
-			if (!units.ContainsKey(unit))
-				throw new InvalidOperationException(
-					"Unit `{0}` does not have any voxels defined.".F(unit));
-
-			return units[unit].ContainsKey(seq);
-		}
-	}
-}

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * 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
@@ -11,9 +11,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using OpenRA.Effects;
+using OpenRA.Primitives;
 using OpenRA.Traits;
 
 namespace OpenRA.Graphics
@@ -24,23 +24,35 @@ namespace OpenRA.Graphics
 			r => ZPosition(r.Pos, r.ZOffset);
 
 		public readonly Size TileSize;
+		public readonly int TileScale;
 		public readonly World World;
 		public readonly Theater Theater;
 		public Viewport Viewport { get; private set; }
+		public readonly ITerrainLighting TerrainLighting;
 
 		public event Action PaletteInvalidated = null;
 
+		readonly HashSet<Actor> onScreenActors = new HashSet<Actor>();
 		readonly HardwarePalette palette = new HardwarePalette();
 		readonly Dictionary<string, PaletteReference> palettes = new Dictionary<string, PaletteReference>();
-		readonly TerrainRenderer terrainRenderer;
-		readonly Lazy<DeveloperMode> devTrait;
+		readonly IRenderTerrain terrainRenderer;
+		readonly Lazy<DebugVisualizations> debugVis;
 		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>();
+
+		readonly List<IRenderable> renderablesBuffer = new List<IRenderable>();
+
+		bool lastDepthPreviewEnabled;
+
 		internal WorldRenderer(ModData modData, World world)
 		{
 			World = world;
 			TileSize = World.Map.Grid.TileSize;
+			TileScale = World.Map.Grid.Type == MapGridType.RectangularIsometric ? 1448 : 1024;
 			Viewport = new Viewport(this, world.Map);
 
 			createPaletteReference = CreatePaletteReference;
@@ -57,12 +69,13 @@ namespace OpenRA.Graphics
 			palette.Initialize();
 
 			Theater = new Theater(world.Map.Rules.TileSet);
-			terrainRenderer = new TerrainRenderer(world, this);
+			TerrainLighting = world.WorldActor.TraitOrDefault<ITerrainLighting>();
+			terrainRenderer = world.WorldActor.TraitOrDefault<IRenderTerrain>();
 
-			devTrait = Exts.Lazy(() => world.LocalPlayer != null ? world.LocalPlayer.PlayerActor.Trait<DeveloperMode>() : null);
+			debugVis = Exts.Lazy(() => world.WorldActor.TraitOrDefault<DebugVisualizations>());
 		}
 
-		public void UpdatePalettesForPlayer(string internalName, HSLColor color, bool replaceExisting)
+		public void UpdatePalettesForPlayer(string internalName, Color color, bool replaceExisting)
 		{
 			foreach (var pal in World.WorldActor.TraitsImplementing<ILoadsPlayerPalettes>())
 				pal.LoadPlayerPalettes(this, internalName, color, replaceExisting);
@@ -84,8 +97,8 @@ namespace OpenRA.Graphics
 				var oldHeight = palette.Height;
 				palette.AddPalette(name, pal, allowModifiers);
 
-				if (oldHeight != palette.Height && PaletteInvalidated != null)
-					PaletteInvalidated();
+				if (oldHeight != palette.Height)
+					PaletteInvalidated?.Invoke();
 			}
 		}
 
@@ -98,24 +111,134 @@ namespace OpenRA.Graphics
 				palettes[name].Palette = pal;
 		}
 
-		List<IFinalizedRenderable> GenerateRenderables()
+		// PERF: Avoid LINQ.
+		void GenerateRenderables()
 		{
-			var actors = World.ScreenMap.ActorsInBox(Viewport.TopLeft, Viewport.BottomRight).Append(World.WorldActor);
+			foreach (var actor in onScreenActors)
+				renderablesBuffer.AddRange(actor.Render(this));
+
+			renderablesBuffer.AddRange(World.WorldActor.Render(this));
+
 			if (World.RenderPlayer != null)
-				actors = actors.Append(World.RenderPlayer.PlayerActor);
+				renderablesBuffer.AddRange(World.RenderPlayer.PlayerActor.Render(this));
 
-			var worldRenderables = actors.SelectMany(a => a.Render(this));
 			if (World.OrderGenerator != null)
-				worldRenderables = worldRenderables.Concat(World.OrderGenerator.Render(this, World));
+				renderablesBuffer.AddRange(World.OrderGenerator.Render(this, World));
 
-			worldRenderables = worldRenderables.Concat(World.Effects.SelectMany(e => e.Render(this)));
-			worldRenderables = worldRenderables.OrderBy(RenderableScreenZPositionComparisonKey);
+			// Unpartitioned effects
+			foreach (var e in World.UnpartitionedEffects)
+				renderablesBuffer.AddRange(e.Render(this));
 
-			Game.Renderer.WorldVoxelRenderer.BeginFrame();
-			var renderables = worldRenderables.Select(r => r.PrepareRender(this)).ToList();
-			Game.Renderer.WorldVoxelRenderer.EndFrame();
+			// Partitioned, currently on-screen effects
+			foreach (var e in World.ScreenMap.RenderableEffectsInBox(Viewport.TopLeft, Viewport.BottomRight))
+				renderablesBuffer.AddRange(e.Render(this));
 
-			return renderables;
+			foreach (var renderable in renderablesBuffer.OrderBy(RenderableScreenZPositionComparisonKey))
+				preparedRenderables.Add(renderable.PrepareRender(this));
+
+			// PERF: Reuse collection to avoid allocations.
+			renderablesBuffer.Clear();
+		}
+
+		// PERF: Avoid LINQ.
+		void GenerateOverlayRenderables()
+		{
+			foreach (var a in World.ActorsWithTrait<IRenderAboveShroud>())
+			{
+				if (!a.Actor.IsInWorld || a.Actor.Disposed || (a.Trait.SpatiallyPartitionable && !onScreenActors.Contains(a.Actor)))
+					continue;
+
+				foreach (var renderable in a.Trait.RenderAboveShroud(a.Actor, this))
+					preparedOverlayRenderables.Add(renderable.PrepareRender(this));
+			}
+
+			foreach (var a in World.Selection.Actors)
+			{
+				if (!a.IsInWorld || a.Disposed)
+					continue;
+
+				foreach (var t in a.TraitsImplementing<IRenderAboveShroudWhenSelected>())
+				{
+					if (t.SpatiallyPartitionable && !onScreenActors.Contains(a))
+						continue;
+
+					foreach (var renderable in t.RenderAboveShroud(a, this))
+						preparedOverlayRenderables.Add(renderable.PrepareRender(this));
+				}
+			}
+
+			foreach (var e in World.Effects)
+			{
+				var ea = e as IEffectAboveShroud;
+				if (ea == null)
+					continue;
+
+				foreach (var renderable in ea.RenderAboveShroud(this))
+					preparedOverlayRenderables.Add(renderable.PrepareRender(this));
+			}
+
+			if (World.OrderGenerator != null)
+				foreach (var renderable in World.OrderGenerator.RenderAboveShroud(this, World))
+					preparedOverlayRenderables.Add(renderable.PrepareRender(this));
+		}
+
+		// PERF: Avoid LINQ.
+		void GenerateAnnotationRenderables()
+		{
+			foreach (var a in World.ActorsWithTrait<IRenderAnnotations>())
+			{
+				if (!a.Actor.IsInWorld || a.Actor.Disposed || (a.Trait.SpatiallyPartitionable && !onScreenActors.Contains(a.Actor)))
+					continue;
+
+				foreach (var renderAnnotation in a.Trait.RenderAnnotations(a.Actor, this))
+					preparedAnnotationRenderables.Add(renderAnnotation.PrepareRender(this));
+			}
+
+			foreach (var a in World.Selection.Actors)
+			{
+				if (!a.IsInWorld || a.Disposed)
+					continue;
+
+				foreach (var t in a.TraitsImplementing<IRenderAnnotationsWhenSelected>())
+				{
+					if (t.SpatiallyPartitionable && !onScreenActors.Contains(a))
+						continue;
+
+					foreach (var renderAnnotation in t.RenderAnnotations(a, this))
+						preparedAnnotationRenderables.Add(renderAnnotation.PrepareRender(this));
+				}
+			}
+
+			foreach (var e in World.Effects)
+			{
+				var ea = e as IEffectAnnotation;
+				if (ea == null)
+					continue;
+
+				foreach (var renderAnnotation in ea.RenderAnnotation(this))
+					preparedAnnotationRenderables.Add(renderAnnotation.PrepareRender(this));
+			}
+
+			if (World.OrderGenerator != null)
+				foreach (var renderAnnotation in World.OrderGenerator.RenderAnnotations(this, World))
+					preparedAnnotationRenderables.Add(renderAnnotation.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));
+
+			GenerateRenderables();
+			GenerateOverlayRenderables();
+			GenerateAnnotationRenderables();
+
+			onScreenActors.Clear();
 		}
 
 		public void Draw()
@@ -123,27 +246,24 @@ namespace OpenRA.Graphics
 			if (World.WorldActor.Disposed)
 				return;
 
-			if (devTrait.Value != null)
+			if (debugVis.Value != null && lastDepthPreviewEnabled != debugVis.Value.DepthBuffer)
 			{
-				Game.Renderer.WorldSpriteRenderer.SetDepthPreviewEnabled(devTrait.Value.ShowDepthPreview);
-				Game.Renderer.WorldRgbaSpriteRenderer.SetDepthPreviewEnabled(devTrait.Value.ShowDepthPreview);
-				Game.Renderer.WorldRgbaColorRenderer.SetDepthPreviewEnabled(devTrait.Value.ShowDepthPreview);
+				lastDepthPreviewEnabled = debugVis.Value.DepthBuffer;
+				Game.Renderer.WorldSpriteRenderer.SetDepthPreviewEnabled(lastDepthPreviewEnabled);
 			}
 
-			RefreshPalette();
-
-			var renderables = GenerateRenderables();
 			var bounds = Viewport.GetScissorBounds(World.Type != WorldType.Editor);
 			Game.Renderer.EnableScissor(bounds);
 
 			if (enableDepthBuffer)
-				Game.Renderer.Device.EnableDepthBuffer();
+				Game.Renderer.Context.EnableDepthBuffer();
+
+			terrainRenderer?.RenderTerrain(this, Viewport);
 
-			terrainRenderer.Draw(this, Viewport);
 			Game.Renderer.Flush();
 
-			for (var i = 0; i < renderables.Count; i++)
-				renderables[i].Render(this);
+			for (var i = 0; i < preparedRenderables.Count; i++)
+				preparedRenderables[i].Render(this);
 
 			if (enableDepthBuffer)
 				Game.Renderer.ClearDepthBuffer();
@@ -152,59 +272,73 @@ 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(renderShroud, this);
+				a.Trait.RenderShroud(this);
 
 			if (enableDepthBuffer)
-				Game.Renderer.Device.DisableDepthBuffer();
+				Game.Renderer.Context.DisableDepthBuffer();
 
 			Game.Renderer.DisableScissor();
 
-			var aboveShroud = World.ActorsWithTrait<IRenderAboveShroud>().Where(a => a.Actor.IsInWorld && !a.Actor.Disposed)
-				.SelectMany(a => a.Trait.RenderAboveShroud(a.Actor, this));
-
-			var aboveShroudSelected = World.Selection.Actors.Where(a => !a.Disposed)
-				.SelectMany(a => a.TraitsImplementing<IRenderAboveShroudWhenSelected>()
-					.SelectMany(t => t.RenderAboveShroud(a, this)));
-
-			var aboveShroudEffects = World.Effects.Select(e => e as IEffectAboveShroud)
-				.Where(e => e != null)
-				.SelectMany(e => e.RenderAboveShroud(this));
-
-			var aboveShroudOrderGenerator = SpriteRenderable.None;
-			if (World.OrderGenerator != null)
-				aboveShroudOrderGenerator = World.OrderGenerator.RenderAboveShroud(this, World);
-
-			Game.Renderer.WorldVoxelRenderer.BeginFrame();
-			var finalOverlayRenderables = aboveShroud
-				.Concat(aboveShroudSelected)
-				.Concat(aboveShroudEffects)
-				.Concat(aboveShroudOrderGenerator)
-				.Select(r => r.PrepareRender(this))
-				.ToList();
-			Game.Renderer.WorldVoxelRenderer.EndFrame();
-
 			// HACK: Keep old grouping behaviour
-			foreach (var g in finalOverlayRenderables.GroupBy(prs => prs.GetType()))
+			var groupedOverlayRenderables = preparedOverlayRenderables.GroupBy(prs => prs.GetType());
+			foreach (var g in groupedOverlayRenderables)
 				foreach (var r in g)
 					r.Render(this);
 
-			if (devTrait.Value != null && devTrait.Value.ShowDebugGeometry)
-			{
-				for (var i = 0; i < renderables.Count; i++)
-					renderables[i].RenderDebugGeometry(this);
+			Game.Renderer.Flush();
+		}
 
-				foreach (var g in finalOverlayRenderables.GroupBy(prs => prs.GetType()))
-					foreach (var r in g)
-						r.RenderDebugGeometry(this);
+		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 < preparedOverlayRenderables.Count; i++)
+					preparedOverlayRenderables[i].RenderDebugGeometry(this);
+
+				for (var i = 0; i < preparedAnnotationRenderables.Count; i++)
+					preparedAnnotationRenderables[i].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);
+				}
+
+				foreach (var b in World.ScreenMap.MouseBounds(World.RenderPlayer))
+				{
+					var points = new float2[b.Vertices.Length];
+					for (var index = 0; index < b.Vertices.Length; index++)
+					{
+						var vertex = b.Vertices[index];
+						points[index] = Viewport.WorldToViewPx(vertex).ToFloat2();
+					}
+
+					Game.Renderer.RgbaColorRenderer.DrawPolygon(points, 1, Color.OrangeRed);
+				}
 			}
 
 			Game.Renderer.Flush();
+
+			preparedRenderables.Clear();
+			preparedOverlayRenderables.Clear();
+			preparedAnnotationRenderables.Clear();
 		}
 
 		public void RefreshPalette()
@@ -216,13 +350,13 @@ namespace OpenRA.Graphics
 		// Conversion between world and screen coordinates
 		public float2 ScreenPosition(WPos pos)
 		{
-			return new float2(TileSize.Width * pos.X / 1024f, TileSize.Height * (pos.Y - pos.Z) / 1024f);
+			return new float2((float)TileSize.Width * pos.X / TileScale, (float)TileSize.Height * (pos.Y - pos.Z) / TileScale);
 		}
 
 		public float3 Screen3DPosition(WPos pos)
 		{
-			var z = ZPosition(pos, 0) * TileSize.Height / 1024f;
-			return new float3(TileSize.Width * pos.X / 1024f, TileSize.Height * (pos.Y - pos.Z) / 1024f, z);
+			var z = ZPosition(pos, 0) * (float)TileSize.Height / TileScale;
+			return new float3((float)TileSize.Width * pos.X / TileScale, (float)TileSize.Height * (pos.Y - pos.Z) / TileScale, z);
 		}
 
 		public int2 ScreenPxPosition(WPos pos)
@@ -239,16 +373,16 @@ namespace OpenRA.Graphics
 			return new float3((float)Math.Round(px.X), (float)Math.Round(px.Y), px.Z);
 		}
 
-		// For scaling vectors to pixel sizes in the voxel renderer
+		// For scaling vectors to pixel sizes in the model renderer
 		public float3 ScreenVectorComponents(WVec vec)
 		{
 			return new float3(
-				TileSize.Width * vec.X / 1024f,
-				TileSize.Height * (vec.Y - vec.Z) / 1024f,
-				TileSize.Height * vec.Z / 1024f);
+				(float)TileSize.Width * vec.X / TileScale,
+				(float)TileSize.Height * (vec.Y - vec.Z) / TileScale,
+				(float)TileSize.Height * vec.Z / TileScale);
 		}
 
-		// For scaling vectors to pixel sizes in the voxel renderer
+		// For scaling vectors to pixel sizes in the model renderer
 		public float[] ScreenVector(WVec vec)
 		{
 			var xyz = ScreenVectorComponents(vec);
@@ -264,7 +398,7 @@ namespace OpenRA.Graphics
 
 		public float ScreenZPosition(WPos pos, int offset)
 		{
-			return ZPosition(pos, offset) * TileSize.Height / 1024f;
+			return ZPosition(pos, offset) * (float)TileSize.Height / TileScale;
 		}
 
 		static int ZPosition(WPos pos, int offset)
@@ -278,7 +412,7 @@ namespace OpenRA.Graphics
 		/// </summary>
 		public WPos ProjectedPosition(int2 screenPx)
 		{
-			return new WPos(1024 * screenPx.X / TileSize.Width, 1024 * screenPx.Y / TileSize.Height, 0);
+			return new WPos(TileScale * screenPx.X / TileSize.Width, TileScale * screenPx.Y / TileSize.Height, 0);
 		}
 
 		public void Dispose()
@@ -291,7 +425,6 @@ namespace OpenRA.Graphics
 
 			palette.Dispose();
 			Theater.Dispose();
-			terrainRenderer.Dispose();
 		}
 	}
 }