flattened layers and elevations

2022-10-19 13:02:51 -07:00
parent 0d9eecd2ed
commit e3809c267d
26 changed files with 203 additions and 398 deletions
@@ -797,22 +797,16 @@ pub struct ColorScheme {
    pub name: String,
    pub is_light: bool,

-    pub lowest: Elevation,
-    pub middle: Elevation,
-    pub highest: Elevation,
-
-    pub players: Vec<Player>,
-}
-
-#[derive(Clone, Deserialize, Default)]
-pub struct Elevation {
    pub ramps: RampSet,

-    pub bottom: Layer,
+    pub lowest: Layer,
    pub middle: Layer,
-    pub top: Layer,
+    pub highest: Layer,

-    pub shadow: Option<Shadow>,
+    pub popover_shadow: Shadow,
+    pub modal_shadow: Shadow,
+
+    pub players: Vec<Player>,
 }

 #[derive(Clone, Deserialize, Default)]