CrispyPin/marble-machinations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Crispy 2024-12-24 23:23:46 +01:00
parent 987643f334
commit 1abcc0a821
3 changed files with 29 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/editor.rs
View file

@ -28,7 +28,7 @@ const MAX_ZOOM: f32 = 8.;
const MIN_ZOOM: f32 = 0.25; const MIN_ZOOM: f32 = 0.25;
const BOARD_MARGIN: PosInt = 3; const BOARD_MARGIN: PosInt = 3;
const MAX_SPEED_POWER: u8 = 16; const MAX_SPEED_POWER: u8 = 16;
const SPEED_DIGITS: u8 = 5; const SPEED_DIGITS: i32 = 5;
const MAX_FRAME_TIME_MICROS: u128 = 1_000_000 / 30; const MAX_FRAME_TIME_MICROS: u128 = 1_000_000 / 30;
#[derive(Debug)] #[derive(Debug)]
@ -714,19 +714,18 @@ impl Editor {
d.draw_text("Level Complete!", x + 45, y + 10, 30, Color::LIME); d.draw_text("Level Complete!", x + 45, y + 10, 30, Color::LIME);
if let Some(score) = &self.score { if let Some(score) = &self.score {
d.draw_text("cycles", x + 15, y + 45, 20, Color::WHITE); d.draw_text("cycles", x + 15, y + 45, 20, Color::WHITE);
draw_usize(d, textures, score.cycles, x + 10, y + 70, 9, 2); draw_usize(d, textures, score.cycles, (x + 10, y + 70), 9, 2);
d.draw_text("tiles", x + 215, y + 45, 20, Color::WHITE); d.draw_text("tiles", x + 215, y + 45, 20, Color::WHITE);
draw_usize(d, textures, score.tiles, x + 210, y + 70, 5, 2); draw_usize(d, textures, score.tiles, (x + 210, y + 70), 5, 2);
} }
if simple_button(d, &self.mouse, x + 10, y + 110, 140, 45) { if simple_button((d, &self.mouse), x + 10, y + 110, 140, 45) {
self.popup = Popup::None; self.popup = Popup::None;
self.dismissed_end = true; self.dismissed_end = true;
} }
d.draw_text("continue\nediting", x + 15, y + 115, 20, Color::WHITE); d.draw_text("continue\nediting", x + 15, y + 115, 20, Color::WHITE);
if simple_button( if simple_button(
d, (d, &self.mouse),
&self.mouse,
x + END_POPUP_WIDTH / 2 + 5, x + END_POPUP_WIDTH / 2 + 5,
y + 110, y + 110,
140, 140,
@ -744,7 +743,7 @@ impl Editor {
} else { } else {
d.draw_text("Level Failed!", x + 45, y + 10, 30, Color::RED); d.draw_text("Level Failed!", x + 45, y + 10, 30, Color::RED);
d.draw_text("incorrect output", x + 45, y + 45, 20, Color::WHITE); d.draw_text("incorrect output", x + 45, y + 45, 20, Color::WHITE);
if simple_button(d, &self.mouse, x + 10, y + 110, 300, 25) { if simple_button((d, &self.mouse), x + 10, y + 110, 300, 25) {
self.popup = Popup::None; self.popup = Popup::None;
self.dismissed_end = true; self.dismissed_end = true;
} }
@ -883,7 +882,7 @@ impl Editor {
} }
self.tooltip.add(368, 4, 48, 32, "Speed"); self.tooltip.add(368, 4, 48, 32, "Speed");
draw_usize(d, textures, 1 << self.sim_speed, 368, 4, SPEED_DIGITS, 1); draw_usize(d, textures, 1 << self.sim_speed, (368, 4), SPEED_DIGITS, 1);
slider( slider(
d, d,
&self.mouse, &self.mouse,
@ -897,18 +896,18 @@ impl Editor {
); );
self.tooltip.add(420, 4, 180, 32, "Steps"); self.tooltip.add(420, 4, 180, 32, "Steps");
draw_usize(d, textures, self.machine.step_count(), 420, 4, 9, 2); draw_usize(d, textures, self.machine.step_count(), (420, 4), 9, 2);
if self.stage > Some(0) { if self.stage > Some(0) {
self.tooltip.add(420, 44, 180, 32, "Total steps"); self.tooltip.add(420, 44, 180, 32, "Total steps");
let total_steps = self.total_steps + self.machine.step_count(); let total_steps = self.total_steps + self.machine.step_count();
draw_usize(d, textures, total_steps, 420, 44, 9, 2); draw_usize(d, textures, total_steps, (420, 44), 9, 2);
} }
draw_usize(d, textures, self.step_time as usize, 260, 42, 9, 1); draw_usize(d, textures, self.step_time as usize, (260, 42), 9, 1);
draw_usize(d, textures, self.max_step_time as usize, 260, 60, 9, 1); draw_usize(d, textures, self.max_step_time as usize, (260, 60), 9, 1);
d.draw_text("input:", 603, 8, 10, Color::WHITE); d.draw_text("input:", 603, 8, 10, Color::WHITE);
if simple_button(d, &self.mouse, 600, 20, 35, 15) { if simple_button((d, &self.mouse), 600, 20, 35, 15) {
self.input_as_text = !self.input_as_text self.input_as_text = !self.input_as_text
} }
let input_mode_text = if self.input_as_text { "text" } else { "bytes" }; let input_mode_text = if self.input_as_text { "text" } else { "bytes" };
@ -991,7 +990,7 @@ impl Editor {
let y = footer_top as i32 + 49; let y = footer_top as i32 + 49;
self.tooltip.add(100, y, 40, 40, "Cancel"); self.tooltip.add(100, y, 40, 40, "Cancel");
if simple_button(d, &self.mouse, 100, y, 40, 40) if simple_button((d, &self.mouse), 100, y, 40, 40)
|| d.is_key_pressed(KeyboardKey::KEY_ESCAPE) || d.is_key_pressed(KeyboardKey::KEY_ESCAPE)
{ {
self.active_tool = Tool::SelectArea(Selection::default()); self.active_tool = Tool::SelectArea(Selection::default());
@ -999,13 +998,13 @@ impl Editor {
draw_scaled_texture(d, textures.get("cancel"), 104, y + 4, 2.); draw_scaled_texture(d, textures.get("cancel"), 104, y + 4, 2.);
self.tooltip.add(144, y, 40, 40, "Save blueprint"); self.tooltip.add(144, y, 40, 40, "Save blueprint");
if simple_button(d, &self.mouse, 144, y, 40, 40) { if simple_button((d, &self.mouse), 144, y, 40, 40) {
self.save_blueprint(selection); self.save_blueprint(selection);
} }
draw_scaled_texture(d, textures.get("save"), 148, y + 4, 2.); draw_scaled_texture(d, textures.get("save"), 148, y + 4, 2.);
self.tooltip.add(188, y, 40, 40, "Copy"); self.tooltip.add(188, y, 40, 40, "Copy");
if simple_button(d, &self.mouse, 188, y, 40, 40) if simple_button((d, &self.mouse), 188, y, 40, 40)
|| (d.is_key_pressed(KeyboardKey::KEY_C) || (d.is_key_pressed(KeyboardKey::KEY_C)
&& d.is_key_down(KeyboardKey::KEY_LEFT_CONTROL)) && d.is_key_down(KeyboardKey::KEY_LEFT_CONTROL))
{ {
@ -1015,7 +1014,7 @@ impl Editor {
draw_scaled_texture(d, textures.get("copy"), 192, y + 4, 2.); draw_scaled_texture(d, textures.get("copy"), 192, y + 4, 2.);
self.tooltip.add(232, y, 40, 40, "Delete"); self.tooltip.add(232, y, 40, 40, "Delete");
if simple_button(d, &self.mouse, 232, y, 40, 40) { if simple_button((d, &self.mouse), 232, y, 40, 40) {
let min = selection.0.min(selection.1); let min = selection.0.min(selection.1);
let max = selection.0.max(selection.1); let max = selection.0.max(selection.1);
let board = let board =
@ -1170,7 +1169,7 @@ impl Editor {
let output_cell_width = 43; let output_cell_width = 43;
let output_cells = (d.get_screen_width() - output_x) as usize / output_cell_width as usize; let output_cells = (d.get_screen_width() - output_x) as usize / output_cell_width as usize;
if simple_button(d, &self.mouse, output_x, y + 70, 65, 15) { if simple_button((d, &self.mouse), output_x, y + 70, 65, 15) {
self.output_as_text = !self.output_as_text self.output_as_text = !self.output_as_text
} }
let output_mode_text = if self.output_as_text { let output_mode_text = if self.output_as_text {

25
src/ui.rs
View file

@ -158,8 +158,7 @@ impl Tooltip {
} }
pub fn simple_button( pub fn simple_button(
d: &mut RaylibDrawHandle, (d, mouse): (&mut RaylibDrawHandle, &MouseInput),
mouse: &MouseInput,
x: i32, x: i32,
y: i32, y: i32,
width: i32, width: i32,
@ -189,7 +188,7 @@ pub fn text_button(
let font_size = 20; let font_size = 20;
let margin = font_size / 4; let margin = font_size / 4;
let height = font_size + margin * 2; let height = font_size + margin * 2;
let clicked = simple_button(d, mouse, x, y, width, height); let clicked = simple_button((d, mouse), x, y, width, height);
d.draw_text(text, x + margin, y + margin, font_size, Color::WHITE); d.draw_text(text, x + margin, y + margin, font_size, Color::WHITE);
clicked clicked
} }
@ -201,7 +200,7 @@ pub fn tex32_button(
(tooltip, text): (&mut Tooltip, &'static str), (tooltip, text): (&mut Tooltip, &'static str),
) -> bool { ) -> bool {
let size = 32; let size = 32;
let clicked = simple_button(d, mouse, x, y, 32, 32); let clicked = simple_button((d, mouse), x, y, 32, 32);
draw_scaled_texture(d, texture, x, y, 2.); draw_scaled_texture(d, texture, x, y, 2.);
tooltip.add(x, y, size, size, text); tooltip.add(x, y, size, size, text);
clicked clicked
@ -345,24 +344,20 @@ where
pub fn draw_usize( pub fn draw_usize(
d: &mut RaylibDrawHandle, d: &mut RaylibDrawHandle,
textures: &Textures, textures: &Textures,
number: usize, mut number: usize,
x: i32, (x, y): (i32, i32),
y: i32, digits: i32,
digits: u8, scale: i32,
scale: u8,
) { ) {
let digits = digits as i32;
let scale = scale as i32;
for i in 0..digits { for i in 0..digits {
d.draw_rectangle(x + 10 * i * scale, y, 8 * scale, 16 * scale, BG_LIGHT); d.draw_rectangle(x + 10 * i * scale, y, 8 * scale, 16 * scale, BG_LIGHT);
} }
let mut num = number;
let mut i = 0; let mut i = 0;
while (num != 0 || i == 0) && i < digits { while (number != 0 || i == 0) && i < digits {
let texture = textures.get(&format!("digit_{}", num % 10)); let texture = textures.get(&format!("digit_{}", number % 10));
let x = x + (digits - i - 1) * 10 * scale; let x = x + (digits - i - 1) * 10 * scale;
draw_scaled_texture(d, texture, x, y, scale as f32); draw_scaled_texture(d, texture, x, y, scale as f32);
num /= 10; number /= 10;
i += 1; i += 1;
} }
} }

2
src/util.rs
View file

@ -146,6 +146,6 @@ pub fn get_scroll(rl: &RaylibHandle) -> Option<Scroll> {
} }
} }
pub fn rect(x: i32, y: i32, width: i32, height: i32) -> Rectangle{ pub fn rect(x: i32, y: i32, width: i32, height: i32) -> Rectangle {
Rectangle::new(x as f32, y as f32, width as f32, height as f32) Rectangle::new(x as f32, y as f32, width as f32, height as f32)
} }