Move vfx colors to color palette

haihala · Jul 28, 2024 · 16def05 · 16def05
1 parent a823ee4
commit 16def05
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/client/lib/src/assets/materials.rs b/client/lib/src/assets/materials.rs
@@ -4,6 +4,10 @@ use bevy::{
     render::render_resource::{AsBindGroup, ShaderRef},
 };
 use characters::FlashRequest;
+use wag_core::{
+    BLOCK_EFFECT_BASE_COLOR, BLOCK_EFFECT_EDGE_COLOR, CLASH_SPARK_BASE_COLOR,
+    CLASH_SPARK_EDGE_COLOR, HIT_SPARK_BASE_COLOR, HIT_SPARK_EDGE_COLOR, HIT_SPARK_MID_COLOR,
+};
 
 #[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
 pub struct HitSparkMaterial {
@@ -25,9 +29,9 @@ impl HitSparkMaterial {
 impl Default for HitSparkMaterial {
     fn default() -> Self {
         Self {
-            edge_color: LinearRgba::rgb(1.0, 0.2, 0.05),
-            mid_color: LinearRgba::rgb(1.0, 1.0, 0.1),
-            base_color: LinearRgba::rgb(1.0, 1.0, 1.0),
+            edge_color: HIT_SPARK_EDGE_COLOR.into(),
+            mid_color: HIT_SPARK_MID_COLOR.into(),
+            base_color: HIT_SPARK_BASE_COLOR.into(),
             start_time: 0.0,
         }
     }
@@ -62,8 +66,8 @@ impl BlockEffectMaterial {
 impl Default for BlockEffectMaterial {
     fn default() -> Self {
         Self {
-            edge_color: LinearRgba::rgb(0.1, 0.2, 1.0),
-            base_color: LinearRgba::rgb(1.0, 1.0, 1.0),
+            edge_color: BLOCK_EFFECT_EDGE_COLOR.into(),
+            base_color: BLOCK_EFFECT_BASE_COLOR.into(),
             speed: 1.5,
             start_time: 0.0,
         }
@@ -100,8 +104,8 @@ impl ClashSparkMaterial {
 impl Default for ClashSparkMaterial {
     fn default() -> Self {
         Self {
-            edge_color: LinearRgba::rgb(0.9, 0.1, 0.9),
-            base_color: LinearRgba::rgb(1.0, 0.5, 1.0),
+            edge_color: CLASH_SPARK_EDGE_COLOR.into(),
+            base_color: CLASH_SPARK_BASE_COLOR.into(),
             speed: 1.2,
             start_time: 0.0,
         }

diff --git a/client/wag_core/src/color_palette.rs b/client/wag_core/src/color_palette.rs
@@ -43,6 +43,17 @@ pub const HIT_FLASH_COLOR: Color = Color::WHITE;
 pub const GI_PARRY_FLASH_COLOR: Color = Color::Srgba(ALICE_BLUE);
 pub const TRACK_SPIKES_FLASH_COLOR: Color = Color::Srgba(YELLOW);
 
+// Shader effects
+pub const HIT_SPARK_BASE_COLOR: Color = Color::WHITE;
+pub const HIT_SPARK_MID_COLOR: Color = Color::srgb(1.0, 1.0, 0.1);
+pub const HIT_SPARK_EDGE_COLOR: Color = Color::srgb(1.0, 0.2, 0.05);
+
+pub const BLOCK_EFFECT_BASE_COLOR: Color = Color::WHITE;
+pub const BLOCK_EFFECT_EDGE_COLOR: Color = Color::srgb(0.1, 0.2, 1.0);
+
+pub const CLASH_SPARK_BASE_COLOR: Color = Color::srgb(1.0, 0.5, 1.0);
+pub const CLASH_SPARK_EDGE_COLOR: Color = Color::srgb(0.9, 0.1, 0.9);
+
 // Player colors
 pub const MIZUKI_ALT_SHIRT_COLOR: Color = Color::WHITE;
 pub const MIZUKI_ALT_JEANS_COLOR: Color = Color::Srgba(MIDNIGHT_BLUE);