diff --git a/assets/images/artix_hi.png b/assets/images/artix_hi.png new file mode 120000 index 0000000..538bade --- /dev/null +++ b/assets/images/artix_hi.png @@ -0,0 +1 @@ +artix.png \ No newline at end of file diff --git a/assets/images/bitogo.jpg b/assets/images/bitogo.jpg index d174ef9..7e8803e 100644 Binary files a/assets/images/bitogo.jpg and b/assets/images/bitogo.jpg differ diff --git a/assets/images/bitogo_hi.jpg b/assets/images/bitogo_hi.jpg new file mode 100644 index 0000000..439d98b Binary files /dev/null and b/assets/images/bitogo_hi.jpg differ diff --git a/assets/images/block_scrappapercircus_hi.jpg b/assets/images/block_scrappapercircus_hi.jpg new file mode 100644 index 0000000..dae62c0 Binary files /dev/null and b/assets/images/block_scrappapercircus_hi.jpg differ diff --git a/assets/images/chicanery_hi.jpg b/assets/images/chicanery_hi.jpg new file mode 100644 index 0000000..d651dba Binary files /dev/null and b/assets/images/chicanery_hi.jpg differ diff --git a/assets/images/classic_scrappapercircus_hi.jpg b/assets/images/classic_scrappapercircus_hi.jpg new file mode 100644 index 0000000..5abc504 Binary files /dev/null and b/assets/images/classic_scrappapercircus_hi.jpg differ diff --git a/assets/images/coptic_scrappapercircus_hi.jpg b/assets/images/coptic_scrappapercircus_hi.jpg new file mode 100644 index 0000000..f43c0c5 Binary files /dev/null and b/assets/images/coptic_scrappapercircus_hi.jpg differ diff --git a/assets/images/doggo_hi.jpg b/assets/images/doggo_hi.jpg new file mode 100644 index 0000000..b4474a3 Binary files /dev/null and b/assets/images/doggo_hi.jpg differ diff --git a/assets/images/dotfiles_hi.jpg b/assets/images/dotfiles_hi.jpg new file mode 100644 index 0000000..6b5994e Binary files /dev/null and b/assets/images/dotfiles_hi.jpg differ diff --git a/assets/images/hiking_hi.jpg b/assets/images/hiking_hi.jpg new file mode 100644 index 0000000..e8654d1 Binary files /dev/null and b/assets/images/hiking_hi.jpg differ diff --git a/assets/images/me.jpg b/assets/images/me.jpg index 2ef5dba..079c953 100644 Binary files a/assets/images/me.jpg and b/assets/images/me.jpg differ diff --git a/assets/images/me_hi.jpg b/assets/images/me_hi.jpg new file mode 100644 index 0000000..7e3adaf Binary files /dev/null and b/assets/images/me_hi.jpg differ diff --git a/assets/images/mta_hi.jpg b/assets/images/mta_hi.jpg new file mode 100644 index 0000000..18f879f Binary files /dev/null and b/assets/images/mta_hi.jpg differ diff --git a/assets/images/neumont_hi.jpg b/assets/images/neumont_hi.jpg new file mode 100644 index 0000000..ef5f117 Binary files /dev/null and b/assets/images/neumont_hi.jpg differ diff --git a/assets/images/nice_beat_hi.jpg b/assets/images/nice_beat_hi.jpg new file mode 100644 index 0000000..780d726 Binary files /dev/null and b/assets/images/nice_beat_hi.jpg differ diff --git a/assets/images/pac1.jpg b/assets/images/pac1.jpg index 83f3fa6..79d8e5e 100644 Binary files a/assets/images/pac1.jpg and b/assets/images/pac1.jpg differ diff --git a/assets/images/pac1_hi.jpg b/assets/images/pac1_hi.jpg new file mode 100644 index 0000000..a5eba2b Binary files /dev/null and b/assets/images/pac1_hi.jpg differ diff --git a/assets/images/pufferfish_hi.jpg b/assets/images/pufferfish_hi.jpg new file mode 100644 index 0000000..e4cfc3f Binary files /dev/null and b/assets/images/pufferfish_hi.jpg differ diff --git a/assets/images/rovio_hi.jpg b/assets/images/rovio_hi.jpg new file mode 100644 index 0000000..d909920 Binary files /dev/null and b/assets/images/rovio_hi.jpg differ diff --git a/assets/images/saul_goodman_hi.jpg b/assets/images/saul_goodman_hi.jpg new file mode 120000 index 0000000..58d2365 --- /dev/null +++ b/assets/images/saul_goodman_hi.jpg @@ -0,0 +1 @@ +saul_goodman.jpg \ No newline at end of file diff --git a/assets/images/scratch_medal.jpg b/assets/images/scratch_medal.jpg index 1669bc3..baf8c11 100644 Binary files a/assets/images/scratch_medal.jpg and b/assets/images/scratch_medal.jpg differ diff --git a/assets/images/scratch_medal_hi.jpg b/assets/images/scratch_medal_hi.jpg new file mode 100644 index 0000000..4c4764b Binary files /dev/null and b/assets/images/scratch_medal_hi.jpg differ diff --git a/assets/images/scratch_winner1_hi.jpg b/assets/images/scratch_winner1_hi.jpg new file mode 100644 index 0000000..5934eec Binary files /dev/null and b/assets/images/scratch_winner1_hi.jpg differ diff --git a/assets/images/scratch_winner2_hi.jpg b/assets/images/scratch_winner2_hi.jpg new file mode 100644 index 0000000..ed708dc Binary files /dev/null and b/assets/images/scratch_winner2_hi.jpg differ diff --git a/assets/images/sonic_remix_hi.jpg b/assets/images/sonic_remix_hi.jpg new file mode 100644 index 0000000..84c8496 Binary files /dev/null and b/assets/images/sonic_remix_hi.jpg differ diff --git a/src/app.rs b/src/app.rs index 10ddb64..feda56a 100644 --- a/src/app.rs +++ b/src/app.rs @@ -63,6 +63,7 @@ pub enum ContextBlock { Image { alt_text: Arc>, image: Image<'static>, + hi_image: Image<'static>, }, } @@ -233,16 +234,24 @@ impl ContextWindow { last_indent = buffer.indent.modifier; let buffer = if let Some(url) = buffer.image_url { let image; + let hi_image; let url = url.split_once('#').unwrap(); let size = url.1.split_once('x').unwrap(); let size = Vec2::new(size.0.parse().unwrap(), size.1.parse().unwrap()); #[cfg(target_arch = "wasm32")] { image = Image::from_uri(format!(concat!(env!("PHOST"), "/{}"), url.0)); + let split = url.0.rsplit_once('.').unwrap(); + hi_image = Image::from_uri(format!( + concat!(env!("PHOST"), "/{}_hi.{}"), + split.0, split.1 + )); } #[cfg(not(target_arch = "wasm32"))] { image = Image::from_uri(format!("file://assets/{}", url.0)); + let split = url.0.rsplit_once('.').unwrap(); + hi_image = Image::from_uri(format!("file://assets/{}_hi.{}", split.0, split.1)); } let mut res = ( Rect::from_min_size( @@ -253,6 +262,7 @@ impl ContextWindow { ContextBlock::Image { alt_text: Arc::new(RwLock::new(buffer.buffer)), image, + hi_image, }, ); const IMAGE_PADDING: f32 = 8.0; @@ -685,7 +695,9 @@ impl eframe::App for Portfolio { _ => {} } } - ContextBlock::Image { image, .. } => { + ContextBlock::Image { + image, hi_image, .. + } => { let image_rect = context_block.0.translate(rect.min.to_vec2()); let image_response = ui.allocate_rect(image_rect, Sense::click()); @@ -752,7 +764,7 @@ impl eframe::App for Portfolio { ), ); - image + hi_image .clone() .tint(Color32::WHITE.gamma_multiply(zoom_view_opacity)) .paint_at(&ui, image_rect.lerp_towards(&fs_rect, t)); diff --git a/src/main.rs b/src/main.rs index 6f1663d..d00e3e8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -33,6 +33,7 @@ fn main() { eframe::WebLogger::init(log::LevelFilter::Debug).ok(); let web_options = eframe::WebOptions { + follow_system_theme: false, ..Default::default() };