Merge pull request #4287 from pchote/shroud

Rewrite shroud renderer.
This commit is contained in:
Matthias Mailänder
2013-12-11 01:28:22 -08:00
25 changed files with 437 additions and 265 deletions

Binary file not shown.

View File

@@ -273,10 +273,9 @@ World:
Type: Shroud
ShroudPalette@fog:
Name: fog
Type: Fog
ShroudPalette@combined:
Name: shroudfog
Type: Combined
Fog: true
ShroudRenderer:
Variants: typea, typeb, typec, typed
Country@gdi:
Name: GDI
Race: gdi

View File

@@ -360,4 +360,18 @@ resources:
bti11: bti11
Length: *
bti12: bti12
Length: *
Length: *
shroud:
typea: shadow
Start: 0
Length: 12
typeb: shadow
Start: 12
Length: 12
typec: shadow
Start: 24
Length: 12
typed: shadow
Start: 36
Length: 12

Binary file not shown.

View File

@@ -414,21 +414,28 @@ World:
Name: moveflash
Filename: DATA.R8
Offset: 2572352
A: 64
InvertColor: true
PaletteFromRGBA@disabled:
Name: disabled
R: 0
G: 0
B: 0
A: 180
ShroudPalette@shroud:
Type: Shroud
ShroudPalette@fog:
PaletteFromR8@shroud:
Name: shroud
Filename: DATA.R8
Offset: 12007
InvertColor: true
FogPaletteFromR8@fog:
Name: fog
Type: Fog
ShroudPalette@combined:
Name: shroudfog
Type: Combined
Filename: DATA.R8
Offset: 12007
InvertColor: true
ShroudRenderer:
Variants: typea, typeb, typec, typed
Index: 11, 3, 7, 9, 6, 13, 12, 14, 4, 8, 2, 1, 5, 10
ShroudColor: 31
ShroudBlend: Multiply
Country@Atreides:
Name: Atreides
Race: atreides

View File

@@ -304,10 +304,32 @@ moveflsh:
Start: 3621
Length: 5
Tick: 80
BlendMode: Subtractive
BlendMode: Multiply
resources:
spice: BLOXBASE
Frames: 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, 300, 301, 320, 321
Length: 54
Offset: -16,-16
shroud:
typea: DATA
Start: 40
Length: 14
Offset: -16,-16
BlendMode: Multiply
typeb: DATA
Start: 56
Length: 14
Offset: -16,-16
BlendMode: Multiply
typec: DATA
Start: 72
Length: 14
Offset: -16,-16
BlendMode: Multiply
typed: DATA
Start: 88
Length: 14
Offset: -16,-16
BlendMode: Multiply

View File

@@ -616,10 +616,10 @@ World:
Type: Shroud
ShroudPalette@fog:
Name: fog
Type: Fog
ShroudPalette@combined:
Name: shroudfog
Type: Combined
Fog: true
ShroudRenderer:
Index: 255, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 20, 40, 56, 65, 97, 130, 148, 194, 24, 33, 66, 132, 28, 41, 67, 134, 1, 2, 4, 8, 3, 6, 12, 9, 7, 14, 13, 11, 5, 10, 15, 255
UseExtendedIndex: true
Country@0:
Name: Allies
Race: allies

View File

@@ -486,4 +486,8 @@ resources:
gem03: gem03
Length: *
gem04: gem04
Length: *
shroud:
shroud: shadow
Length: *

View File

@@ -101,10 +101,10 @@ World:
Type: Shroud
ShroudPalette@fog:
Name: fog
Type: Fog
ShroudPalette@combined:
Name: shroudfog
Type: Combined
Fog: true
ShroudRenderer:
Index: 255, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 20, 40, 56, 65, 97, 130, 148, 194, 24, 33, 66, 132, 28, 41, 67, 134, 1, 2, 4, 8, 3, 6, 12, 9, 7, 14, 13, 11, 5, 10, 15, 255
UseExtendedIndex: true
VoxelNormalsPalette@normals:
Name: normals
Type: TiberianSun

View File

@@ -253,4 +253,8 @@ moveflsh:
# TODO: placeholder
resources:
fake: shadow
Length: *
shroud:
shroud: shadow
Length: *