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

add digit sprites, remove comment tiles

Browse source
This commit is contained in:
Crispy 2024-10-05 15:01:06 +02:00
parent 636e9d04e2
commit 86548a8b0d
13 changed files with 65 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main.rs
View file

@ -4,7 +4,7 @@ use std::{
ops::Rem,
};
use marble_engine::{board::Board, parse, tile::Tile, Machine};
use marble_engine::{board::Board, parse, tile::Tile, tile_to_char, Machine};
use raylib::prelude::*;
mod marble_engine;
@ -26,7 +26,7 @@ struct Game {
time_since_step: f32,
}
#[derive(Debug)]
#[derive(Debug, Clone, PartialEq)]
enum Tool {
None,
SetTile(Tile),
@ -51,11 +51,11 @@ fn main() {
let mut textures: HashMap<String, Texture2D> = HashMap::new();
for d in read_dir("assets/tiles").unwrap().flatten() {
let name = d.file_name();
if d.path().is_file() {
let name = name.to_string_lossy();
let path = d.path();
if path.is_file() {
let name = path.file_stem().unwrap().to_string_lossy();
let texture = rl
.load_texture(&thread, &format!("assets/tiles/{name}"))
.load_texture(&thread, &format!("assets/tiles/{name}.png"))
.unwrap();
textures.insert(name.to_string(), texture);
}
@ -203,11 +203,12 @@ impl Game {
let mut input_text = String::from_utf8_lossy(self.machine.input()).to_string();
if text_input(
d,
Rectangle::new(350., footer_top + 60., 200., 25.),
Rectangle::new(5., footer_top + 60., 200., 25.),
&mut input_text,
&mut self.input_text_selected,
) {
self.machine.set_input(input_text.into_bytes());
}
}
}