Skip to content

Commit

Permalink
Put the image handles in the app's state
Browse files Browse the repository at this point in the history 
Improves performance significantly
  • Loading branch information
@brianch
brianch committed Feb 12, 2024
1 parent 2b1daa4 commit 7c41fc7
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 38 deletions.
68 changes: 54 additions & 14 deletions src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use eval::{Engine, EngineStatus};
use iced::widget::container::Id;
use iced::advanced::widget::Id as GenericId;
use iced::widget::svg::Handle;
use iced::widget::text::LineHeight;
use styles::{PieceTheme, Theme};
use std::collections::HashMap;
Expand Down Expand Up @@ -76,6 +77,18 @@ struct Flags {
maximize: bool,
}

#[derive(Clone, Copy, Hash, Eq, PartialEq, PartialOrd, Ord)]
enum PieceWithColor {
WhitePawn, WhiteRook, WhiteKnight, WhiteBishop, WhiteQueen, WhiteKing,
BlackPawn, BlackRook, BlackKnight, BlackBishop, BlackQueen, BlackKing,
}

impl PieceWithColor {
fn index(&self) -> usize {
*self as usize
}
}

#[derive(Debug, Clone)]
pub enum Message {
ChessFontLoaded(Result<(), iced::font::Error>),
Expand Down Expand Up @@ -175,6 +188,7 @@ struct OfflinePuzzles {
lang: lang::Language,
mini_ui: bool,
square_ids: HashMap<GenericId, Square>,
piece_imgs: Vec<Handle>,
}

impl Default for OfflinePuzzles {
Expand Down Expand Up @@ -209,6 +223,7 @@ impl Default for OfflinePuzzles {
lang: config::SETTINGS.lang,
mini_ui: false,
square_ids: gen_square_hashmap(),
piece_imgs: get_image_handles(&config::SETTINGS.piece_theme),
}
}
}
Expand Down Expand Up @@ -372,6 +387,27 @@ impl OfflinePuzzles {
}
}

fn get_image_handles(theme: &PieceTheme) -> Vec<Handle> {
let mut handles = Vec::<Handle>::with_capacity(12);
let theme_str = &theme.to_string();

handles.insert(PieceWithColor::WhitePawn.index(), Handle::from_path(String::from("pieces/") + &theme_str + "/wP.svg"));
handles.insert(PieceWithColor::WhiteRook.index(), Handle::from_path(String::from("pieces/") + &theme_str + "/wR.svg"));
handles.insert(PieceWithColor::WhiteKnight.index(), Handle::from_path(String::from("pieces/") + &theme_str + "/wN.svg"));
handles.insert(PieceWithColor::WhiteBishop.index(), Handle::from_path(String::from("pieces/") + &theme_str + "/wB.svg"));
handles.insert(PieceWithColor::WhiteQueen.index(), Handle::from_path(String::from("pieces/") + &theme_str + "/wQ.svg"));
handles.insert(PieceWithColor::WhiteKing.index(), Handle::from_path(String::from("pieces/") + &theme_str + "/wK.svg"));

handles.insert(PieceWithColor::BlackPawn.index(), Handle::from_path(String::from("pieces/") + &theme_str + "/bP.svg"));
handles.insert(PieceWithColor::BlackRook.index(), Handle::from_path(String::from("pieces/") + &theme_str + "/bR.svg"));
handles.insert(PieceWithColor::BlackKnight.index(), Handle::from_path(String::from("pieces/") + &theme_str + "/bN.svg"));
handles.insert(PieceWithColor::BlackBishop.index(), Handle::from_path(String::from("pieces/") + &theme_str + "/bB.svg"));
handles.insert(PieceWithColor::BlackQueen.index(), Handle::from_path(String::from("pieces/") + &theme_str + "/bQ.svg"));
handles.insert(PieceWithColor::BlackKing.index(), Handle::from_path(String::from("pieces/") + &theme_str + "/bK.svg"));

handles
}

fn gen_square_hashmap() -> HashMap<GenericId, Square> {
let mut squares_map = HashMap::new();
for square in ALL_SQUARES {
Expand Down Expand Up @@ -559,6 +595,8 @@ impl Application for OfflinePuzzles {
self.search_tab.opening.lang = self.lang;
self.puzzle_tab.lang = self.lang;
self.settings_tab.saved_configs = settings;
self.piece_imgs = get_image_handles(&self.settings_tab.piece_theme);
self.search_tab.promotion_piece_img = search_tab::gen_piece_vec(&self.settings_tab.piece_theme);
}
Command::none()
}
Expand Down Expand Up @@ -781,6 +819,7 @@ impl Application for OfflinePuzzles {
&self.lang,
size,
self.mini_ui,
&self.piece_imgs,
)});
Container::new(resp)
.padding(1)
Expand Down Expand Up @@ -830,6 +869,7 @@ fn gen_view<'a>(
lang: &lang::Language,
size: Size,
mini_ui: bool,
imgs: &Vec<Handle>,
) -> Element<'a, Message, Theme, iced::Renderer> {

