From e1d9e51b17959a079a3cf3af742231b0f1244a3b Mon Sep 17 00:00:00 2001 From: Micutio Date: Sat, 1 Jan 2022 01:52:36 +0800 Subject: [PATCH] fix broken wasm version, regress bracket-lib back to rltk --- Cargo.toml | 3 +-- src/game/mod.rs | 2 +- src/game/objects.rs | 2 +- src/game/position.rs | 2 +- src/main.rs | 4 +--- src/raws/mod.rs | 2 +- src/ui/custom/genome_editor.rs | 2 +- src/ui/dialog/mod.rs | 2 +- src/ui/frontend.rs | 2 +- src/ui/hud.rs | 2 +- src/ui/input.rs | 2 +- src/ui/menu/credits.rs | 2 +- src/ui/menu/mod.rs | 2 +- src/ui/particle.rs | 2 +- src/ui/rex_assets.rs | 2 +- 15 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index fd9eff0..58a8b40 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,8 +11,7 @@ wasm-bindgen = [ "instant/wasm-bindgen" ] [dependencies] casim = { git = "https://github.com/micutio/casim", branch = "main" } -bracket-lib = { git="https://github.com/amethyst/bracket-lib.git" } - +rltk="0.8.1" cpuprofiler = "0.0.4" instant = "0.1" lazy_static = "1.4.0" diff --git a/src/game/mod.rs b/src/game/mod.rs index 91e36e6..117002e 100644 --- a/src/game/mod.rs +++ b/src/game/mod.rs @@ -33,7 +33,7 @@ use crate::util::timer; use crate::world_gen; use crate::world_gen::WorldGen; -use bracket_lib::prelude as rltk; + use core::fmt; use std::error::Error; use std::fmt::{Display, Formatter}; diff --git a/src/game/objects.rs b/src/game/objects.rs index 9e1558a..02056d6 100644 --- a/src/game/objects.rs +++ b/src/game/objects.rs @@ -5,7 +5,7 @@ use crate::rand::Rng; use crate::util::rng; use crate::{game, util}; -use bracket_lib::prelude as rltk; + use std::ops::{Index, IndexMut}; #[cfg(not(target_arch = "wasm32"))] diff --git a/src/game/position.rs b/src/game/position.rs index 43f60f8..a94f489 100644 --- a/src/game/position.rs +++ b/src/game/position.rs @@ -1,4 +1,4 @@ -use bracket_lib::prelude as rltk; + use serde::{Deserialize, Serialize}; #[derive(Debug, Serialize, Deserialize, Default, Clone, Copy)] diff --git a/src/main.rs b/src/main.rs index 8f9bd1b..e77ff81 100644 --- a/src/main.rs +++ b/src/main.rs @@ -10,11 +10,11 @@ extern crate casim; extern crate log; #[macro_use] extern crate lazy_static; -extern crate bracket_lib; extern crate pretty_env_logger; extern crate rand; extern crate rand_core; extern crate rand_isaac; +extern crate rltk; extern crate serde; extern crate serde_json; @@ -26,8 +26,6 @@ mod ui; mod util; mod world_gen; -use crate::rltk::EMBED; -use bracket_lib::prelude as rltk; use std::env; rltk::embedded_resource!(FONT_16X16_YUN, "../resources/fonts/yun_16x16.png"); diff --git a/src/raws/mod.rs b/src/raws/mod.rs index 4c16ee9..e163109 100644 --- a/src/raws/mod.rs +++ b/src/raws/mod.rs @@ -2,7 +2,7 @@ pub mod spawn; pub mod template; use crate::rltk::EMBED; -use bracket_lib::prelude as rltk; + use spawn::Spawn; use template::ObjectTemplate; diff --git a/src/ui/custom/genome_editor.rs b/src/ui/custom/genome_editor.rs index 56a9541..31153ab 100644 --- a/src/ui/custom/genome_editor.rs +++ b/src/ui/custom/genome_editor.rs @@ -9,7 +9,7 @@ use crate::rand::Rng; use crate::ui; use crate::util::rng::RngExtended; -use bracket_lib::prelude as rltk; + use std::ops::Add; const TOP_ROW_Y_OFFSET: i32 = 1; diff --git a/src/ui/dialog/mod.rs b/src/ui/dialog/mod.rs index a091dd3..c5b495c 100644 --- a/src/ui/dialog/mod.rs +++ b/src/ui/dialog/mod.rs @@ -2,7 +2,7 @@ pub mod character; pub mod controls; use crate::{game, ui}; -use bracket_lib::prelude as rltk; + /// Simple info box. Can be exited by clicking outside or pressing `Esc` #[derive(Clone, Debug)] diff --git a/src/ui/frontend.rs b/src/ui/frontend.rs index f9182b5..e83a7f0 100644 --- a/src/ui/frontend.rs +++ b/src/ui/frontend.rs @@ -3,7 +3,7 @@ use crate::game::{self, ObjectStore, Position}; use crate::ui; use crate::util; -use bracket_lib::prelude as rltk; + pub fn render_world(objects: &mut ObjectStore, ctx: &mut rltk::BTerm, vis_update: bool) { // time rendering method for profiling purposes diff --git a/src/ui/hud.rs b/src/ui/hud.rs index 1a993c1..3ffd117 100644 --- a/src/ui/hud.rs +++ b/src/ui/hud.rs @@ -17,7 +17,7 @@ use crate::ui; use crate::ui::palette; use crate::util; -use bracket_lib::prelude as rltk; + /// Menu item properties /// - `text` for rendering diff --git a/src/ui/input.rs b/src/ui/input.rs index 68b5714..79163e6 100644 --- a/src/ui/input.rs +++ b/src/ui/input.rs @@ -4,7 +4,7 @@ use crate::game::position::Position; use crate::game::{self, env, ObjectStore, State}; use crate::ui::hud; -use bracket_lib::prelude as rltk; + #[derive(Clone, Debug)] pub enum PlayerInput { diff --git a/src/ui/menu/credits.rs b/src/ui/menu/credits.rs index 5f3311b..cb731a5 100644 --- a/src/ui/menu/credits.rs +++ b/src/ui/menu/credits.rs @@ -1,7 +1,7 @@ use crate::game::{self, ObjectStore, State}; use crate::ui::dialog; use crate::ui::menu::{self, Menu, MenuItem}; -use bracket_lib::prelude as rltk; + #[derive(Copy, Clone, Debug)] pub enum CreditsMenuItem { diff --git a/src/ui/menu/mod.rs b/src/ui/menu/mod.rs index ba6a68b..d635862 100644 --- a/src/ui/menu/mod.rs +++ b/src/ui/menu/mod.rs @@ -7,7 +7,7 @@ pub mod main; use crate::game::{self, State}; use crate::ui::hud::{ToolTip, UiItem}; use crate::{game::objects::ObjectStore, ui::palette}; -use bracket_lib::prelude as rltk; + pub trait MenuItem: Clone { fn process( diff --git a/src/ui/particle.rs b/src/ui/particle.rs index a4695c3..ed21c5c 100644 --- a/src/ui/particle.rs +++ b/src/ui/particle.rs @@ -2,7 +2,7 @@ use crate::game; -use bracket_lib::prelude as rltk; + const TIME_MS_PER_FRAME: f32 = 1000.0 / 60.0; diff --git a/src/ui/rex_assets.rs b/src/ui/rex_assets.rs index 2f73eb3..0d57cbc 100644 --- a/src/ui/rex_assets.rs +++ b/src/ui/rex_assets.rs @@ -1,5 +1,5 @@ use crate::rltk::EMBED; -use bracket_lib::prelude as rltk; + rltk::embedded_resource!(SMALL_DUNGEON, "../../resources/art/menu_bg.xp");