diff --git a/.gitignore b/.gitignore index 5432161..a1a258d 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ VERSION # Generated MONOLOGUES list for wasm build assets/trees/MONOLOGUES + +# Blender temp file(s) +*.blend1 diff --git a/assets/flappy/assets.blend b/assets/flappy/assets.blend new file mode 100644 index 0000000..426efcb Binary files /dev/null and b/assets/flappy/assets.blend differ diff --git a/assets/flappy/background-city.png b/assets/flappy/background-city.png index e059925..851d066 100644 --- a/assets/flappy/background-city.png +++ b/assets/flappy/background-city.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a46a212302c813b07cf0c8d465024824f6543423159260242806a7ceaf84add2 -size 499 +oid sha256:ab7347a4c73275a47d104a33442de16c3b5e96cce5ce4edda8a2dd44328d3fdf +size 9432 diff --git a/assets/flappy/background-clouds.png b/assets/flappy/background-clouds.png index b769645..733613e 100644 --- a/assets/flappy/background-clouds.png +++ b/assets/flappy/background-clouds.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:235ead07c9fa7e851779ef68ab9bf9fa08bac4933e0d350c6d4a8b9a1f19affa -size 582 +oid sha256:50df73a6300bd70ef14590439e05c8d05da33025e893794627bdd12ae34a6d79 +size 11383 diff --git a/assets/flappy/bird.png b/assets/flappy/bird.png index ca5fcc5..d9bfd79 100644 --- a/assets/flappy/bird.png +++ b/assets/flappy/bird.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9b7438371f7bb0639d93b4b6b3bb99cc7179f740b1e77e7e6b5c7aeec89335d -size 247 +oid sha256:3c2f7bf0b078bbafba254ca4535dc8633ad11b9fd98c331c25ddd67ef387a214 +size 2119 diff --git a/assets/flappy/ceiling.png b/assets/flappy/ceiling.png index e202302..9cce4d9 100644 --- a/assets/flappy/ceiling.png +++ b/assets/flappy/ceiling.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a786c7930eed28d37b1725e8fed1a63af60c2a3c886f3c9474979986badca594 -size 251 +oid sha256:5d730871b021472f568b760f889a41083ec63db03f47a0c8a93f999ddf87d4d9 +size 3920 diff --git a/assets/flappy/ground.png b/assets/flappy/ground.png index d1de86d..475d63b 100644 --- a/assets/flappy/ground.png +++ b/assets/flappy/ground.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6481fa4d5dda5fd16c0437bc934dbd25fa6ca57ef9bb7b1ed0c8b70794bf3b6d -size 142 +oid sha256:021e74c9cb358b0a145cefeb28994273ef5717ff0e0a5a528c17b58d7f5a03cc +size 4112 diff --git a/assets/flappy/pipe.png b/assets/flappy/pipe.png index f8ca626..0c4d641 100644 --- a/assets/flappy/pipe.png +++ b/assets/flappy/pipe.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:deffb8ad67214563e29be38699275173a969a9b06464837d9aa4b283c42dedba -size 242 +oid sha256:3b0eadcc3044243114180585120c93d779b1ad78e32a8dd83aadddd0ef1c51d8 +size 2315 diff --git a/src/bin/flappy/main.rs b/src/bin/flappy/main.rs index 3b7d01f..9314b6a 100644 --- a/src/bin/flappy/main.rs +++ b/src/bin/flappy/main.rs @@ -201,11 +201,11 @@ impl Tape { fn init_bird(mut commands: Commands, bird_assets: Res) { let name = Name::new("bird"); - let t = Transform::from_xyz(0.0, 0.0, 0.0).with_scale(Vec3::splat(50.0)); + let t = Transform::from_xyz(0.0, 0.0, 0.0).with_scale(Vec3::new(62.5, 50.0, 50.0)); let physics = ( RigidBody::Static, - Collider::rectangle(1.0, 1.2), + Collider::rectangle(1.0, 1.0), Mass(10.0), ExternalImpulse::default().with_persistence(false), MaxLinearSpeed(500.0), @@ -318,8 +318,8 @@ fn populate_ground( ground_assets.mesh.clone(), Name::new("ground"), RigidBody::Static, - Collider::rectangle(1.0, 1.0), - Transform::from_xyz(100.0 * (*idx) as f32, -300.0, -1.0).with_scale(Vec3::splat(100.0)), + Collider::rectangle(1.0, 0.75), + Transform::from_xyz(100.0 * (*idx) as f32, -275.0, -1.0).with_scale(Vec3::splat(100.0)), )); } @@ -336,7 +336,7 @@ fn populate_ceiling( ceiling_assets.mesh.clone(), Name::new("ceiling"), RigidBody::Static, - Collider::rectangle(1.0, 1.0), + Collider::rectangle(1.0, 0.75), Transform::from_xyz(100.0 * (*idx) as f32, 300.0, -3.0).with_scale(Vec3::splat(100.0)), )); } @@ -473,14 +473,14 @@ fn init_assets( ground_assets.material = MeshMaterial2d(materials.add(ColorMaterial { texture: Some(server.load("flappy/ground.png")), - color: Srgba::new(0.1, 0.1, 0.1, 1.0).into(), + color: GREEN.into(), ..default() })); ground_assets.mesh = Mesh2d(meshes.add(Rectangle::new(1.0, 1.0))); ceiling_assets.material = MeshMaterial2d(materials.add(ColorMaterial { texture: Some(server.load("flappy/ceiling.png")), - color: Srgba::new(0.1, 0.1, 0.1, 1.0).into(), + color: FIRE_BRICK.into(), ..default() })); ceiling_assets.mesh = Mesh2d(meshes.add(Rectangle::new(1.0, 0.777))); @@ -742,7 +742,7 @@ fn init_background( { let material = MeshMaterial2d(materials.add(ColorMaterial { texture: Some(server.load("flappy/background-city.png")), - color: Srgba::new(0.3, 0.3, 0.3, 1.0).into(), + color: LIGHT_GREY.with_alpha(0.8).into(), alpha_mode: AlphaMode2d::Blend, ..default() })); @@ -760,7 +760,7 @@ fn init_background( { let material = MeshMaterial2d(materials.add(ColorMaterial { texture: Some(server.load("flappy/background-clouds.png")), - color: Srgba::new(0.2, 0.2, 0.2, 1.0).into(), + color: WHITE_SMOKE.with_alpha(0.8).into(), alpha_mode: AlphaMode2d::Blend, ..default() }));