Separate ui and core

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["chrs-core", "chrs-perft"]
+members = ["chrs-core", "chrs-perft", "chrs-ui"]
 resolver = "2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

README.md

@@ -6,8 +6,6 @@ chess-rs is a Chess Engine written from scratch in Rust.
 
 ### Features
 
-This section should list any major features of chess-rs
-
 - [x] Move Generation using BitBoards (~17s perft results at depth 6 for starting position)
 - [x] Supports all moves including en-passant, pawn promotion and castling
 - [x] GUI gameplay
@@ -20,7 +18,6 @@ This section should list any major features of chess-rs
 - [x] Transposition Tables
 - [x] Incremental Search Deepening
 - [ ] Opening Book
-- [ ] Separate UI from Core
 
 
 ## Getting Started
@@ -43,7 +40,7 @@ cargo build
 
 ```
 # You can either start the Chess Engine with
-cargo run -p chrs-core
+cargo run -p chrs-ui
 
 # Or you can run perft analysis
 cargo run -p chrs-perft -- 5 "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"

chrs-core/Cargo.toml

@@ -8,13 +8,6 @@ log = "0.4.17"
 pretty_env_logger = "0.4.0"
 # TODO: Is lazy_static really needed?
 lazy_static = "1.4.0"
-winit = "0.27.5"
-pixels = "0.11.0"
-resvg = "0.29.0"
-egui = "0.20.0"
-egui-winit = "0.20.1"
-egui-wgpu = "0.20.0"
-fontdue = "0.7.2"
 rand = "0.8.5"
 strum = "0.24"
 strum_macros = "0.24"

chrs-core/src/lib.rs

@@ -1,10 +1,6 @@
 pub mod ai;
-pub mod app;
-pub mod board;
 pub mod data;
 pub mod generator;
 pub mod zobrist;
 
-mod cache;
 mod prng;
-mod ui;

chrs-ui/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "chrs-ui"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+chrs-core = {path = "../chrs-core"}
+
+log = "0.4.17"
+pretty_env_logger = "0.4.0"
+winit = "0.27.5"
+pixels = "0.11.0"
+resvg = "0.29.0"
+egui = "0.20.0"
+egui-winit = "0.20.1"
+egui-wgpu = "0.20.0"
+fontdue = "0.7.2"

chrs-core/src/app.rs → chrs-ui/src/app.rs

@@ -1,8 +1,8 @@
-use crate::ai::{NegaMaxAI, AI};
 use crate::board::{events::BoardEvent, Board};
-use crate::data::{BoardConfig, Color, MoveList, Square};
-use crate::generator::MoveGenerator;
 use crate::ui::GuiFramework;
+use chrs_core::ai::{NegaMaxAI, AI};
+use chrs_core::data::{BoardConfig, Color, MoveList, Square};
+use chrs_core::generator::MoveGenerator;
 
 use log;
 use pixels::{Error, Pixels, SurfaceTexture};

chrs-core/src/board/mod.rs → chrs-ui/src/board/mod.rs

@@ -1,8 +1,8 @@
 pub mod events;
 
 use crate::cache::Cache;
-use crate::data::{BoardConfig, BoardPiece, Color, Move, MoveList, Square};
-use crate::generator::MoveGenerator;
+use chrs_core::data::{BoardConfig, BoardPiece, Color, Move, MoveList, Square};
+use chrs_core::generator::MoveGenerator;
 use events::{BoardEvent, ElementState, MouseButton, MouseState};
 use fontdue::{
     layout::{CoordinateSystem, HorizontalAlign, Layout, LayoutSettings, TextStyle},

chrs-core/src/main.rs → chrs-ui/src/main.rs

@@ -1,9 +1,13 @@
 #![allow(warnings, unused)]
+mod app;
+mod board;
+mod cache;
+mod ui;
 
 use pixels::Error;
 use pretty_env_logger;
 
-use chrs_core::app::App;
+use app::App;
 
 fn main() -> Result<(), Error> {
     std::env::set_var("RUST_BACKTRACE", "1");

chrs-core/src/ui/gui.rs → chrs-ui/src/ui/gui.rs

@@ -1,8 +1,8 @@
 use std::cell::RefCell;
 use std::rc::Rc;
 
-use crate::data::BoardConfig;
-use crate::data::Color;
+use chrs_core::data::BoardConfig;
+use chrs_core::data::Color;
 use egui::{Color32, Context};
 
 pub(super) struct Gui {

chrs-core/src/ui/mod.rs → chrs-ui/src/ui/mod.rs

@@ -12,7 +12,7 @@ use std::rc::Rc;
 use winit::event_loop::EventLoopWindowTarget;
 use winit::window::Window;
 
-use crate::data::BoardConfig;
+use chrs_core::data::BoardConfig;
 
 /// Manages all state required for rendering egui over `Pixels`.
 pub struct GuiFramework {