cessen/psychopath
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Use FloatLuv32 in Psychopath for encoding XYZ colors.

Browse Source
This commit is contained in:
Nathan Vegdahl 2020-09-20 11:04:37 +09:00
parent 161e47fc44
commit 8c738b2f39
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/color.rs
View File

@ -7,7 +7,7 @@ pub use color::{
use glam::Vec4; use glam::Vec4;
use half::f16; use half::f16;
use spectral_upsampling::meng::{spectrum_xyz_to_p_4, EQUAL_ENERGY_REFLECTANCE}; use spectral_upsampling::meng::{spectrum_xyz_to_p_4, EQUAL_ENERGY_REFLECTANCE};
use trifloat::signed48; use trifloat::fluv32;
use crate::{lerp::Lerp, math::fast_exp}; use crate::{lerp::Lerp, math::fast_exp};
@ -144,7 +144,7 @@ impl Color {
/// Returns the post-compression size of this color. /// Returns the post-compression size of this color.
pub fn compressed_size(&self) -> usize { pub fn compressed_size(&self) -> usize {
match self { match self {
Color::XYZ(_, _, _) => 7, Color::XYZ(_, _, _) => 5,
Color::Blackbody { .. } => 5, Color::Blackbody { .. } => 5,
@ -162,9 +162,7 @@ impl Color {
match *self { match *self {
Color::XYZ(x, y, z) => { Color::XYZ(x, y, z) => {
out_data[0] = 0; // Discriminant out_data[0] = 0; // Discriminant
let col = signed48::encode((x, y, z)); (&mut out_data[1..5]).copy_from_slice(&fluv32::encode((x, y, z)).to_ne_bytes()[..]);
let col = col.to_le_bytes();
(&mut out_data[1..7]).copy_from_slice(&col[0..6]);
} }
Color::Blackbody { Color::Blackbody {
@ -202,10 +200,10 @@ impl Color {
match in_data[0] { match in_data[0] {
0 => { 0 => {
// XYZ // XYZ
let mut bytes = [0u8; 8]; let mut bytes = [0u8; 4];
(&mut bytes[0..6]).copy_from_slice(&in_data[1..7]); (&mut bytes[..]).copy_from_slice(&in_data[1..5]);
let (x, y, z) = signed48::decode(u64::from_le_bytes(bytes)); let (x, y, z) = fluv32::decode(u32::from_ne_bytes(bytes));
(Color::XYZ(x, y, z), 7) (Color::XYZ(x, y, z), 5)
} }
1 => { 1 => {