Skip to content

Commit e651737

Browse files
tychedeliatychedelia
committed
Fmt.
1 parent e9ce61a commit e651737

File tree

6 files changed

+81
-40
lines changed

6 files changed

+81
-40
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")),
@@ -455,7 +459,6 @@ impl ColorLike {
455459
}
456460
}
457461

458-
459462
fn parse_hex(s: &str) -> PyResult<Color> {
460463
Srgba::hex(s)
461464
.map(Color::Srgba)
@@ -582,5 +585,4 @@ mod tests {
582585
assert!((list[0] - 0.1).abs() < 1e-6);
583586
assert!((list[3] - 0.4).abs() < 1e-6);
584587
}
585-
586588
}

‎crates/processing_pyo3/src/graphics.rs‎

Lines changed: 45 additions & 12 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,
@@ -214,7 +217,6 @@ impl Graphics {
214217
surface,
215218
width,
216219
height,
217-
218220
})
219221
}
220222

@@ -252,7 +254,6 @@ impl Graphics {
252254
surface,
253255
width,
254256
height,
255-
256257
})
257258
}
258259

@@ -304,12 +305,21 @@ impl Graphics {
304305

305306
#[pyo3(signature = (*args))]
306307
pub fn color(&self, args: &Bound<'_, PyTuple>) -> PyResult<crate::color::PyColor> {
307-
extract_color_with_mode(args, &graphics_get_color_mode(self.entity).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?).map(crate::color::PyColor::from)
308+
extract_color_with_mode(
309+
args,
310+
&graphics_get_color_mode(self.entity)
311+
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))?,
312+
)
313+
.map(crate::color::PyColor::from)
308314
}
309315

310316
#[pyo3(signature = (*args))]
311317
pub fn background(&self, args: &Bound<'_, PyTuple>) -> PyResult<()> {
312-
let color = extract_color_with_mode(args, &graphics_get_color_mode(self.entity).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?)?;
318+
let color = extract_color_with_mode(
319+
args,
320+
&graphics_get_color_mode(self.entity)
321+
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))?,
322+
)?;
313323
graphics_record_command(self.entity, DrawCommand::BackgroundColor(color))
314324
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))
315325
}
@@ -321,7 +331,11 @@ impl Graphics {
321331

322332
#[pyo3(signature = (*args))]
323333
pub fn fill(&self, args: &Bound<'_, PyTuple>) -> PyResult<()> {
324-
let color = extract_color_with_mode(args, &graphics_get_color_mode(self.entity).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?)?;
334+
let color = extract_color_with_mode(
335+
args,
336+
&graphics_get_color_mode(self.entity)
337+
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))?,
338+
)?;
325339
graphics_record_command(self.entity, DrawCommand::Fill(color))
326340
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))
327341
}
@@ -333,7 +347,11 @@ impl Graphics {
333347

334348
#[pyo3(signature = (*args))]
335349
pub fn stroke(&self, args: &Bound<'_, PyTuple>) -> PyResult<()> {
336-
let color = extract_color_with_mode(args, &graphics_get_color_mode(self.entity).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?)?;
350+
let color = extract_color_with_mode(
351+
args,
352+
&graphics_get_color_mode(self.entity)
353+
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))?,
354+
)?;
337355
graphics_record_command(self.entity, DrawCommand::StrokeColor(color))
338356
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))
339357
}
@@ -458,7 +476,11 @@ impl Graphics {
458476

459477
#[pyo3(signature = (*args))]
460478
pub fn emissive(&self, args: &Bound<'_, PyTuple>) -> PyResult<()> {
461-
let color = extract_color_with_mode(args, &graphics_get_color_mode(self.entity).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?)?;
479+
let color = extract_color_with_mode(
480+
args,
481+
&graphics_get_color_mode(self.entity)
482+
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))?,
483+
)?;
462484
graphics_record_command(self.entity, DrawCommand::Emissive(color))
463485
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))
464486
}
@@ -511,7 +533,8 @@ impl Graphics {
511533
) -> PyResult<()> {
512534
let space = crate::color::ColorSpace::from_u8(mode)
513535
.ok_or_else(|| PyRuntimeError::new_err(format!("unknown color space: {mode}")))?;
514-
let parse = |obj: &Bound<'py, PyAny>, ch: usize| crate::color::parse_numeric(&space, obj, ch);
536+
let parse =
537+
|obj: &Bound<'py, PyAny>, ch: usize| crate::color::parse_numeric(&space, obj, ch);
515538
let new_mode = match (max1, max2, max3, max_alpha) {
516539
// color_mode(MODE)
517540
(None, _, _, _) => ColorMode::with_defaults(space),
@@ -520,12 +543,22 @@ impl Graphics {
520543
// color_mode(MODE, max1, max2, max3)
521544
(Some(m1), Some(m2), Some(m3), None) => {
522545
let defaults = space.default_maxes();
523-
ColorMode::new(space, parse(m1, 0)?, parse(m2, 1)?, parse(m3, 2)?, defaults[3])
546+
ColorMode::new(
547+
space,
548+
parse(m1, 0)?,
549+
parse(m2, 1)?,
550+
parse(m3, 2)?,
551+
defaults[3],
552+
)
524553
}
525554
// color_mode(MODE, max1, max2, max3, maxA)
526-
(Some(m1), Some(m2), Some(m3), Some(ma)) => {
527-
ColorMode::new(space, parse(m1, 0)?, parse(m2, 1)?, parse(m3, 2)?, parse(ma, 3)?)
528-
}
555+
(Some(m1), Some(m2), Some(m3), Some(ma)) => ColorMode::new(
556+
space,
557+
parse(m1, 0)?,
558+
parse(m2, 1)?,
559+
parse(m3, 2)?,
560+
parse(ma, 3)?,
561+
),
529562
_ => return Err(PyRuntimeError::new_err("expected 1, 2, 4, or 5 arguments")),
530563
};
531564
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
@@ -757,8 +757,8 @@ mod mewnala {
757757
max3: Option<&Bound<'py, PyAny>>,
758758
max_alpha: Option<&Bound<'py, PyAny>>,
759759
) -> PyResult<()> {
760-
let graphics = get_graphics(module)?
761-
.ok_or_else(|| PyRuntimeError::new_err("call size() first"))?;
760+
let graphics =
761+
get_graphics(module)?.ok_or_else(|| PyRuntimeError::new_err("call size() first"))?;
762762
graphics.set_color_mode(mode, max1, max2, max3, max_alpha)
763763
}
764764

‎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);

‎crates/processing_render/src/graphics.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ impl CameraProjection for ProcessingProjection {
137137
self.width,
138138
self.height, // bottom = height
139139
0.0, // top = 0
140-
self.near,
141140
self.far,
141+
self.near,
142142
)
143143
}
144144

0 commit comments

Comments
 (0)