From f20979f86dc3558f01ffdfe066ee46fa5b04effc Mon Sep 17 00:00:00 2001 From: Nixon Date: Fri, 26 Aug 2022 17:08:49 +0800 Subject: [PATCH 1/2] uses target translation for camera movement (prevent hard hit when moving beyond lower margin) --- Cargo.lock | 1 + Cargo.toml | 1 + src/game.rs | 8 +++++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 91bb56d..2396d32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1333,6 +1333,7 @@ dependencies = [ "parking_lot 0.12.1", "stdweb", "thiserror", + "wasm-bindgen", "web-sys", "windows", ] diff --git a/Cargo.toml b/Cargo.toml index 22905a7..c0de684 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,6 +24,7 @@ serde_json = "1.0.85" ticktock = "0.8.0" [target."cfg(target_arch = \"wasm32\")".dependencies] +cpal = { version = "0.14.0", features = ["wasm-bindgen"] } [profile.dev.package."*"] opt-level = 3 diff --git a/src/game.rs b/src/game.rs index eba3d44..102a44e 100644 --- a/src/game.rs +++ b/src/game.rs @@ -471,13 +471,15 @@ fn move_camera( let size: Vec2 = camera.logical_viewport_size().unwrap(); let half_height: f32 = size.y * 0.5; + let mut target_translation = character_transform.translation; + // prevent camera from going too low + target_translation.y = target_translation.y.max(half_height - MARGIN); + camera_transform.translation = camera_transform.translation.lerp( - character_transform.translation, + target_translation, time.delta_seconds() * FOLLOW_SPEED, ); - // prevent camera from going too low - camera_transform.translation.y = camera_transform.translation.y.max(half_height - MARGIN); // always make sure that camera is away from the object in order to render them camera_transform.translation.z = 999.0; } From 1e2ecd76c7dba8536aac78025b2f1cde30dec33c Mon Sep 17 00:00:00 2001 From: Nixon Date: Fri, 26 Aug 2022 18:27:08 +0800 Subject: [PATCH 2/2] directly host server after building with run-wasm.sh script --- run-wasm.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 run-wasm.sh diff --git a/run-wasm.sh b/run-wasm.sh new file mode 100644 index 0000000..417b6b0 --- /dev/null +++ b/run-wasm.sh @@ -0,0 +1,2 @@ +source build-wasm.sh +python -m http.server \ No newline at end of file