diff --git a/README.md b/README.md index eed8635..3c03126 100644 --- a/README.md +++ b/README.md @@ -233,6 +233,7 @@ To change, use the control customization menu or edit `doukutsu-rs\data\settings #### Credits - Studio Pixel/Nicalis for Cave Story +- [AppleHair](https://github.com/AppleHair) - icon redesign for all platforms(`crabsue-icon`). - [@Daedily](https://twitter.com/Daedliy) - brand artwork (Icon / Banner / Server), screenshots for this guide. - [ggez](https://github.com/ggez/ggez) - parts of it are used in `crate::framework`, notably the VFS code. - [Clownacy](https://github.com/Clownacy) - widescreen camera code. diff --git a/app/app/src/main/ic_launcher-playstore.png b/app/app/src/main/ic_launcher-playstore.png index 15fcb33..b47c0c2 100644 Binary files a/app/app/src/main/ic_launcher-playstore.png and b/app/app/src/main/ic_launcher-playstore.png differ diff --git a/app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml index 2b068d1..a0d8222 100644 --- a/app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ b/app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -5,22 +5,22 @@ android:viewportWidth="108" android:viewportHeight="108"> - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 036d09b..c4a603d 100644 --- a/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 036d09b..c4a603d 100644 --- a/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/app/src/main/res/mipmap-anydpi-v26/icon_sue.xml b/app/app/src/main/res/mipmap-anydpi-v26/icon_sue.xml new file mode 100644 index 0000000..b2eda23 --- /dev/null +++ b/app/app/src/main/res/mipmap-anydpi-v26/icon_sue.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/app/src/main/res/mipmap-anydpi-v26/icon_sue_round.xml b/app/app/src/main/res/mipmap-anydpi-v26/icon_sue_round.xml new file mode 100644 index 0000000..b2eda23 --- /dev/null +++ b/app/app/src/main/res/mipmap-anydpi-v26/icon_sue_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/app/src/main/res/mipmap-hdpi/ic_launcher.png index d087e94..e03514d 100644 Binary files a/app/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index 35ba79d..483aaf5 100644 Binary files a/app/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index ccab741..839c7f8 100644 Binary files a/app/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/app/src/main/res/mipmap-hdpi/icon_sue.png b/app/app/src/main/res/mipmap-hdpi/icon_sue.png new file mode 100644 index 0000000..d087e94 Binary files /dev/null and b/app/app/src/main/res/mipmap-hdpi/icon_sue.png differ diff --git a/app/app/src/main/res/mipmap-hdpi/icon_sue_foreground.png b/app/app/src/main/res/mipmap-hdpi/icon_sue_foreground.png new file mode 100644 index 0000000..35ba79d Binary files /dev/null and b/app/app/src/main/res/mipmap-hdpi/icon_sue_foreground.png differ diff --git a/app/app/src/main/res/mipmap-hdpi/icon_sue_round.png b/app/app/src/main/res/mipmap-hdpi/icon_sue_round.png new file mode 100644 index 0000000..ccab741 Binary files /dev/null and b/app/app/src/main/res/mipmap-hdpi/icon_sue_round.png differ diff --git a/app/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/app/src/main/res/mipmap-mdpi/ic_launcher.png index a2e8780..eb5c60d 100644 Binary files a/app/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index a211569..f1b9b8c 100644 Binary files a/app/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 1fbb807..0c3b681 100644 Binary files a/app/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/app/src/main/res/mipmap-mdpi/icon_sue.png b/app/app/src/main/res/mipmap-mdpi/icon_sue.png new file mode 100644 index 0000000..a2e8780 Binary files /dev/null and b/app/app/src/main/res/mipmap-mdpi/icon_sue.png differ diff --git a/app/app/src/main/res/mipmap-mdpi/icon_sue_foreground.png b/app/app/src/main/res/mipmap-mdpi/icon_sue_foreground.png new file mode 100644 index 0000000..a211569 Binary files /dev/null and b/app/app/src/main/res/mipmap-mdpi/icon_sue_foreground.png differ diff --git a/app/app/src/main/res/mipmap-mdpi/icon_sue_round.png b/app/app/src/main/res/mipmap-mdpi/icon_sue_round.png new file mode 100644 index 0000000..1fbb807 Binary files /dev/null and b/app/app/src/main/res/mipmap-mdpi/icon_sue_round.png differ diff --git a/app/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 96f32ff..03f13f0 100644 Binary files a/app/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index f7ba99f..697e2b9 100644 Binary files a/app/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index ddf5690..56428fe 100644 Binary files a/app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/app/src/main/res/mipmap-xhdpi/icon_sue.png b/app/app/src/main/res/mipmap-xhdpi/icon_sue.png new file mode 100644 index 0000000..96f32ff Binary files /dev/null and b/app/app/src/main/res/mipmap-xhdpi/icon_sue.png differ diff --git a/app/app/src/main/res/mipmap-xhdpi/icon_sue_foreground.png b/app/app/src/main/res/mipmap-xhdpi/icon_sue_foreground.png new file mode 100644 index 0000000..f7ba99f Binary files /dev/null and b/app/app/src/main/res/mipmap-xhdpi/icon_sue_foreground.png differ diff --git a/app/app/src/main/res/mipmap-xhdpi/icon_sue_round.png b/app/app/src/main/res/mipmap-xhdpi/icon_sue_round.png new file mode 100644 index 0000000..ddf5690 Binary files /dev/null and b/app/app/src/main/res/mipmap-xhdpi/icon_sue_round.png differ diff --git a/app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index bd61c87..e5c7686 100644 Binary files a/app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index b3ad3d9..747cccb 100644 Binary files a/app/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index f3d87da..ae3ca2b 100644 Binary files a/app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/app/src/main/res/mipmap-xxhdpi/icon_sue.png b/app/app/src/main/res/mipmap-xxhdpi/icon_sue.png new file mode 100644 index 0000000..bd61c87 Binary files /dev/null and b/app/app/src/main/res/mipmap-xxhdpi/icon_sue.png differ diff --git a/app/app/src/main/res/mipmap-xxhdpi/icon_sue_foreground.png b/app/app/src/main/res/mipmap-xxhdpi/icon_sue_foreground.png new file mode 100644 index 0000000..b3ad3d9 Binary files /dev/null and b/app/app/src/main/res/mipmap-xxhdpi/icon_sue_foreground.png differ diff --git a/app/app/src/main/res/mipmap-xxhdpi/icon_sue_round.png b/app/app/src/main/res/mipmap-xxhdpi/icon_sue_round.png new file mode 100644 index 0000000..f3d87da Binary files /dev/null and b/app/app/src/main/res/mipmap-xxhdpi/icon_sue_round.png differ diff --git a/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 40169ba..f7c1cb2 100644 Binary files a/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index a480489..4bd4c0c 100644 Binary files a/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index acf69cc..85ce807 100644 Binary files a/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/app/src/main/res/mipmap-xxxhdpi/icon_sue.png b/app/app/src/main/res/mipmap-xxxhdpi/icon_sue.png new file mode 100644 index 0000000..40169ba Binary files /dev/null and b/app/app/src/main/res/mipmap-xxxhdpi/icon_sue.png differ diff --git a/app/app/src/main/res/mipmap-xxxhdpi/icon_sue_foreground.png b/app/app/src/main/res/mipmap-xxxhdpi/icon_sue_foreground.png new file mode 100644 index 0000000..a480489 Binary files /dev/null and b/app/app/src/main/res/mipmap-xxxhdpi/icon_sue_foreground.png differ diff --git a/app/app/src/main/res/mipmap-xxxhdpi/icon_sue_round.png b/app/app/src/main/res/mipmap-xxxhdpi/icon_sue_round.png new file mode 100644 index 0000000..acf69cc Binary files /dev/null and b/app/app/src/main/res/mipmap-xxxhdpi/icon_sue_round.png differ diff --git a/app/app/src/main/res/values/ic_launcher_background.xml b/app/app/src/main/res/values/ic_launcher_background.xml index b2b6337..0081dc8 100644 --- a/app/app/src/main/res/values/ic_launcher_background.xml +++ b/app/app/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,5 @@ #FD7F44 + #FD7F44 \ No newline at end of file diff --git a/build.rs b/build.rs index df14ab8..71349e4 100644 --- a/build.rs +++ b/build.rs @@ -12,7 +12,7 @@ fn main() { #[cfg(target_os = "windows")] if target.contains("windows") { let mut res = winres::WindowsResource::new(); - res.set_icon("res/sue.ico"); + res.set_icon("res/crabsue-icon.ico"); res.compile().unwrap(); if target.contains("i686") { diff --git a/drshorizon/build_debug.sh b/drshorizon/build_debug.sh index 4894563..f11ad11 100755 --- a/drshorizon/build_debug.sh +++ b/drshorizon/build_debug.sh @@ -27,7 +27,7 @@ nacptool --create 'doukutsu-rs' 'doukutsu-rs contributors' '0.101.0' target/aarc message "Running elf2nro..." elf2nro target/aarch64-nintendo-switch/debug/drshorizon.elf target/aarch64-nintendo-switch/debug/drshorizon.nro \ - --icon=../res/nx_icon.jpg \ + --icon=../res/crabsue-icon.jpg \ --nacp=target/aarch64-nintendo-switch/debug/drshorizon.nacp message "done!" diff --git a/drshorizon/build_release.sh b/drshorizon/build_release.sh index e78911d..5bb4d88 100755 --- a/drshorizon/build_release.sh +++ b/drshorizon/build_release.sh @@ -27,7 +27,7 @@ nacptool --create 'doukutsu-rs' 'doukutsu-rs contributors' '0.101.0' target/aarc message "Running elf2nro..." elf2nro target/aarch64-nintendo-switch/release/drshorizon.elf target/aarch64-nintendo-switch/release/drshorizon.nro \ - --icon=../res/nx_icon.jpg \ + --icon=../res/crabsue-icon.jpg \ --nacp=target/aarch64-nintendo-switch/release/drshorizon.nacp message "done!" diff --git a/res/crabsue-icon.bmp b/res/crabsue-icon.bmp new file mode 100644 index 0000000..361b42f Binary files /dev/null and b/res/crabsue-icon.bmp differ diff --git a/res/crabsue-icon.ico b/res/crabsue-icon.ico new file mode 100644 index 0000000..0573b7e Binary files /dev/null and b/res/crabsue-icon.ico differ diff --git a/res/crabsue-icon.jpg b/res/crabsue-icon.jpg new file mode 100644 index 0000000..b6d5300 Binary files /dev/null and b/res/crabsue-icon.jpg differ diff --git a/src/data/builtin_fs.rs b/src/data/builtin_fs.rs index 788bc89..34bf8b8 100644 --- a/src/data/builtin_fs.rs +++ b/src/data/builtin_fs.rs @@ -102,7 +102,9 @@ impl BuiltinFS { FSNode::File("builtin_font_0.png", include_bytes!("builtin/builtin_font_0.png")), FSNode::File("builtin_font_1.png", include_bytes!("builtin/builtin_font_1.png")), FSNode::File("gamecontrollerdb.txt", include_bytes!("builtin/gamecontrollerdb.txt")), - FSNode::File("icon.bmp", include_bytes!("../../res/sue.bmp")), + + #[cfg(not(any(target_os = "windows", target_os = "android", target_os = "horizon")))] + FSNode::File("icon.bmp", include_bytes!("../../res/crabsue-icon.bmp")), FSNode::File( "organya-wavetable-doukutsu.bin", include_bytes!("builtin/organya-wavetable-doukutsu.bin"), diff --git a/src/framework/backend_sdl2.rs b/src/framework/backend_sdl2.rs index fd91da3..6851f0a 100644 --- a/src/framework/backend_sdl2.rs +++ b/src/framework/backend_sdl2.rs @@ -185,14 +185,14 @@ impl SDL2EventLoop { let mut file = filesystem::open(&ctx, "/builtin/icon.bmp").unwrap(); let mut buf: Vec = Vec::new(); file.read_to_end(&mut buf)?; - + let mut rwops = RWops::from_bytes(buf.as_slice()).unwrap(); let icon = Surface::load_bmp_rw(&mut rwops).unwrap(); - + window.set_icon(icon); } - - + + let opengl_available = if let Ok(v) = std::env::var("CAVESTORY_NO_OPENGL") { v != "1" } else { true }; let event_loop = SDL2EventLoop {