Skip to content

Commit 50c47c2

Browse files
tychedeliatychedelia
committed
Fmt.
1 parent 89e65a3 commit 50c47c2

File tree

5 files changed

+80
-42
lines changed

5 files changed

+80
-42
lines changed

‎crates/processing_ffi/src/lib.rs‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,11 @@ pub extern "C" fn processing_color_mode(
263263
error::clear_error();
264264
let graphics_entity = Entity::from_bits(graphics_id);
265265
error::check(|| {
266-
let space = processing::prelude::color::ColorSpace::from_u8(space)
267-
.ok_or_else(|| processing::prelude::error::ProcessingError::InvalidArgument(
268-
format!("unknown color space: {space}"),
269-
))?;
266+
let space = processing::prelude::color::ColorSpace::from_u8(space).ok_or_else(|| {
267+
processing::prelude::error::ProcessingError::InvalidArgument(format!(
268+
"unknown color space: {space}"
269+
))
270+
})?;
270271
let mode = processing::prelude::color::ColorMode::new(space, max1, max2, max3, max_alpha);
271272
graphics_set_color_mode(graphics_entity, mode)
272273
});
@@ -298,7 +299,10 @@ pub extern "C" fn processing_set_stroke_color(graphics_id: u64, color: Color) {
298299
let graphics_entity = Entity::from_bits(graphics_id);
299300
error::check(|| {
300301
let mode = graphics_get_color_mode(graphics_entity)?;
301-
graphics_record_command(graphics_entity, DrawCommand::StrokeColor(color.resolve(&mode)))
302+
graphics_record_command(
303+
graphics_entity,
304+
DrawCommand::StrokeColor(color.resolve(&mode)),
305+
)
302306
});
303307
}
304308

@@ -1206,7 +1210,13 @@ pub extern "C" fn processing_light_create_point(
12061210
let graphics_entity = Entity::from_bits(graphics_id);
12071211
error::check(|| {
12081212
let mode = graphics_get_color_mode(graphics_entity)?;
1209-
light_create_point(graphics_entity, color.resolve(&mode), intensity, range, radius)
1213+
light_create_point(
1214+
graphics_entity,
1215+
color.resolve(&mode),
1216+
intensity,
1217+
range,
1218+
radius,
1219+
)
12101220
})
12111221
.map(|e| e.to_bits())
12121222
.unwrap_or(0)

‎crates/processing_pyo3/src/color.rs‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use bevy::color::{
44
};
55
use pyo3::{exceptions::PyTypeError, prelude::*, types::PyTuple};
66

7-
use crate::math::{PyVec4, PyVecIter, hash_f32, PyVec3};
7+
use crate::math::{PyVec3, PyVec4, PyVecIter, hash_f32};
88

99
pub use processing::prelude::color::{ColorMode, ColorSpace};
1010

@@ -21,7 +21,11 @@ fn int_maxes(space: &ColorSpace) -> [f32; 4] {
2121
}
2222

2323
/// Parse a Python int or float into an f32 for a given channel.
24-
pub(crate) fn parse_numeric(space: &ColorSpace, obj: &Bound<'_, PyAny>, ch: usize) -> PyResult<f32> {
24+
pub(crate) fn parse_numeric(
25+
space: &ColorSpace,
26+
obj: &Bound<'_, PyAny>,
27+
ch: usize,
28+
) -> PyResult<f32> {
2529
if let Ok(v) = obj.extract::<i64>() {
2630
let native = space.default_maxes();
2731
let imax = int_maxes(space);
@@ -61,25 +65,25 @@ pub(crate) fn extract_color_with_mode(
6165
if let Ok(v) = first.extract::<PyRef<PyVec3>>() {
6266
return Ok(space.color(v.0.x, v.0.y, v.0.z, native[3]));
6367
}
64-
let v = convert_channel(mode,&first, 0)?;
68+
let v = convert_channel(mode, &first, 0)?;
6569
Ok(space.gray(v, native[3]))
6670
}
6771
2 => {
68-
let v = convert_channel(mode,&args.get_item(0)?, 0)?;
69-
let a = convert_channel(mode,&args.get_item(1)?, 3)?;
72+
let v = convert_channel(mode, &args.get_item(0)?, 0)?;
73+
let a = convert_channel(mode, &args.get_item(1)?, 3)?;
7074
Ok(space.gray(v, a))
7175
}
7276
3 => {
73-
let c1 = convert_channel(mode,&args.get_item(0)?, 0)?;
74-
let c2 = convert_channel(mode,&args.get_item(1)?, 1)?;
75-
let c3 = convert_channel(mode,&args.get_item(2)?, 2)?;
77+
let c1 = convert_channel(mode, &args.get_item(0)?, 0)?;
78+
let c2 = convert_channel(mode, &args.get_item(1)?, 1)?;
79+
let c3 = convert_channel(mode, &args.get_item(2)?, 2)?;
7680
Ok(space.color(c1, c2, c3, native[3]))
7781
}
7882
4 => {
79-
let c1 = convert_channel(mode,&args.get_item(0)?, 0)?;
80-
let c2 = convert_channel(mode,&args.get_item(1)?, 1)?;
81-
let c3 = convert_channel(mode,&args.get_item(2)?, 2)?;
82-
let ca = convert_channel(mode,&args.get_item(3)?, 3)?;
83+
let c1 = convert_channel(mode, &args.get_item(0)?, 0)?;
84+
let c2 = convert_channel(mode, &args.get_item(1)?, 1)?;
85+
let c3 = convert_channel(mode, &args.get_item(2)?, 2)?;
86+
let ca = convert_channel(mode, &args.get_item(3)?, 3)?;
8387
Ok(space.color(c1, c2, c3, ca))
8488
}
8589
_ => Err(PyTypeError::new_err("expected 1-4 arguments")),
@@ -454,7 +458,6 @@ impl ColorLike {
454458
}
455459
}
456460

457-
458461
fn parse_hex(s: &str) -> PyResult<Color> {
459462
Srgba::hex(s)
460463
.map(|srgba| Color::Srgba(srgba))
@@ -581,5 +584,4 @@ mod tests {
581584
assert!((list[0] - 0.1).abs() < 1e-6);
582585
assert!((list[3] - 0.4).abs() < 1e-6);
583586
}
584-
585587
}

‎crates/processing_pyo3/src/graphics.rs‎

Lines changed: 45 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
use crate::color::{ColorMode, extract_color_with_mode};
2+
use crate::glfw::GlfwContext;
3+
use crate::math::{extract_vec2, extract_vec3, extract_vec4};
14
use bevy::{
25
color::{ColorToPacked, Srgba},
36
math::Vec4,
@@ -10,9 +13,6 @@ use pyo3::{
1013
prelude::*,
1114
types::{PyDict, PyTuple},
1215
};
13-
use crate::color::{extract_color_with_mode, ColorMode};
14-
use crate::glfw::GlfwContext;
15-
use crate::math::{extract_vec2, extract_vec3, extract_vec4};
1616

1717
#[pyclass(unsendable)]
1818
pub struct Surface {
@@ -213,7 +213,6 @@ impl Graphics {
213213
surface,
214214
width,
215215
height,
216-
217216
})
218217
}
219218

@@ -251,7 +250,6 @@ impl Graphics {
251250
surface,
252251
width,
253252
height,
254-
255253
})
256254
}
257255

@@ -303,12 +301,21 @@ impl Graphics {
303301

304302
#[pyo3(signature = (*args))]
305303
pub fn color(&self, args: &Bound<'_, PyTuple>) -> PyResult<crate::color::PyColor> {
306-
extract_color_with_mode(args, &graphics_get_color_mode(self.entity).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?).map(crate::color::PyColor::from)
304+
extract_color_with_mode(
305+
args,
306+
&graphics_get_color_mode(self.entity)
307+
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))?,
308+
)
309+
.map(crate::color::PyColor::from)
307310
}
308311

309312
#[pyo3(signature = (*args))]
310313
pub fn background(&self, args: &Bound<'_, PyTuple>) -> PyResult<()> {
311-
let color = extract_color_with_mode(args, &graphics_get_color_mode(self.entity).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?)?;
314+
let color = extract_color_with_mode(
315+
args,
316+
&graphics_get_color_mode(self.entity)
317+
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))?,
318+
)?;
312319
graphics_record_command(self.entity, DrawCommand::BackgroundColor(color))
313320
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))
314321
}
@@ -320,7 +327,11 @@ impl Graphics {
320327

321328
#[pyo3(signature = (*args))]
322329
pub fn fill(&self, args: &Bound<'_, PyTuple>) -> PyResult<()> {
323-
let color = extract_color_with_mode(args, &graphics_get_color_mode(self.entity).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?)?;
330+
let color = extract_color_with_mode(
331+
args,
332+
&graphics_get_color_mode(self.entity)
333+
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))?,
334+
)?;
324335
graphics_record_command(self.entity, DrawCommand::Fill(color))
325336
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))
326337
}
@@ -332,7 +343,11 @@ impl Graphics {
332343

333344
#[pyo3(signature = (*args))]
334345
pub fn stroke(&self, args: &Bound<'_, PyTuple>) -> PyResult<()> {
335-
let color = extract_color_with_mode(args, &graphics_get_color_mode(self.entity).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?)?;
346+
let color = extract_color_with_mode(
347+
args,
348+
&graphics_get_color_mode(self.entity)
349+
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))?,
350+
)?;
336351
graphics_record_command(self.entity, DrawCommand::StrokeColor(color))
337352
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))
338353
}
@@ -457,7 +472,11 @@ impl Graphics {
457472

458473
#[pyo3(signature = (*args))]
459474
pub fn emissive(&self, args: &Bound<'_, PyTuple>) -> PyResult<()> {
460-
let color = extract_color_with_mode(args, &graphics_get_color_mode(self.entity).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?)?;
475+
let color = extract_color_with_mode(
476+
args,
477+
&graphics_get_color_mode(self.entity)
478+
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))?,
479+
)?;
461480
graphics_record_command(self.entity, DrawCommand::Emissive(color))
462481
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))
463482
}
@@ -510,7 +529,8 @@ impl Graphics {
510529
) -> PyResult<()> {
511530
let space = crate::color::ColorSpace::from_u8(mode)
512531
.ok_or_else(|| PyRuntimeError::new_err(format!("unknown color space: {mode}")))?;
513-
let parse = |obj: &Bound<'py, PyAny>, ch: usize| crate::color::parse_numeric(&space, obj, ch);
532+
let parse =
533+
|obj: &Bound<'py, PyAny>, ch: usize| crate::color::parse_numeric(&space, obj, ch);
514534
let new_mode = match (max1, max2, max3, max_alpha) {
515535
// color_mode(MODE)
516536
(None, _, _, _) => ColorMode::with_defaults(space),
@@ -519,12 +539,22 @@ impl Graphics {
519539
// color_mode(MODE, max1, max2, max3)
520540
(Some(m1), Some(m2), Some(m3), None) => {
521541
let defaults = space.default_maxes();
522-
ColorMode::new(space, parse(m1, 0)?, parse(m2, 1)?, parse(m3, 2)?, defaults[3])
542+
ColorMode::new(
543+
space,
544+
parse(m1, 0)?,
545+
parse(m2, 1)?,
546+
parse(m3, 2)?,
547+
defaults[3],
548+
)
523549
}
524550
// color_mode(MODE, max1, max2, max3, maxA)
525-
(Some(m1), Some(m2), Some(m3), Some(ma)) => {
526-
ColorMode::new(space, parse(m1, 0)?, parse(m2, 1)?, parse(m3, 2)?, parse(ma, 3)?)
527-
}
551+
(Some(m1), Some(m2), Some(m3), Some(ma)) => ColorMode::new(
552+
space,
553+
parse(m1, 0)?,
554+
parse(m2, 1)?,
555+
parse(m3, 2)?,
556+
parse(ma, 3)?,
557+
),
528558
_ => return Err(PyRuntimeError::new_err("expected 1, 2, 4, or 5 arguments")),
529559
};
530560
graphics_set_color_mode(self.entity, new_mode)

‎crates/processing_pyo3/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,8 @@ mod mewnala {
567567
max3: Option<&Bound<'py, PyAny>>,
568568
max_alpha: Option<&Bound<'py, PyAny>>,
569569
) -> PyResult<()> {
570-
let graphics = get_graphics(module)?
571-
.ok_or_else(|| PyRuntimeError::new_err("call size() first"))?;
570+
let graphics =
571+
get_graphics(module)?.ok_or_else(|| PyRuntimeError::new_err("call size() first"))?;
572572
graphics.set_color_mode(mode, max1, max2, max3, max_alpha)
573573
}
574574

‎crates/processing_render/src/color.rs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
use bevy::color::{
2-
Color, Hsla, Hsva, Hwba, Laba, Lcha, LinearRgba, Oklaba, Oklcha, Srgba, Xyza,
3-
};
1+
use bevy::color::{Color, Hsla, Hsva, Hwba, Laba, Lcha, LinearRgba, Oklaba, Oklcha, Srgba, Xyza};
42
use bevy::prelude::Component;
53

64
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -109,7 +107,6 @@ impl ColorMode {
109107
let native = self.space.default_maxes();
110108
value / self.max[ch] * native[ch]
111109
}
112-
113110
}
114111

115112
#[cfg(test)]
@@ -171,7 +168,6 @@ mod tests {
171168
assert!((mode.scale(255.0, 0) - 1.0).abs() < 1e-4);
172169
}
173170

174-
175171
#[test]
176172
fn test_scale_hsl_percent() {
177173
let mode = ColorMode::new(ColorSpace::Hsl, 360.0, 100.0, 100.0, 1.0);

0 commit comments

Comments
 (0)