add option to turn devtools off #17

Merged
LuckyTurtleDev merged 2 commits from devtools into main 2024-07-07 14:03:30 +00:00
2 changed files with 33 additions and 9 deletions
Showing only changes of commit 2ed17ae05b - Show all commits

View file

@ -19,7 +19,9 @@ pub fn draw(state: &crate::State, _engine: &comfy::EngineContext<'_>) {
ZLayer::MapMax - i,
Vec2::ONE
);
draw_rect_outline(coords.as_vec2(), Vec2::ONE, 0.1, RED, 10);
if state.dev {
draw_rect_outline(coords.as_vec2(), Vec2::ONE, 0.1, RED, 10);
}
}
}
draw_circle(state.ghost.overworld_pos, 0.5, RED, ZLayer::Ghost.into());

View file

@ -10,17 +10,31 @@ mod activities;
mod game;
mod ui;
use std::env::var;
use self::{
activities::{house::HouseState, overworld::worldgen::Overworld, Activity},
game::Ghost
};
use comfy::{
etagere::euclid::default, init_game_config, pollster, run_comfy_main_async,
DevConfig, EngineContext, EngineState, GameConfig, GameLoop, HashMap, IVec2
init_game_config, pollster, run_comfy_main_async, DevConfig, EngineContext,
EngineState, GameConfig, GameLoop, HashMap, IVec2
};
const GAME_NAME: &str = "Powercreep";
/// true if devtools should be enable
fn dev_from_env() -> bool {
match var("DEV").as_ref().map(|f| f.as_str()) {
Ok("false") => false,
Ok("true") => true,
#[cfg(debug_assertions)]
_ => true,
#[cfg(not(debug_assertions))]
_ => false
}
}
#[derive(Debug, Default)]
struct State {
setup_called: bool,
@ -28,7 +42,9 @@ struct State {
ghost: Ghost,
overworld: Overworld,
houses: HashMap<IVec2, HouseState>,
score: f32
score: f32,
/// show dev tools
dev: bool
}
impl State {
@ -52,7 +68,10 @@ impl State {
impl GameLoop for State {
fn new(_c: &mut EngineState) -> Self {
Self::default()
Self {
dev: dev_from_env(),
..Default::default()
}
}
fn update(&mut self, ctx: &mut EngineContext<'_>) {
@ -67,10 +86,13 @@ impl GameLoop for State {
}
fn config(config: GameConfig) -> GameConfig {
let dev = DevConfig {
#[cfg(debug_assertions)]
show_fps: true,
..Default::default()
let dev = if dev_from_env() {
DevConfig {
show_fps: true,
..Default::default()
}
} else {
Default::default()
};
GameConfig {
tonemapping_enabled: true,