Skip to content

Commit

Permalink
fix broken wasm version, regress bracket-lib back to rltk
Browse files Browse the repository at this point in the history
  • Loading branch information
micutio committed Dec 31, 2021
1 parent 6e13f2e commit e1d9e51
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 18 deletions.
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/game/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion src/game/objects.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"))]
Expand Down
2 changes: 1 addition & 1 deletion src/game/position.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use bracket_lib::prelude as rltk;

use serde::{Deserialize, Serialize};

#[derive(Debug, Serialize, Deserialize, Default, Clone, Copy)]
Expand Down
4 changes: 1 addition & 3 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion src/raws/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/ui/custom/genome_editor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/ui/dialog/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/ui/frontend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/ui/hud.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/ui/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/menu/credits.rs
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/menu/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion src/ui/particle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
use crate::game;

use bracket_lib::prelude as rltk;


const TIME_MS_PER_FRAME: f32 = 1000.0 / 60.0;

Expand Down
2 changes: 1 addition & 1 deletion src/ui/rex_assets.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::rltk::EMBED;
use bracket_lib::prelude as rltk;


rltk::embedded_resource!(SMALL_DUNGEON, "../../resources/art/menu_bg.xp");

Expand Down

0 comments on commit e1d9e51

Please sign in to comment.