From 178babdec9d963009c1d54075690d375627feee2 Mon Sep 17 00:00:00 2001 From: crumblingstatue Date: Fri, 7 Apr 2023 23:05:24 +0200 Subject: [PATCH] Improve lighting a bit --- res/light2.png | Bin 0 -> 8579 bytes src/game.rs | 4 ++-- src/res.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 res/light2.png diff --git a/res/light2.png b/res/light2.png new file mode 100644 index 0000000000000000000000000000000000000000..a06f1a3eca7806511aa7fd8b814cfab3f85c7342 GIT binary patch literal 8579 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 literal 0 HcmV?d00001 diff --git a/src/game.rs b/src/game.rs index 27f9061..8a20fc8 100644 --- a/src/game.rs +++ b/src/game.rs @@ -98,8 +98,8 @@ impl GameState { ls.pos.y as i32 - self.camera_offset.y as i32, ); let mut s = Sprite::with_texture(&res.light_texture); - s.set_scale((3.0, 3.0)); - s.set_origin((32., 32.)); + s.set_scale((4., 4.)); + s.set_origin((128., 128.)); s.set_position((x as f32, y as f32)); lightmap.draw(&s); } diff --git a/src/res.rs b/src/res.rs index 27f99e7..954e6f5 100644 --- a/src/res.rs +++ b/src/res.rs @@ -12,7 +12,7 @@ impl Res { pub fn load() -> anyhow::Result { Ok(Self { tile_atlas: Texture::from_file("res/tiles.png")?, - light_texture: Texture::from_file("res/lightcircle.png")?, + light_texture: Texture::from_file("res/light2.png")?, surf_music: Music::from_file("res/music.ogg").unwrap(), und_music: Music::from_file("res/cave2.ogg").unwrap(), })