let font = piece_theme == PieceTheme::FontAlpha;
Expand Down Expand Up @@ -954,30 +994,30 @@ fn gen_view<'a>(
}
};
if let Some(piece) = piece {
let text = if color.unwrap() == Color::White {
let piece_index = if color.unwrap() == Color::White {
match piece {
Piece::Pawn => "/wP.svg",
Piece::Rook => "/wR.svg",
Piece::Knight => "/wN.svg",
Piece::Bishop => "/wB.svg",
Piece::Queen => "/wQ.svg",
Piece::King => "/wK.svg"
Piece::Pawn => PieceWithColor::WhitePawn.index(),
Piece::Rook => PieceWithColor::WhiteRook.index(),
Piece::Knight => PieceWithColor::WhiteKnight.index(),
Piece::Bishop => PieceWithColor::WhiteBishop.index(),
Piece::Queen => PieceWithColor::WhiteQueen.index(),
Piece::King => PieceWithColor::WhiteKing.index(),
}
} else {
match piece {
Piece::Pawn => "/bP.svg",
Piece::Rook => "/bR.svg",
Piece::Knight => "/bN.svg",
Piece::Bishop => "/bB.svg",
Piece::Queen => "/bQ.svg",
Piece::King => "/bK.svg"
Piece::Pawn => PieceWithColor::BlackPawn.index(),
Piece::Rook => PieceWithColor::BlackRook.index(),
Piece::Knight => PieceWithColor::BlackKnight.index(),
Piece::Bishop => PieceWithColor::BlackBishop.index(),
Piece::Queen => PieceWithColor::BlackQueen.index(),
Piece::King => PieceWithColor::BlackKing.index(),
}
};

board_row = board_row.push(
container(
iced_drop::droppable(
Svg::from_path(String::from("pieces/") + &piece_theme.to_string() + text).width(board_height)
Svg::new(imgs[piece_index].clone()).width(board_height)
.height(board_height)
).drag_hide(true).drag_center(true).on_drop(move |point, rect| Message::DropPiece(pos, point, rect)).on_click(Message::SelectSquare(pos))
).style(square_style).id(Id::new(pos.to_string()))
Expand Down
42 changes: 18 additions & 24 deletions src/search_tab.rs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
use iced::widget::svg::Handle;
use iced::widget::{Container, Button, column as col, Text, Radio, row, Row, Svg, PickList, Slider, Scrollable, Space};
use iced::widget::text::LineHeight;
use iced::{alignment, Command, Element, Alignment, Length};
use std::io::BufReader;

use iced_aw::TabLabel;
use chess::Piece;
use chess::{Piece, PROMOTION_PIECES};
use crate::config::load_config;
use crate::styles::{PieceTheme, Theme};
use crate::{Tab, Message, config, styles, lang, db, openings};
Expand Down Expand Up @@ -186,6 +187,18 @@ pub enum SearchBase {
Lichess, Favorites
}

pub fn gen_piece_vec(theme: &PieceTheme) -> Vec<Handle> {
let mut handles = Vec::<Handle>::with_capacity(5);
let theme_str = &theme.to_string();
// this first entry won't be used, it's there just to fill the vec, so we can index by the Piece
handles.insert(0, Handle::from_path("pieces/cburnett/wP.svg"));
handles.insert(Piece::Knight.to_index(), Handle::from_path(String::from("pieces/") + &theme_str + "/wN.svg"));
handles.insert(Piece::Bishop.to_index(), Handle::from_path(String::from("pieces/") + &theme_str + "/wB.svg"));
handles.insert(Piece::Rook.to_index(), Handle::from_path(String::from("pieces/") + &theme_str + "/wR.svg"));
handles.insert(Piece::Queen.to_index(), Handle::from_path(String::from("pieces/") + &theme_str + "/wQ.svg"));
handles
}

#[derive(Debug)]
pub struct SearchTab {
pub theme: PickListWrapper<TacticalThemes>,
Expand All @@ -200,6 +213,7 @@ pub struct SearchTab {
pub show_searching_msg: bool,
pub lang: lang::Language,
base: Option<SearchBase>,
pub promotion_piece_img: Vec<Handle>,
}

impl SearchTab {
Expand All @@ -216,6 +230,7 @@ impl SearchTab {
show_searching_msg: false,
lang: config::SETTINGS.lang,
base: Some(SearchBase::Lichess),
promotion_piece_img: gen_piece_vec(&config::SETTINGS.piece_theme),
}
}

Expand Down Expand Up @@ -378,7 +393,6 @@ impl SearchTab {
}
Some(puzzles)
}

}


Expand Down Expand Up @@ -487,27 +501,7 @@ impl Tab for SearchTab {
));
}
} else {
for i in 0..4 {
let piece;
let image;
match i {
0 => {
piece = Piece::Rook;
image = "/wR.svg";
}
1 => {
piece = Piece::Knight;
image = "/wN.svg";
}
2 => {
piece = Piece::Bishop;
image = "/wB.svg";
}
_ => {
piece = Piece::Queen;
image = "/wQ.svg";
}
};
for piece in PROMOTION_PIECES {
let square_style =
if self.piece_to_promote_to == piece {
styles::ButtonStyle::DarkSquare
Expand All @@ -516,7 +510,7 @@ impl Tab for SearchTab {
};
row_promotion = row_promotion.push(Row::new().spacing(5).align_items(Alignment::Center)
.push(Button::new(
Svg::from_path(String::from("pieces/") + &self.piece_theme_promotion.to_string() + image)
Svg::new(self.promotion_piece_img[piece.to_index()].clone())
)
.width(60)
.height(60)
Expand Down

0 comments on commit 7c41fc7

Please sign in to comment.