Merge pull request #7457 from pchote/actorpreviews

Introduce ActorPreviewWidget (and other related changes).
2015-02-21 01:35:03 +02:00
parent aeceb05e08 1af61c92c5
commit 293bb78a3c
40 changed files with 476 additions and 313 deletions
--- a/mods/cnc/chrome/color-picker.yaml
+++ b/mods/cnc/chrome/color-picker.yaml
@@ -30,14 +30,12 @@ Background@COLOR_CHOOSER:
 					Y: 2
 					Width: 144
 					Height: 72
-		SpriteSequence@PREVIEW:
+		ActorPreview@PREVIEW:
 			X: 153
 			Y: 1
 			Width: 80
 			Height: 73
-			Palette: colorpicker
-			Unit: fact
-			Sequence: idle
+			Animate: true
 		Button@RANDOM_BUTTON:
 			Key: tab
 			X: 158
--- a/mods/cnc/metrics.yaml
+++ b/mods/cnc/metrics.yaml
@@ -20,6 +20,7 @@ Metrics:
 	TextContrast: false
 	TextContrastColor: 0,0,0
 	ColorPickerRemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
+	ColorPickerActorType: ^fact.colorpicker
 	SpawnFont: TinyBold
 	SpawnColor: 255,255,255
 	SpawnContrastColor: 0,0,0
--- a/mods/cnc/rules/misc.yaml
+++ b/mods/cnc/rules/misc.yaml
@@ -42,6 +42,12 @@ waypoint:
 	RenderEditorOnly:
 	BodyOrientation:

+^fact.colorpicker:
+	Inherits: FACT
+	RenderBuilding:
+		Image: fact
+		Palette: colorpicker
+
 CAMERA:
 	Immobile:
 		OccupiesSpace: false
--- a/mods/d2k/chrome/color-picker.yaml
+++ b/mods/d2k/chrome/color-picker.yaml
@@ -29,15 +29,11 @@ Background@COLOR_CHOOSER:
 					Y: 2
 					Width: 144
 					Height: 72
-		SpriteSequence@FACT:
+		ActorPreview@PREVIEW:
 			X: 153
 			Y: 1
 			Width: 80
 			Height: 73
-			Palette: colorpicker
-			Unit: carryall
-			Sequence: idle
-			Facing: 104
 		Button@RANDOM_BUTTON:
 			Key: tab
 			X: 158
--- a/mods/d2k/metrics.yaml
+++ b/mods/d2k/metrics.yaml
@@ -20,6 +20,7 @@ Metrics:
 	TextContrast: false
 	TextContrastColor: 0,0,0
 	ColorPickerRemapIndices: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
+	ColorPickerActorType: ^carryall.colorpicker
 	SpawnFont: TinyBold
 	SpawnColor: 255,255,255
 	SpawnContrastColor: 0,0,0
--- a/mods/d2k/rules/misc.yaml
+++ b/mods/d2k/rules/misc.yaml
@@ -140,6 +140,14 @@ waypoint:
 	RenderEditorOnly:
 	BodyOrientation:

+^carryall.colorpicker:
+	Inherits: ^CARRYALL
+	RenderUnit:
+		Image: carryall
+		Palette: colorpicker
+	Helicopter:
+		InitialFacing: 104
+
 CAMERA:
 	Immobile:
 		OccupiesSpace: false
--- a/mods/ra/chrome/color-picker.yaml
+++ b/mods/ra/chrome/color-picker.yaml
@@ -29,14 +29,11 @@ Background@COLOR_CHOOSER:
 					Y: 2
 					Width: 144
 					Height: 72
-		SpriteSequence@FACT:
+		ActorPreview@PREVIEW:
 			X: 153
 			Y: 1
 			Width: 80
 			Height: 73
-			Palette: colorpicker
-			Unit: fact
-			Sequence: idle
 		Button@RANDOM_BUTTON:
 			Key: tab
 			X: 158
--- a/mods/ra/metrics.yaml
+++ b/mods/ra/metrics.yaml
@@ -20,6 +20,7 @@ Metrics:
 	TextContrast: false
 	TextContrastColor: 0,0,0
 	ColorPickerRemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
+	ColorPickerActorType: ^fact.colorpicker
 	SpawnFont: TinyBold
 	SpawnColor: 255,255,255
 	SpawnContrastColor: 0,0,0
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -368,6 +368,12 @@ waypoint:
 	RenderEditorOnly:
 	BodyOrientation:

+^fact.colorpicker:
+	Inherits: FACT
+	RenderBuilding:
+		Image: fact
+		Palette: colorpicker
+
 CTFLAG:
 	Inherits: ^TechBuilding
 	Building:
--- a/mods/ts/chrome/color-picker.yaml
+++ b/mods/ts/chrome/color-picker.yaml
@@ -29,14 +29,11 @@ Background@COLOR_CHOOSER:
 					Y: 2
 					Width: 144
 					Height: 72
-		SpriteSequence@PREVIEW:
-			X: 153
-			Y: 1-40
+		ActorPreview@PREVIEW:
+			X: 163
 			Width: 80
-			Height: 73
-			Palette: colorpicker
-			Unit: gacnst
-			Sequence: make
+			Height: 74
+			Animate: true
 		Button@RANDOM_BUTTON:
 			Key: tab
 			X: 158
--- a/mods/ts/metrics.yaml
+++ b/mods/ts/metrics.yaml
@@ -20,6 +20,7 @@ Metrics:
 	TextContrast: false
 	TextContrastColor: 0,0,0
 	ColorPickerRemapIndices: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
+	ColorPickerActorType: ^mmch.colorpicker
 	SpawnFont: TinyBold
 	SpawnColor: 255,255,255
 	SpawnContrastColor: 0,0,0
--- a/mods/ts/rules/misc.yaml
+++ b/mods/ts/rules/misc.yaml
@@ -10,6 +10,20 @@ waypoint:
 	RenderEditorOnly:
 	BodyOrientation:

+^mmch.colorpicker:
+	Inherits: MMCH
+	Mobile:
+		InitialFacing: 160
+	Turreted:
+		InitialFacing: 160
+	RenderInfantry:
+		Image: mmch
+		StandAnimations: run
+		Palette: colorpicker
+	RenderVoxels:
+		Image: mmch
+		Palette: colorpicker
+
 CAMERA:
 	Immobile:
 		OccupiesSpace: false
--- a/mods/ts/rules/world.yaml
+++ b/mods/ts/rules/world.yaml
@@ -37,6 +37,7 @@ World:
 		Name: colorpicker
 		Filename: unittem.pal
 		AllowModifiers: false
+		ShadowIndex: 1
 	PaletteFromRGBA@shadow:
 		Name: shadow
 		R: 0