From 11de736676af189fc1191a5c6d24006e15e6d080 Mon Sep 17 00:00:00 2001 From: Rancic Date: Fri, 19 Jul 2024 17:27:00 +0200 Subject: [PATCH] chore: Release Magus Parvus v0.2.0 No new features, just bumped Bevy version and fixed some minor issues. --- Cargo.lock | 2 +- Cargo.toml | 10 +++++++- src/world/camera.rs | 5 +++- wasm/index.html | 44 +++++++++++++++++++++++++++++++++-- wasm/styles.css | 56 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 wasm/styles.css diff --git a/Cargo.lock b/Cargo.lock index c6bf401..fbdbf34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2607,7 +2607,7 @@ dependencies = [ [[package]] name = "magus-parvus" -version = "0.1.6" +version = "0.2.0" dependencies = [ "bevy", "bevy_asset_loader", diff --git a/Cargo.toml b/Cargo.toml index 8ef1c20..a5781de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "magus-parvus" -version = "0.1.6" +version = "0.2.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -13,6 +13,14 @@ opt-level = 1 [profile.dev.package."*"] opt-level = 3 +# https://github.com/rust-lang/cargo/issues/4897 +[profile.wasm] +inherits = "release" +panic = "abort" +opt-level = 'z' +lto = true +codegen-units = 1 + [dependencies] rand = "0.8.5" chrono = "0.4.31" diff --git a/src/world/camera.rs b/src/world/camera.rs index c315d1e..9cff7ee 100644 --- a/src/world/camera.rs +++ b/src/world/camera.rs @@ -2,13 +2,16 @@ use bevy::prelude::*; use bevy::render::camera::ScalingMode; #[cfg(not(target_arch = "wasm32"))] use bevy::render::view::screenshot::ScreenshotManager; +#[cfg(not(target_arch = "wasm32"))] use bevy::window::{PrimaryWindow, WindowMode}; use bevy_kira_audio::prelude::AudioReceiver; use bevy_rapier2d::plugin::PhysicsSet; use super::camera_shake::{update_camera, CameraShake}; use crate::player::input::PlayerInput; -use crate::player::{Player, PlayerState}; +use crate::player::Player; +#[cfg(not(target_arch = "wasm32"))] +use crate::player::PlayerState; use crate::spell::debug_spell::DebugSpell; use crate::GameState; diff --git a/wasm/index.html b/wasm/index.html index ed8eec9..b4dae94 100644 --- a/wasm/index.html +++ b/wasm/index.html @@ -1,8 +1,21 @@ - + + + + + + +
+
+
+ +
+
+ - diff --git a/wasm/styles.css b/wasm/styles.css new file mode 100644 index 0000000..a057fa6 --- /dev/null +++ b/wasm/styles.css @@ -0,0 +1,56 @@ +* { + margin: 0; + padding: 0; + border: 0; +} + +html, +body { + width: 100%; + height: 100%; +} + +.game-container { + width: 100%; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + + /* Background pattern from https://css-pattern.com/ */ + --s: 200px; + --c1: #1d1d1d; + --c2: #4e4f51; + --c3: #3c3c3c; + background: + repeating-conic-gradient(from 30deg, #0000 0 120deg, var(--c3) 0 180deg) calc(.5*var(--s)) calc(.5*var(--s)*0.577), + repeating-conic-gradient(from 29.5deg, var(--c1) 0 60deg, var(--c2) 0 120deg, var(--c3) 0 180deg); + background-size: var(--s) calc(var(--s)*0.577); +} + +#bevy { + height: 0; +} + +/* Loader from https://cssloaders.github.io/ */ +.loader { + width: 128px; + height: 128px; + border: 16px solid #FFF; + border-bottom-color: #FF3D00; + border-radius: 50%; + display: inline-block; + box-sizing: border-box; + animation: rotation 1s linear infinite; +} + +@keyframes rotation { + 0% { + transform: rotate(0deg); + } + + 100% { + transform: rotate(360deg); + } +}