lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FOV tweaks

Browse source
This commit is contained in:
Llywelwyn 2023-08-23 02:24:33 +01:00
parent 15e8ae13d0
commit bde0706c0d
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/config/visuals.rs
View file

@ -1,7 +1,6 @@
pub const NON_VISIBLE_MULTIPLIER: f32 = 0.3; pub const NON_VISIBLE_MULTIPLIER: f32 = 0.3;
pub const MAX_DARKENING: f32 = 0.3; pub const MAX_DARKENING: f32 = 0.45;
pub const START_DARKEN_AT_N_TILES: f32 = 9.0; pub const START_DARKEN_AT_N_TILES: f32 = 8.0;
pub const MAX_DARKEN_AT_N_TILES: f32 = 12.0;
pub const SHORT_PARTICLE_LIFETIME: f32 = 100.0; pub const SHORT_PARTICLE_LIFETIME: f32 = 100.0;
pub const DEFAULT_PARTICLE_LIFETIME: f32 = 200.0; pub const DEFAULT_PARTICLE_LIFETIME: f32 = 200.0;

17
src/map/themes.rs
View file

@ -22,15 +22,22 @@ pub fn get_tile_renderables_for_id(idx: usize, map: &Map, other_pos: Option<Poin
fg = fg.add(map.additional_fg_offset); fg = fg.add(map.additional_fg_offset);
(fg, bg) = apply_colour_offset(fg, bg, map, idx); (fg, bg) = apply_colour_offset(fg, bg, map, idx);
bg = apply_bloodstain_if_necessary(bg, map, idx); bg = apply_bloodstain_if_necessary(bg, map, idx);
(fg, bg) = darken_if_not_visible(fg, bg, map, idx); let (mut multiplier, mut nonvisible, mut darken) = (1.0, false, false);
if other_pos.is_some() && DARKEN_TILES_BY_DISTANCE { if !map.visible_tiles[idx] {
multiplier = NON_VISIBLE_MULTIPLIER;
nonvisible = true;
}
if other_pos.is_some() && DARKEN_TILES_BY_DISTANCE && !nonvisible {
let distance = darken_by_distance( let distance = darken_by_distance(
Point::new((idx as i32) % map.width, (idx as i32) / map.width), Point::new((idx as i32) % map.width, (idx as i32) / map.width),
other_pos.unwrap() other_pos.unwrap()
); );
(fg, bg) = (fg.mul(distance), bg.mul(distance)); multiplier = distance.clamp(NON_VISIBLE_MULTIPLIER, 1.0);
darken = true;
}
if nonvisible || darken {
(fg, bg) = (fg.mul(multiplier), bg.mul(multiplier));
} }
return (glyph, fg, bg); return (glyph, fg, bg);
} }
@ -257,7 +264,7 @@ fn darken_by_distance(pos: Point, other_pos: Point) -> f32 {
let distance = DistanceAlg::Pythagoras.distance2d(pos, other_pos) as f32; // Get distance in tiles. let distance = DistanceAlg::Pythagoras.distance2d(pos, other_pos) as f32; // Get distance in tiles.
let interp_factor = let interp_factor =
(distance - START_DARKEN_AT_N_TILES) / (distance - START_DARKEN_AT_N_TILES) /
(MAX_DARKEN_AT_N_TILES * (crate::config::entity::DEFAULT_VIEWSHED_STANDARD as f32) - START_DARKEN_AT_N_TILES); ((crate::config::entity::DEFAULT_VIEWSHED_STANDARD as f32) - START_DARKEN_AT_N_TILES);
let interp_factor = interp_factor.max(0.0).min(1.0); // Clamp [0-1] let interp_factor = interp_factor.max(0.0).min(1.0); // Clamp [0-1]
return 1.0 - interp_factor * (1.0 - MAX_DARKENING); return 1.0 - interp_factor * (1.0 - MAX_DARKENING);
} }