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

store textures in global struct

Browse source
This commit is contained in:
Crispy 2025-03-30 17:29:27 +02:00
parent 031736bea6
commit c20fea4f86
3 changed files with 50 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/editor.rs
View file

@ -601,7 +601,7 @@ impl Editor {
}
}
pub fn draw(&mut self, d: &mut RaylibDrawHandle, textures: &Textures, globals: &mut Globals) {
pub fn draw(&mut self, d: &mut RaylibDrawHandle, globals: &mut Globals) {
d.clear_background(BG_WORLD);
if self.draw_overlay && self.zoom >= 0.5 {
@ -618,13 +618,13 @@ impl Editor {
}
}
self.draw_board(d, textures);
self.board_overlay(d, textures);
self.draw_bottom_bar(d, textures, globals);
self.draw_top_bar(d, textures);
self.draw_board(d, &globals.textures);
self.board_overlay(d, &globals.textures);
self.draw_bottom_bar(d, globals);
self.draw_top_bar(d, &globals.textures);
if self.active_tool == Tool::Blueprint {
self.draw_blueprint_sidebar(d, textures);
self.draw_blueprint_sidebar(d, &globals.textures);
}
self.mouse.update(d);
@ -642,7 +642,7 @@ impl Editor {
match self.popup {
Popup::Success | Popup::Failure => {
self.draw_end_popup(d, textures);
self.draw_end_popup(d, &globals.textures);
}
Popup::LevelInfo => {
let bounds = screen_centered_rect_dyn(d, 100, 100);
@ -994,12 +994,7 @@ impl Editor {
}
}
fn draw_bottom_bar(
&mut self,
d: &mut RaylibDrawHandle,
textures: &Textures,
globals: &mut Globals,
) {
fn draw_bottom_bar(&mut self, d: &mut RaylibDrawHandle, globals: &mut Globals) {
let height = d.get_screen_height();
let footer_top = (height - FOOTER_HEIGHT) as f32;
// background
@ -1035,13 +1030,13 @@ impl Editor {
{
self.active_tool = Tool::SelectArea(Selection::default());
}
draw_scaled_texture(d, textures.get("cancel"), 104, y + 4, 2.);
draw_scaled_texture(d, globals.get_tex("cancel"), 104, y + 4, 2.);
self.tooltip.add(144, y, 40, 40, "Save blueprint");
if simple_button((d, &self.mouse), 144, y, 40, 40) {
self.save_blueprint(selection);
}
draw_scaled_texture(d, textures.get("save"), 148, y + 4, 2.);
draw_scaled_texture(d, globals.get_tex("save"), 148, y + 4, 2.);
self.tooltip.add(188, y, 40, 40, "Copy");
if simple_button((d, &self.mouse), 188, y, 40, 40) || globals.is_pressed(ActionId::Copy)
@ -1055,7 +1050,7 @@ impl Editor {
self.pasting_board = Some(board);
}
}
draw_scaled_texture(d, textures.get("copy"), 192, y + 4, 2.);
draw_scaled_texture(d, globals.get_tex("copy"), 192, y + 4, 2.);
self.tooltip.add(232, y, 40, 40, "Delete");
if simple_button((d, &self.mouse), 232, y, 40, 40) {
@ -1067,7 +1062,7 @@ impl Editor {
));
self.set_area(min, board);
}
draw_scaled_texture(d, textures.get("eraser"), 236, y + 4, 2.);
draw_scaled_texture(d, globals.get_tex("eraser"), 236, y + 4, 2.);
}
let mut tool_button =
@ -1087,7 +1082,7 @@ impl Editor {
scrollable_texture_option_button(
(d, &self.mouse),
pos,
textures.get(texture),
globals.get_tex(texture),
tool_option,
&mut self.active_tool,
border,

34
src/lib.rs
View file

@ -10,19 +10,47 @@ pub mod theme;
pub mod ui;
pub mod util;
use std::fs;
use arboard::Clipboard;
use config::Config;
use input::ActionId;
use raylib::RaylibHandle;
use raylib::{texture::Texture2D, RaylibHandle};
use util::{userdata_dir, Textures};
// use util::MouseInput;
pub const CONFIG_FILE_NAME: &str = "config.json";
pub struct Globals {
pub clipboard: Option<Clipboard>,
pub config: Config,
textures: Textures,
// pub mouse: MouseInput,
}
impl Globals {
pub fn new(rl: &mut RaylibHandle, thread: &raylib::prelude::RaylibThread) -> Self {
let mut textures = Textures::default();
textures.load_dir("assets", rl, thread);
textures.load_dir("assets/tiles", rl, thread);
textures.load_dir("assets/digits", rl, thread);
let config_path = userdata_dir().join(CONFIG_FILE_NAME);
let config = fs::read_to_string(config_path)
.ok()
.and_then(|s| serde_json::from_str(&s).ok())
.unwrap_or_default();
Self {
clipboard: Clipboard::new()
.map_err(|e| eprintln!("System clipboard error: {e}"))
.ok(),
config,
textures,
// mouse: util::MouseInput::default()
}
}
pub fn update(&mut self, rl: &RaylibHandle) {
self.config.input.update(rl);
}
@ -38,4 +66,8 @@ impl Globals {
pub fn is_released(&self, action: ActionId) -> bool {
self.config.input.is_released(action)
}
pub fn get_tex(&self, name: &str) -> &Texture2D {
self.textures.get(name)
}
}

28
src/main.rs
View file

@ -1,10 +1,9 @@
use std::{
collections::HashMap,
fs::{self, read_dir, read_to_string, File},
fs::{read_dir, read_to_string, File},
io::Write,
};
use arboard::Clipboard;
use raylib::prelude::*;
use marble_machinations::*;
@ -17,14 +16,12 @@ use ui::{simple_option_button, tex32_button, text_button, text_input, ShapedText
use util::*;
const TITLE_TEXT: &str = concat!("Marble Machinations v", env!("CARGO_PKG_VERSION"));
const CONFIG_FILE_NAME: &str = "config.json";
struct Game {
levels: Vec<LevelListEntry>,
level_scroll: usize,
solutions: HashMap<String, Vec<Solution>>,
open_editor: Option<Editor>,
textures: Textures,
selected_level: usize,
selected_solution: usize,
delete_solution: Option<usize>,
@ -55,37 +52,20 @@ fn main() {
impl Game {
fn new(rl: &mut RaylibHandle, thread: &RaylibThread) -> Self {
let mut textures = Textures::default();
textures.load_dir("assets", rl, thread);
textures.load_dir("assets/tiles", rl, thread);
textures.load_dir("assets/digits", rl, thread);
let levels = get_levels();
let solutions = get_solutions();
let config_path = userdata_dir().join(CONFIG_FILE_NAME);
let config = fs::read_to_string(config_path)
.ok()
.and_then(|s| serde_json::from_str(&s).ok())
.unwrap_or_default();
Self {
levels,
level_scroll: 0,
solutions,
open_editor: None,
textures,
selected_level: 0,
selected_solution: 0,
delete_solution: None,
editing_solution_name: false,
level_desc_text: ShapedText::new(20),
globals: Globals {
clipboard: Clipboard::new()
.map_err(|e| eprintln!("System clipboard error: {e}"))
.ok(),
config,
// mouse: util::MouseInput::default()
},
globals: Globals::new(rl, thread),
show_settings: false,
mouse: MouseInput::default(),
}
@ -98,7 +78,7 @@ impl Game {
self.mouse.update(&d);
if let Some(editor) = &mut self.open_editor {
editor.update(&d, &mut self.globals);
editor.draw(&mut d, &self.textures, &mut self.globals);
editor.draw(&mut d, &mut self.globals);
match editor.get_exit_state() {
ExitState::Dont => (),
ExitState::ExitAndSave => {
@ -270,7 +250,7 @@ impl Game {
if tex32_button(
(d, &self.mouse),
(level_list_width + entry_width + 15, solution_y + 4),
self.textures.get("cancel"),
self.globals.get_tex("cancel"),
(&mut tooltip, "delete"),
) {
self.delete_solution = Some(solution_index);