Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: optimize some ifs in hotpath #23

Merged
merged 3 commits into from
Mar 17, 2024
Merged

feat: optimize some ifs in hotpath #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa98121
feat: optimize some ifs in hotpath
dt665m Mar 16, 2024
73ce0de
fix: optimize to unwrap_or_default for dark color and set 0.0 case fo…
dt665m Mar 17, 2024
6711adb
fix ci
jabuwu Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions src/draw/combined.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::{c::c_void, BlendMode, Color, Skeleton, SkeletonClipping};
use crate::{c::c_void, BlendMode, Skeleton, SkeletonClipping};

use super::{ColorSpace, CullDirection};

Expand Down Expand Up @@ -186,21 +186,19 @@ impl CombinedDrawer {
slot.attachment().and_then(|a| a.as_mesh())
{
let mut color = mesh_attachment.color() * slot.color() * skeleton.color();
let mut dark_color = slot.dark_color().unwrap_or_default();
if self.premultiplied_alpha {
color.premultiply_alpha();
dark_color *= color.a;
dark_color.a = 1.0;
} else {
dark_color.a = 0.;
}
color = match self.color_space {
ColorSpace::SRGB => color,
ColorSpace::Linear => color.nonlinear_to_linear(),
};

let mut dark_color = slot
.dark_color()
.unwrap_or_else(|| Color::new_rgba(0.0, 0.0, 0.0, 0.0));
if self.premultiplied_alpha {
dark_color *= color.a;
dark_color.a = 1.0;
}
dark_color = match self.color_space {
ColorSpace::SRGB => dark_color,
ColorSpace::Linear => dark_color.nonlinear_to_linear(),
Expand Down Expand Up @@ -273,23 +271,19 @@ impl CombinedDrawer {
(color, dark_color)
} else if let Some(region_attachment) = slot.attachment().and_then(|a| a.as_region()) {
let mut color = region_attachment.color() * slot.color() * skeleton.color();
let mut dark_color = slot.dark_color().unwrap_or_default();
if self.premultiplied_alpha {
color.premultiply_alpha();
dark_color *= color.a;
dark_color.a = 1.0;
} else {
dark_color.a = 0.;
}
color = match self.color_space {
ColorSpace::SRGB => color,
ColorSpace::Linear => color.nonlinear_to_linear(),
};

let mut dark_color = slot
.dark_color()
.unwrap_or_else(|| Color::new_rgba(0.0, 0.0, 0.0, 0.0));
if self.premultiplied_alpha {
dark_color *= color.a;
dark_color.a = 1.0;
} else {
dark_color.a = 0.0;
}
dark_color = match self.color_space {
ColorSpace::SRGB => dark_color,
ColorSpace::Linear => dark_color.nonlinear_to_linear(),
Expand Down
14 changes: 5 additions & 9 deletions src/draw/simple.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,23 +284,19 @@ impl SimpleDrawer {
);

color *= slot.color() * skeleton.color();
let mut dark_color = slot.dark_color().unwrap_or_default();
if self.premultiplied_alpha {
color.premultiply_alpha();
dark_color *= color.a;
dark_color.a = 1.0;
} else {
dark_color.a = 0.;
}
color = match self.color_space {
ColorSpace::SRGB => color,
ColorSpace::Linear => color.nonlinear_to_linear(),
};

let mut dark_color = slot
.dark_color()
.unwrap_or_else(|| Color::new_rgba(0.0, 0.0, 0.0, 0.0));
if self.premultiplied_alpha {
dark_color *= color.a;
dark_color.a = 1.0;
} else {
dark_color.a = 0.0;
}
dark_color = match self.color_space {
ColorSpace::SRGB => dark_color,
ColorSpace::Linear => dark_color.nonlinear_to_linear(),
Expand Down
Loading