Use premultiplied alpha for all textures and blending.

2015-05-16 17:49:17 +01:00
parent 78f1e9fb2f
commit 26fd858fc7
16 changed files with 153 additions and 40 deletions
--- a/mods/d2k/rules/palettes.yaml
+++ b/mods/d2k/rules/palettes.yaml
@@ -49,6 +49,14 @@
 		G: 0
 		B: 0
 		A: 180
+	PaletteFromPaletteWithAlpha@effect75alpha:
+		Name: effect75alpha
+		BasePalette: effect
+		Alpha: 0.75
+	PaletteFromPaletteWithAlpha@effect50alpha:
+		Name: effect50alpha
+		BasePalette: effect
+		Alpha: 0.5
 	PaletteFromScaledPalette@starportlights:
 		Name: starportlights
 		BasePalette: d2k
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -81,6 +81,7 @@ harvester:
 	LeavesHusk:
 		HuskActor: Harvester.Husk
 	WithHarvestAnimation:
+		Palette: effect50alpha
 	AttractsWorms:
 		Intensity: 700

--- a/mods/d2k/sequences/misc.yaml
+++ b/mods/d2k/sequences/misc.yaml
@@ -71,30 +71,24 @@ small_trail:
 		Start: 3735
 		Length: 4
 		Tick: 80
-		BlendMode: SoftAdditive

 small_trail2:
 	idle: DATA.R8
 		Start: 3540
 		Length: 4
 		Tick: 80
-		BlendMode: SoftAdditive

 bazooka_trail:
 	idle: DATA.R8
 		Start: 3381
 		Length: 4
 		Tick: 80
-		BlendMode: Translucency
-		Alpha: 0.75

 bazooka_trail2:
 	idle: DATA.R8
 		Start: 3544
 		Length: 4
 		Tick: 80
-		BlendMode: Translucency
-		Alpha: 0.75

 deviator_trail:
 	idle: DATA.R8
--- a/mods/d2k/sequences/vehicles.yaml
+++ b/mods/d2k/sequences/vehicles.yaml
@@ -23,7 +23,6 @@ harvester:
 		Tick: 80
 		ZOffset: 1
 		BlendMode: Multiply
-		Alpha: 0.5
 	dock: DATA.R8
 		Start: 3370
 		Length: 10
--- a/mods/d2k/weapons.yaml
+++ b/mods/d2k/weapons.yaml
@@ -34,6 +34,7 @@ Bazooka:
 		Image: RPG
 		RateOfTurn: 5
 		Trail: bazooka_trail
+		TrailPalette: effect75alpha
 		TrailInterval: 1
 		RangeLimit: 35
 	Warhead@1Dam: SpreadDamage
@@ -193,6 +194,7 @@ QuadRockets:
 		Image: RPG
 		RateOfTurn: 10
 		Trail: bazooka_trail2
+		TrailPalette: effect75alpha
 		TrailInterval: 1
 		Speed: 256
 		RangeLimit: 40