starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-07-09 06:25:23 +02:00
Code Issues 87 Packages Projects Releases 11 Wiki Activity

refactor(animation): reduce mutex call on ANIMATION_STYLE

Browse Source
This commit is contained in:
thearturca
2024-09-17 22:12:42 +03:00
parent 1a184a4442
commit d3ac6b72c2
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
komorebi/src/animation/animation.rs
+8 -7
View File
@@ -13,6 +13,7 @@ use super::style::apply_ease_func;
use super::ANIMATION_DURATION; use super::ANIMATION_DURATION;
use super::ANIMATION_FPS; use super::ANIMATION_FPS;
use super::ANIMATION_MANAGER; use super::ANIMATION_MANAGER;
use crate::AnimationStyle;
#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, JsonSchema, PartialEq)] #[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, JsonSchema, PartialEq)]
pub struct Animation { pub struct Animation {
@@ -53,19 +54,19 @@ impl Animation {
} }
#[allow(clippy::cast_possible_truncation)] #[allow(clippy::cast_possible_truncation)]
pub fn lerp(start: i32, end: i32, t: f64) -> i32 { pub fn lerp(start: i32, end: i32, t: f64, style: AnimationStyle) -> i32 {
let time = apply_ease_func(t); let time = apply_ease_func(t, style);
f64::from(end - start) f64::from(end - start)
.mul_add(time, f64::from(start)) .mul_add(time, f64::from(start))
.round() as i32 .round() as i32
} }
pub fn lerp_rect(start_rect: &Rect, end_rect: &Rect, t: f64) -> Rect { pub fn lerp_rect(start_rect: &Rect, end_rect: &Rect, t: f64, style: AnimationStyle) -> Rect {
Rect { Rect {
left: Self::lerp(start_rect.left, end_rect.left, t), left: Self::lerp(start_rect.left, end_rect.left, t, style),
top: Self::lerp(start_rect.top, end_rect.top, t), top: Self::lerp(start_rect.top, end_rect.top, t, style),
right: Self::lerp(start_rect.right, end_rect.right, t), right: Self::lerp(start_rect.right, end_rect.right, t, style),
bottom: Self::lerp(start_rect.bottom, end_rect.bottom, t), bottom: Self::lerp(start_rect.bottom, end_rect.bottom, t, style),
} }
} }
komorebi/src/animation/style.rs
+1 -4
View File
@@ -1,4 +1,3 @@
use super::ANIMATION_STYLE;
use crate::core::AnimationStyle; use crate::core::AnimationStyle;
use std::f64::consts::PI; use std::f64::consts::PI;
@@ -356,9 +355,7 @@ impl Ease for EaseInOutBounce {
} }
} }
pub fn apply_ease_func(t: f64) -> f64 { pub fn apply_ease_func(t: f64, style: AnimationStyle) -> f64 {
let style = *ANIMATION_STYLE.lock();
match style { match style {
AnimationStyle::Linear => Linear::evaluate(t), AnimationStyle::Linear => Linear::evaluate(t),
AnimationStyle::EaseInSine => EaseInSine::evaluate(t), AnimationStyle::EaseInSine => EaseInSine::evaluate(t),
komorebi/src/window.rs
+4 -2
View File
@@ -1,6 +1,7 @@
use crate::animation::ANIMATIONS_IN_PROGRESS; use crate::animation::ANIMATIONS_IN_PROGRESS;
use crate::animation::ANIMATION_DURATION; use crate::animation::ANIMATION_DURATION;
use crate::animation::ANIMATION_ENABLED; use crate::animation::ANIMATION_ENABLED;
use crate::animation::ANIMATION_STYLE;
use crate::border_manager; use crate::border_manager;
use crate::com::SetCloak; use crate::com::SetCloak;
use crate::focus_manager; use crate::focus_manager;
@@ -203,8 +204,9 @@ impl Window {
pub fn animate_position(&self, start_rect: &Rect, target_rect: &Rect, top: bool) -> Result<()> { pub fn animate_position(&self, start_rect: &Rect, target_rect: &Rect, top: bool) -> Result<()> {
let start_rect = *start_rect; let start_rect = *start_rect;
let target_rect = *target_rect; let target_rect = *target_rect;
let duration = Duration::from_millis(ANIMATION_DURATION.load(Ordering::SeqCst));
let mut animation = self.animation; let mut animation = self.animation;
let duration = Duration::from_millis(ANIMATION_DURATION.load(Ordering::SeqCst));
let style = *ANIMATION_STYLE.lock();
border_manager::BORDER_TEMPORARILY_DISABLED.store(true, Ordering::SeqCst); border_manager::BORDER_TEMPORARILY_DISABLED.store(true, Ordering::SeqCst);
border_manager::send_notification(Some(self.hwnd)); border_manager::send_notification(Some(self.hwnd));
@@ -216,7 +218,7 @@ impl Window {
std::thread::spawn(move || { std::thread::spawn(move || {
animation.animate(duration, |progress: f64| { animation.animate(duration, |progress: f64| {
let new_rect = Animation::lerp_rect(&start_rect, &target_rect, progress); let new_rect = Animation::lerp_rect(&start_rect, &target_rect, progress, style);
if progress == 1.0 { if progress == 1.0 {
WindowsApi::position_window(hwnd, &new_rect, top)?; WindowsApi::position_window(hwnd, &new_rect, top)?;