Treat assets as pre-premultiplied.

OpenRA · Oct 26, 2023 · ce297b5 · ce297b5
1 parent 675d8c5
commit ce297b5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/OpenRA.Mods.Mobius/RemasterSpriteSequence.cs b/OpenRA.Mods.Mobius/RemasterSpriteSequence.cs
@@ -64,6 +64,9 @@ public class RemasterSpriteSequence : ClassicTilesetSpecificSpriteSequence
 		[Desc("Adjusts the rendered size of the sprite")]
 		protected static readonly SpriteSequenceField<float?> RemasteredScale = new(nameof(RemasteredScale), null);
 
+		[Desc("Sprite data is already pre-multiplied by alpha channel.")]
+		protected static readonly SpriteSequenceField<bool> RemasteredPremultiplied = new(nameof(RemasteredPremultiplied), true);
+
 		static readonly int[] FirstFrame = { 0 };
 
 		bool hasRemasteredSprite = true;
@@ -184,6 +187,7 @@ public override void ReserveSprites(ModData modData, string tileset, SpriteCache
 			var remasteredOffset = LoadField(RemasteredOffset, data, defaults);
 			var remasteredMaskFilename = LoadField(RemasteredMaskFilename, data, defaults, out var remasteredMaskFilenameLocation);
 			var blendMode = LoadField(BlendMode, data, defaults);
+			var premultiplied = LoadField(RemasteredPremultiplied, data, defaults);
 
 			if (!string.IsNullOrEmpty(remasteredMaskFilename))
 				remasteredMaskToken = cache.ReserveFrames(remasteredMaskFilename, null, remasteredMaskFilenameLocation);
@@ -206,7 +210,7 @@ public override void ReserveSprites(ModData modData, string tileset, SpriteCache
 						if (remasteredMaskToken != null)
 							token = cache.ReserveFrames(f.Filename, f.LoadFrames, f.Location);
 						else
-							token = cache.ReserveSprites(f.Filename, f.LoadFrames, f.Location);
+							token = cache.ReserveSprites(f.Filename, f.LoadFrames, f.Location, hasRemasteredSprite && premultiplied);
 
 						spritesToLoad.Add(new SpriteReservation
 						{
@@ -229,7 +233,7 @@ public override void ReserveSprites(ModData modData, string tileset, SpriteCache
 					if (remasteredMaskToken != null)
 						token = cache.ReserveFrames(f.Filename, f.LoadFrames, f.Location);
 					else
-						token = cache.ReserveSprites(f.Filename, f.LoadFrames, f.Location);
+						token = cache.ReserveSprites(f.Filename, f.LoadFrames, f.Location, hasRemasteredSprite && premultiplied);
 
 					spritesToLoad.Add(new SpriteReservation
 					{

diff --git a/mod.config b/mod.config
@@ -9,7 +9,7 @@
 MOD_ID="cnc"
 
 # The OpenRA engine version to use for this project.
-ENGINE_VERSION="c76bd67384"
+ENGINE_VERSION="9752d26472"
 
 ##############################################################################
 # Packaging

diff --git a/mods/cnc/sequences/decorations-overrides.yaml b/mods/cnc/sequences/decorations-overrides.yaml
@@ -726,11 +726,13 @@ v22.husk:
 
 v23:
 	Defaults:
+		RemasteredPremultiplied: false
 		RemasteredFilenamePattern: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\V23.DES\V23.DES-{0:D4}.DDS
 			Count: 6
 
 v23.husk:
 	Defaults:
+		RemasteredPremultiplied: false
 		RemasteredFilenamePattern: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\V23.DES\V23.DES-{0:D4}.DDS
 			Count: 7
 
@@ -866,11 +868,13 @@ v36.husk:
 
 v37:
 	Defaults:
+		RemasteredPremultiplied: false
 		RemasteredFilenamePattern: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\V37.DES\V37.DES_{0:D4}.DDS
 			Count: 2
 
 v37.husk:
 	Defaults:
+		RemasteredPremultiplied: false
 		RemasteredFilenamePattern: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\V37.DES\V37.DES_{0:D4}.DDS
 			Count: 3
 

diff --git a/mods/cnc/sequences/misc-overrides.yaml b/mods/cnc/sequences/misc-overrides.yaml
@@ -190,6 +190,7 @@ moveflsh:
 resources:
 	Defaults:
 		RemasteredLength: *
+		RemasteredPremultiplied: false
 	ti1:
 		RemasteredFilenamePattern: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\TEMPERATE\TI1\TI1.TEM-{0:D4}.DDS
 			Count: 12

diff --git a/mods/cnc/sequences/structures-overrides.yaml b/mods/cnc/sequences/structures-overrides.yaml
@@ -11,6 +11,7 @@ fact:
 				Count: 6
 			DESERT: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\BIB2.DES\BIB2.DES-{0:D4}.DDS
 				Count: 6
+		RemasteredPremultiplied: false
 	icon:
 		RemasteredFilename:
 
@@ -27,6 +28,7 @@ nuke:
 				Count: 4
 			DESERT: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\BIB3.DES\BIB3.DES-{0:D4}.DDS
 				Count: 4
+		RemasteredPremultiplied: false
 	icon:
 		RemasteredFilename:
 
@@ -53,6 +55,7 @@ proc:
 				Count: 6
 			DESERT: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\BIB2.DES\BIB2.DES-{0:D4}.DDS
 				Count: 6
+		RemasteredPremultiplied: false
 	icon:
 		RemasteredFilename:
 
@@ -82,6 +85,7 @@ hand:
 				Count: 4
 			DESERT: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\BIB3.DES\BIB3.DES-{0:D4}.DDS
 				Count: 4
+		RemasteredPremultiplied: false
 	icon:
 		RemasteredFilename:
 
@@ -98,6 +102,7 @@ pyle:
 				Count: 4
 			DESERT: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\BIB3.DES\BIB3.DES-{0:D4}.DDS
 				Count: 4
+		RemasteredPremultiplied: false
 	icon:
 		RemasteredFilename:
 
@@ -122,6 +127,7 @@ weap:
 			DESERT: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\BIB2.DES\BIB2.DES-{0:D4}.DDS
 				Count: 6
 		RemasteredOffset: 0,0
+		RemasteredPremultiplied: false
 	icon:
 		RemasteredFilename:
 
@@ -150,6 +156,7 @@ afld:
 				Count: 8
 			DESERT: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\BIB1.DES\BIB1.DES-{0:D4}.DDS
 				Count: 8
+		RemasteredPremultiplied: false
 	icon:
 		RemasteredFilename:
 
@@ -166,6 +173,7 @@ hq:
 				Count: 4
 			DESERT: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\BIB3.DES\BIB3.DES-{0:D4}.DDS
 				Count: 4
+		RemasteredPremultiplied: false
 	icon:
 		RemasteredFilename:
 
@@ -182,6 +190,7 @@ nuk2:
 				Count: 4
 			DESERT: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\BIB3.DES\BIB3.DES-{0:D4}.DDS
 				Count: 4
+		RemasteredPremultiplied: false
 	icon:
 		RemasteredFilename:
 
@@ -216,6 +225,7 @@ eye:
 				Count: 4
 			DESERT: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\BIB3.DES\BIB3.DES-{0:D4}.DDS
 				Count: 4
+		RemasteredPremultiplied: false
 	icon:
 		RemasteredFilename:
 
@@ -237,6 +247,7 @@ tmpl:
 			DESERT: DATA\ART\TEXTURES\SRGB\TIBERIAN_DAWN\TERRAIN\DESERT\BIB2.DES\BIB2.DES-{0:D4}.DDS
 				Count: 6
 		RemasteredOffset: 0, 0
+		RemasteredPremultiplied: false
 	icon:
 		RemasteredFilename: