Skip to content

Commit

Permalink
Add synthwave theme and change bamboo
Browse files Browse the repository at this point in the history
  • Loading branch information
@benfrankel
benfrankel committed Dec 10, 2023
1 parent 490b92e commit 9d26d0e
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 23 deletions.
65 changes: 44 additions & 21 deletions assets/config.ron
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,49 +95,72 @@
),

dracula_theme: EditorScreenTheme(
info_bar_background_color: Rgba(red: 0.086, green: 0.082, blue: 0.133, alpha: 1.000),
info_bar_background_color: Rgba(red: 0.071, green: 0.071, blue: 0.125, alpha: 1.000),
info_bar_text_color: Rgba(red: 0.800, green: 0.800, blue: 0.800, alpha: 1.000),

outline_panel_background_color: Rgba(red: 0.184, green: 0.188, blue: 0.239, alpha: 1.000),
outline_panel_background_color: Rgba(red: 0.125, green: 0.125, blue: 0.176, alpha: 1.000),
outline_panel_highlight_color: Rgba(red: 0.263, green: 0.275, blue: 0.318, alpha: 1.000),
outline_panel_text_color: Rgba(red: 0.800, green: 0.800, blue: 0.800, alpha: 1.000),

code_panel_background_color: Rgba(red: 0.086, green: 0.082, blue: 0.133, alpha: 1.000),
code_panel_background_color: Rgba(red: 0.071, green: 0.071, blue: 0.125, alpha: 1.000),
code_panel_text_color: Rgba(red: 0.300, green: 0.900, blue: 0.000, alpha: 1.000),

upgrade_panel_background_color: Rgba(red: 0.184, green: 0.188, blue: 0.239, alpha: 1.000),
upgrade_panel_background_color: Rgba(red: 0.125, green: 0.125, blue: 0.176, alpha: 1.000),
upgrade_panel_text_color: Rgba(red: 0.800, green: 0.800, blue: 0.800, alpha: 1.000),

upgrade_button_normal_color: Rgba(red: 0.353, green: 0.373, blue: 0.416, alpha: 1.000),
upgrade_button_hovered_color: Rgba(red: 0.471, green: 0.506, blue: 0.529, alpha: 1.000),
upgrade_button_pressed_color: Rgba(red: 0.086, green: 0.082, blue: 0.133, alpha: 1.000),
upgrade_button_disabled_color: Rgba(red: 0.086, green: 0.082, blue: 0.133, alpha: 1.000),
upgrade_button_pressed_color: Rgba(red: 0.071, green: 0.071, blue: 0.125, alpha: 1.000),
upgrade_button_disabled_color: Rgba(red: 0.071, green: 0.071, blue: 0.125, alpha: 1.000),
upgrade_button_text_color: Rgba(red: 0.800, green: 0.800, blue: 0.800, alpha: 1.000),

separator_color: Rgba(red: 0.353, green: 0.373, blue: 0.416, alpha: 1.000),
),

synthwave_theme: EditorScreenTheme(
info_bar_background_color: Rgba(red: 0.114, green: 0.059, blue: 0.133, alpha: 1.000),
info_bar_text_color: Rgba(red: 0.925, green: 0.867, blue: 0.478, alpha: 1.000),

outline_panel_background_color: Rgba(red: 0.231, green: 0.078, blue: 0.243, alpha: 1.000),
outline_panel_highlight_color: Rgba(red: 0.616, green: 0.282, blue: 0.400, alpha: 1.000),
outline_panel_text_color: Rgba(red: 0.925, green: 0.867, blue: 0.478, alpha: 1.000),

code_panel_background_color: Rgba(red: 0.114, green: 0.059, blue: 0.133, alpha: 1.000),
code_panel_text_color: Rgba(red: 0.208, green: 0.796, blue: 0.937, alpha: 1.000),

upgrade_panel_background_color: Rgba(red: 0.231, green: 0.078, blue: 0.243, alpha: 1.000),
upgrade_panel_text_color: Rgba(red: 0.925, green: 0.867, blue: 0.478, alpha: 1.000),

upgrade_button_normal_color: Rgba(red: 0.616, green: 0.282, blue: 0.400, alpha: 1.000),
upgrade_button_hovered_color: Rgba(red: 0.757, green: 0.498, blue: 0.333, alpha: 1.000),
upgrade_button_pressed_color: Rgba(red: 0.114, green: 0.059, blue: 0.133, alpha: 1.000),
upgrade_button_disabled_color: Rgba(red: 0.114, green: 0.059, blue: 0.133, alpha: 1.000),
upgrade_button_text_color: Rgba(red: 0.925, green: 0.867, blue: 0.478, alpha: 1.000),

separator_color: Rgba(red: 0.616, green: 0.282, blue: 0.400, alpha: 1.000),
),

bamboo_theme: EditorScreenTheme(
info_bar_background_color: Rgba(red: 0.10, green: 0.11, blue: 0.12, alpha: 1.000),
info_bar_text_color: Rgba(red: 0.800, green: 0.800, blue: 0.800, alpha: 1.000),
info_bar_background_color: Rgba(red: 0.055, green: 0.137, blue: 0.106, alpha: 1.000),
info_bar_text_color: Rgba(red: 0.906, green: 0.878, blue: 0.725, alpha: 1.000),

outline_panel_background_color: Rgba(red: 0.165, green: 0.18, blue: 0.184, alpha: 1.000),
outline_panel_highlight_color: Rgba(red: 0.265, green: 0.28, blue: 0.284, alpha: 1.000),
outline_panel_text_color: Rgba(red: 0.800, green: 0.800, blue: 0.800, alpha: 1.000),
outline_panel_background_color: Rgba(red: 0.063, green: 0.255, blue: 0.145, alpha: 1.000),
outline_panel_highlight_color: Rgba(red: 0.290, green: 0.529, blue: 0.235, alpha: 1.000),
outline_panel_text_color: Rgba(red: 0.906, green: 0.878, blue: 0.725, alpha: 1.000),

code_panel_background_color: Rgba(red: 0.10, green: 0.11, blue: 0.12, alpha: 1.000),
code_panel_text_color: Rgba(red: 0.300, green: 0.900, blue: 0.000, alpha: 1.000),
code_panel_background_color: Rgba(red: 0.055, green: 0.137, blue: 0.106, alpha: 1.000),
code_panel_text_color: Rgba(red: 0.678, green: 0.980, blue: 0.145, alpha: 1.000),

upgrade_panel_background_color: Rgba(red: 0.165, green: 0.18, blue: 0.184, alpha: 1.000),
upgrade_panel_text_color: Rgba(red: 0.800, green: 0.800, blue: 0.800, alpha: 1.000),
upgrade_panel_background_color: Rgba(red: 0.063, green: 0.255, blue: 0.145, alpha: 1.000),
upgrade_panel_text_color: Rgba(red: 0.906, green: 0.878, blue: 0.725, alpha: 1.000),

upgrade_button_normal_color: Rgba(red: 0.265, green: 0.28, blue: 0.284, alpha: 1.000),
upgrade_button_hovered_color: Rgba(red: 0.365, green: 0.38, blue: 0.384, alpha: 1.000),
upgrade_button_pressed_color: Rgba(red: 0.165, green: 0.18, blue: 0.184, alpha: 1.000),
upgrade_button_disabled_color: Rgba(red: 0.065, green: 0.08, blue: 0.084, alpha: 1.000),
upgrade_button_text_color: Rgba(red: 0.800, green: 0.800, blue: 0.800, alpha: 1.000),
upgrade_button_normal_color: Rgba(red: 0.290, green: 0.529, blue: 0.235, alpha: 1.000),
upgrade_button_hovered_color: Rgba(red: 0.588, green: 0.682, blue: 0.400, alpha: 1.000),
upgrade_button_pressed_color: Rgba(red: 0.055, green: 0.137, blue: 0.106, alpha: 1.000),
upgrade_button_disabled_color: Rgba(red: 0.055, green: 0.137, blue: 0.106, alpha: 1.000),
upgrade_button_text_color: Rgba(red: 0.906, green: 0.878, blue: 0.725, alpha: 1.000),

separator_color: Rgba(red: 0.265, green: 0.28, blue: 0.284, alpha: 1.000),
separator_color: Rgba(red: 0.290, green: 0.529, blue: 0.235, alpha: 1.000),
),
),

Expand Down
3 changes: 2 additions & 1 deletion src/state/editor_screen.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ pub struct EditorScreenConfig {

pub light_theme: EditorScreenTheme,
pub dracula_theme: EditorScreenTheme,
pub synthwave_theme: EditorScreenTheme,
pub bamboo_theme: EditorScreenTheme,
}

Expand All @@ -125,7 +126,7 @@ fn enter_editor_screen(
commands.insert_resource(ClearColor(config.scene_view_background_color));
commands.insert_resource(EditorScreenStartTime(time.elapsed_seconds_f64()));

let screen = spawn_editor_screen(&mut commands, &config, &config.light_theme, true);
let screen = spawn_editor_screen(&mut commands, config, &config.light_theme, true);
commands.entity(screen).set_parent(root.ui);
}

Expand Down
35 changes: 34 additions & 1 deletion src/upgrade.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,10 @@ fn load_upgrade_sequence(mut commands: Commands) {
use UpgradeKind::*;

commands.insert_resource(UpgradeSequence::new(vec![
(vec![DarkModeDracula, DarkModeBamboo], String::new()),
(
vec![DarkModeDracula, DarkModeBamboo, DarkModeSynthwave],
String::new(),
),
(
vec![Inspiration],
"\"Much better. Now I can get started.\"".to_string(),
Expand Down Expand Up @@ -752,6 +755,36 @@ generate_upgrade_list!(
..default()
},

DarkModeSynthwave: Upgrade {
name: "Dark Mode (Synthwave)".to_string(),
desc: "Rite of passage for all developers. Required to write code.".to_string(),
sound: None,
install: Some(world.register_system(|
mut commands: Commands,
root: Res<AppRoot>,
config: Res<Config>,
music: Res<BackgroundMusic>,
mut audio_instances: ResMut<Assets<AudioInstance>>,
| {
commands.entity(root.ui).despawn_descendants();
let editor_screen = spawn_editor_screen(
&mut commands,
&config.editor_screen,
&config.editor_screen.synthwave_theme,
false,
);
commands.entity(editor_screen).set_parent(root.ui);

// Start background music
if let Some(instance) = audio_instances.get_mut(&music.0) {
instance.resume(AudioTween::default());
} else {
error!("Background music has not loaded yet");
}
})),
..default()
},

// Lines (manual)

MechanicalKeyboard: Upgrade {
Expand Down

0 comments on commit 9d26d0e

Please sign in to comment.