diff --git a/.gitignore b/.gitignore index 0389a60..e865fc9 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,6 @@ trace-*.json # Don't need this -.vscode/ \ No newline at end of file +.vscode/ + +*.tracy \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index bfdb585..c09a009 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -830,8 +830,10 @@ dependencies = [ "bevy_ecs 0.13.2", "bevy_utils 0.13.2", "console_error_panic_hook", + "tracing-error", "tracing-log 0.1.4", "tracing-subscriber", + "tracing-tracy", "tracing-wasm", ] @@ -1038,6 +1040,7 @@ dependencies = [ "ktx2", "naga", "naga_oil", + "profiling", "ruzstd", "serde", "thiserror", @@ -2219,6 +2222,19 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + [[package]] name = "gethostname" version = "0.4.3" @@ -2891,6 +2907,19 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +[[package]] +name = "loom" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e045d70ddfbc984eacfa964ded019534e8f6cbf36f6410aee0ed5cefa5a9175" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", +] + [[package]] name = "loop9" version = "0.1.5" @@ -3523,6 +3552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" dependencies = [ "profiling-procmacros", + "tracing", ] [[package]] @@ -3810,6 +3840,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rustversion" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" + [[package]] name = "ruzstd" version = "0.5.0" @@ -4279,6 +4315,16 @@ dependencies = [ "valuable", ] +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + [[package]] name = "tracing-log" version = "0.1.4" @@ -4319,6 +4365,17 @@ dependencies = [ "tracing-log 0.2.0", ] +[[package]] +name = "tracing-tracy" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6024d04f84a69fd0d1dc1eee3a2b070bd246530a0582f9982ae487cb6c703614" +dependencies = [ + "tracing-core", + "tracing-subscriber", + "tracy-client", +] + [[package]] name = "tracing-wasm" version = "0.2.1" @@ -4330,6 +4387,26 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "tracy-client" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fb931a64ff88984f86d3e9bcd1ae8843aa7fe44dd0f8097527bc172351741d" +dependencies = [ + "loom", + "once_cell", + "tracy-client-sys", +] + +[[package]] +name = "tracy-client-sys" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d104d610dfa9dd154535102cc9c6164ae1fa37842bc2d9e83f9ac82b0ae0882" +dependencies = [ + "cc", +] + [[package]] name = "ttf-parser" version = "0.20.0" diff --git a/Cargo.toml b/Cargo.toml index 0181993..62f8609 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,5 +15,15 @@ winit = "*" image = "*" gltf = "*" +[features] +trace = ["bevy/trace_tracy"] + [profile.dev] opt-level = 3 + +[profile.release] +opt-level = "z" +strip = true +panic = "abort" +lto = true +codegen-units = 1 \ No newline at end of file diff --git a/RULES.txt b/RULES.txt deleted file mode 100644 index bd45ac2..0000000 --- a/RULES.txt +++ /dev/null @@ -1,17 +0,0 @@ -- https://www.looneylabs.com/rules/martian-chess -- [x] Movement - - [x] Pawn movement - - [x] Drone movement - - [x] Queen movement -- [x] No move reversal -- [ ] Scoring - - Queen: 3 - - Drone: 2 - - Pawn: 1 -- [ ] Merging - - Pawn + Pawn = Drone (if no drones) - - Drone + Drone = Queen (if no queens) -- [ ] Game over - - When one half is empty -- [ ] Tie breaker - - Last player to move wins \ No newline at end of file diff --git a/src/display3d.rs b/src/display3d.rs index 482ffdf..a5ad609 100644 --- a/src/display3d.rs +++ b/src/display3d.rs @@ -1,7 +1,6 @@ use bevy::core_pipeline::{ contrast_adaptive_sharpening::ContrastAdaptiveSharpeningSettings, fxaa::Fxaa, }; -use gltf::Animation; use crate::prelude::*; diff --git a/src/game.rs b/src/game.rs index 846b81e..7288690 100644 --- a/src/game.rs +++ b/src/game.rs @@ -371,14 +371,10 @@ impl Board { fn new() -> Board { Board::from_ascii( - // r#".....dqq - // dpp..pdq - // qdp..ppd - // qqd....."#, - r#"........ - .p...p.. - ...q.... - .p...p.."#, + r#".....dqq + dpp..pdq + qdp..ppd + qqd....."#, ) } diff --git a/src/main.rs b/src/main.rs index 75a9c6a..37b40f7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,6 +3,11 @@ #![feature(iter_intersperse)] // used in debug.rs #![feature(async_closure)] // Loading tweakfiles +use std::alloc::System; + +#[global_allocator] +static A: System = System; + mod audio; mod credits; mod debug; diff --git a/traces/.gitkeep b/traces/.gitkeep new file mode 100644 index 0000000..e69de29