Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename SharedWeather to CompressedWeather

Browse Source
This commit is contained in:
Isse
2024-01-23 21:05:57 +01:00
parent 268215b301
commit b55038a526
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/lib.rs
View File

@ -49,7 +49,7 @@ use common::{
trade::{PendingTrade, SitePrices, TradeAction, TradeId, TradeResult}, trade::{PendingTrade, SitePrices, TradeAction, TradeId, TradeResult},
uid::{IdMaps, Uid}, uid::{IdMaps, Uid},
vol::RectVolSize, vol::RectVolSize,
weather::{SharedWeatherGrid, Weather, WeatherGrid}, weather::{CompressedWeather, SharedWeatherGrid, Weather, WeatherGrid},
}; };
#[cfg(feature = "tracy")] use common_base::plot; #[cfg(feature = "tracy")] use common_base::plot;
use common_base::{prof_span, span}; use common_base::{prof_span, span};
@ -210,7 +210,7 @@ impl WeatherLerp {
.iter_mut() .iter_mut()
.zip(old.iter().zip(new.iter())) .zip(old.iter().zip(new.iter()))
.for_each(|((_, current), ((_, old), (_, new)))| { .for_each(|((_, current), ((_, old), (_, new)))| {
*current = Weather::lerp_shared(old, new, t); *current = CompressedWeather::lerp_unclamped(old, new, t);
}); });
} }
} }

47
common/src/weather.rs
View File

@ -32,19 +32,11 @@ impl Weather {
} }
} }
pub fn lerp_unclamped(from: &Self, to: &Self, t: f32) -> Self { pub fn lerp_unclamped(&self, to: &Self, t: f32) -> Self {
Self { Self {
cloud: f32::lerp_unclamped(from.cloud, to.cloud, t), cloud: f32::lerp_unclamped(self.cloud, to.cloud, t),
rain: f32::lerp_unclamped(from.rain, to.rain, t), rain: f32::lerp_unclamped(self.rain, to.rain, t),
wind: Vec2::<f32>::lerp_unclamped(from.wind, to.wind, t), wind: Vec2::<f32>::lerp_unclamped(self.wind, to.wind, t),
}
}
pub fn lerp_shared(from: &SharedWeather, to: &SharedWeather, t: f32) -> Self {
Self {
cloud: f32::lerp_unclamped(from.cloud as f32, to.cloud as f32, t) / 255.0,
rain: f32::lerp_unclamped(from.rain as f32, to.rain as f32, t) / 255.0,
wind: Vec2::zero(),
} }
} }
@ -88,13 +80,24 @@ pub struct WeatherGrid {
weather: Grid<Weather>, weather: Grid<Weather>,
} }
/// Weather that's compressed in order to send it to the client.
#[derive(Default, Debug, Clone, Copy, Serialize, Deserialize)] #[derive(Default, Debug, Clone, Copy, Serialize, Deserialize)]
pub struct SharedWeather { pub struct CompressedWeather {
cloud: u8, cloud: u8,
rain: u8, rain: u8,
} }
impl From<Weather> for SharedWeather { impl CompressedWeather {
pub fn lerp_unclamped(&self, to: &CompressedWeather, t: f32) -> Weather {
Weather {
cloud: f32::lerp_unclamped(self.cloud as f32, to.cloud as f32, t) / 255.0,
rain: f32::lerp_unclamped(self.rain as f32, to.rain as f32, t) / 255.0,
wind: Vec2::zero(),
}
}
}
impl From<Weather> for CompressedWeather {
fn from(weather: Weather) -> Self { fn from(weather: Weather) -> Self {
Self { Self {
cloud: (weather.cloud * 255.0) as u8, cloud: (weather.cloud * 255.0) as u8,
@ -103,8 +106,8 @@ impl From<Weather> for SharedWeather {
} }
} }
impl From<SharedWeather> for Weather { impl From<CompressedWeather> for Weather {
fn from(weather: SharedWeather) -> Self { fn from(weather: CompressedWeather) -> Self {
Self { Self {
cloud: weather.cloud as f32 / 255.0, cloud: weather.cloud as f32 / 255.0,
rain: weather.rain as f32 / 255.0, rain: weather.rain as f32 / 255.0,
@ -115,7 +118,7 @@ impl From<SharedWeather> for Weather {
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
pub struct SharedWeatherGrid { pub struct SharedWeatherGrid {
weather: Grid<SharedWeather>, weather: Grid<CompressedWeather>,
} }
impl From<&WeatherGrid> for SharedWeatherGrid { impl From<&WeatherGrid> for SharedWeatherGrid {
@ -128,7 +131,7 @@ impl From<&WeatherGrid> for SharedWeatherGrid {
.raw() .raw()
.iter() .iter()
.copied() .copied()
.map(SharedWeather::from) .map(CompressedWeather::from)
.collect::<Vec<_>>(), .collect::<Vec<_>>(),
), ),
} }
@ -156,13 +159,15 @@ impl SharedWeatherGrid {
pub fn new(size: Vec2<u32>) -> Self { pub fn new(size: Vec2<u32>) -> Self {
size.map(|e| debug_assert!(i32::try_from(e).is_ok())); size.map(|e| debug_assert!(i32::try_from(e).is_ok()));
Self { Self {
weather: Grid::new(size.as_(), SharedWeather::default()), weather: Grid::new(size.as_(), CompressedWeather::default()),
} }
} }
pub fn iter(&self) -> impl Iterator<Item = (Vec2<i32>, &SharedWeather)> { self.weather.iter() } pub fn iter(&self) -> impl Iterator<Item = (Vec2<i32>, &CompressedWeather)> {
self.weather.iter()
}
pub fn iter_mut(&mut self) -> impl Iterator<Item = (Vec2<i32>, &mut SharedWeather)> { pub fn iter_mut(&mut self) -> impl Iterator<Item = (Vec2<i32>, &mut CompressedWeather)> {
self.weather.iter_mut() self.weather.iter_mut()
} }