Merge pull request #8176 from pchote/fix-palette-alpha

Load textures using premultiplied alpha.
This commit is contained in:
Oliver Brakmann
2015-05-24 13:15:54 +02:00
24 changed files with 230 additions and 91 deletions

View File

@@ -49,16 +49,19 @@
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
AllowModifiers: false
Offset: -64
PaletteFromScaledPalette@repairlights:
Name: repairlights
BasePalette: d2k
AllowModifiers: false
Offset: -128
PaletteFromR8@shroud:
Name: shroud
Filename: DATA.R8
@@ -72,5 +75,10 @@
PlayerColorPalette:
BasePalette: d2k
RemapIndex: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
PaletteFromPlayerPaletteWithAlpha@deviatorgas:
BaseName: deviatorgas
BasePalette: player
Alpha: 0.68
Premultiply: false
PlayerHighlightPalette:

View File

@@ -664,7 +664,7 @@ repair:
atreides: repair.atreides
ordos: repair.ordos
WithRepairOverlay:
Palette: repairlights
Palette: effect75alpha
Power:
Amount: -10
ProvidesPrerequisite@buildingname:

View File

@@ -81,6 +81,7 @@ harvester:
LeavesHusk:
HuskActor: Harvester.Husk
WithHarvestAnimation:
Palette: effect50alpha
AttractsWorms:
Intensity: 700