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

convert to macroquad and make it compile

Browse source
This commit is contained in:
Crispy 2025-04-23 21:45:32 +02:00
parent 1cc8e999b7
commit f4348599f6
15 changed files with 1023 additions and 1090 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/marble_engine.rs
View file

@ -1,4 +1,4 @@
use raylib::prelude::*;
use macroquad::prelude::*;
pub mod grid;
pub mod pos;
@ -99,26 +99,23 @@ impl Machine {
self.input = bytes;
}
pub fn draw_marble_values(
&self,
d: &mut RaylibDrawHandle,
textures: &Textures,
offset: Vector2,
scale: f32,
) {
let tile_size = (TILE_TEXTURE_SIZE * scale) as i32;
pub fn draw_marble_values(&self, textures: &Textures, offset: Vec2, scale: f32) {
let tile_size = TILE_TEXTURE_SIZE * scale;
for marble in &self.marbles {
let x = marble.x;
let y = marble.y;
if let Some(tile) = self.grid.get(*marble) {
let px = x as i32 * tile_size + offset.x as i32;
let py = y as i32 * tile_size + offset.y as i32;
let px = x as f32 * tile_size + offset.x;
let py = y as f32 * tile_size + offset.y;
if let Tile::Marble { value, dir } = tile {
let texture = textures.get(dir.arrow_texture_name());
let pos = Vector2::new(px as f32, py as f32);
let faded_white = Color::new(255, 255, 255, 100);
d.draw_texture_ex(texture, pos, 0., scale, faded_white);
draw_usize_small(d, textures, value as usize, px, py, scale);
let tex = textures.get(dir.arrow_texture_name());
let faded_white = Color::from_rgba(255, 255, 255, 100);
let params = DrawTextureParams {
dest_size: Some(Vec2::new(tex.width() * scale, tex.height() * scale)),
..Default::default()
};
draw_texture_ex(tex, px, py, faded_white, params);
draw_usize_small(textures, value as usize, px, py, scale);
}
}
}
@ -544,10 +541,10 @@ impl Machine {
let val_b = self.grid.get_or_blank(pos_b).read_value();
let result = match comp {
Comparison::LessThan => val_a < val_b,
Comparison::GreaterThan => val_a > val_b,
Comparison::Equal => val_a == val_b,
Comparison::NotEqual => val_a != val_b,
Comp::LessThan => val_a < val_b,
Comp::GreaterThan => val_a > val_b,
Comp::Equal => val_a == val_b,
Comp::NotEqual => val_a != val_b,
};
if result {
match self.grid.get_mut(front_pos) {