Skip to content

Commit 4164f4a

Browse files
Moved drawing the color preview boxes to a function
big easy
1 parent 9f76225 commit 4164f4a

File tree

2 files changed

+56
-37
lines changed

2 files changed

+56
-37
lines changed

src/game/editor.rs

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,52 @@ pub fn panning(
239239

240240
*cam_pos_x += mouse_delta.x * 70.0;
241241
*cam_pos_y -= mouse_delta.y * 60.0;
242+
}
243+
244+
pub fn draw_color_preview_boxes(
245+
bg_red: &String,
246+
bg_green: &String,
247+
bg_blue: &String,
248+
249+
grnd_red: &String,
250+
grnd_green: &String,
251+
grnd_blue: &String
252+
) {
253+
match (bg_red.parse::<u8>(), bg_green.parse::<u8>(), bg_blue.parse::<u8>()) {
254+
(Ok(bg_red), Ok(bg_green), Ok(bg_blue)) => {
255+
draw_rectangle(
256+
screen_width() - 450.0,
257+
10.0,
258+
50.0,
259+
50.0,
260+
Color::from_rgba(
261+
bg_red,
262+
bg_green,
263+
bg_blue,
264+
255
265+
)
266+
);
267+
}
268+
269+
_ => {}
270+
}
271+
272+
match (grnd_red.parse::<u8>(), grnd_green.parse::<u8>(), grnd_blue.parse::<u8>()) {
273+
(Ok(grnd_red), Ok(grnd_green), Ok(grnd_blue)) => {
274+
draw_rectangle(
275+
screen_width() - 450.0,
276+
80.0,
277+
50.0,
278+
50.0,
279+
Color::from_rgba(
280+
grnd_red,
281+
grnd_green,
282+
grnd_blue,
283+
255
284+
)
285+
);
286+
}
287+
288+
_ => {}
289+
}
242290
}

src/main.rs

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,43 +1731,14 @@ async fn main() {
17311731
&font
17321732
);
17331733

1734-
match (bg_red.parse::<u8>(), bg_green.parse::<u8>(), bg_blue.parse::<u8>()) {
1735-
(Ok(bg_red), Ok(bg_green), Ok(bg_blue)) => {
1736-
draw_rectangle(
1737-
screen_width() - 450.0,
1738-
10.0,
1739-
50.0,
1740-
50.0,
1741-
Color::from_rgba(
1742-
bg_red,
1743-
bg_green,
1744-
bg_blue,
1745-
255
1746-
)
1747-
);
1748-
}
1749-
1750-
_ => {}
1751-
}
1752-
1753-
match (grnd_red.parse::<u8>(), grnd_green.parse::<u8>(), grnd_blue.parse::<u8>()) {
1754-
(Ok(grnd_red), Ok(grnd_green), Ok(grnd_blue)) => {
1755-
draw_rectangle(
1756-
screen_width() - 450.0,
1757-
80.0,
1758-
50.0,
1759-
50.0,
1760-
Color::from_rgba(
1761-
grnd_red,
1762-
grnd_green,
1763-
grnd_blue,
1764-
255
1765-
)
1766-
);
1767-
}
1768-
1769-
_ => {}
1770-
}
1734+
editor::draw_color_preview_boxes(
1735+
&bg_red,
1736+
&bg_green,
1737+
&bg_blue,
1738+
&grnd_red,
1739+
&grnd_green,
1740+
&grnd_blue
1741+
);
17711742

17721743
bg_red_textbox.draw(bg_red.clone(), &font);
17731744
bg_green_textbox.draw(bg_green.clone(), &font);

0 commit comments

Comments
 (0)