diff --git a/Makefile b/Makefile index 83c7aa4..694a0bc 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ dist/trees/index.html: web/trees.html cp ./web/trees.html ./dist/trees/index.html # Copy assets -dist/trees/assets: +dist/trees/assets/trees: rm -rf dist/trees/assets rsync -av \ --include='*/' \ @@ -30,8 +30,8 @@ dist/trees/assets: --include='*.mono' \ --exclude='*' \ --delete \ - assets/ \ - dist/trees/assets + assets/trees \ + dist/trees/assets/trees # Helpful shorthand to serve files web/trees/serve: web/trees diff --git a/assets/flappy/bevy.png b/assets/flappy/bevy.png deleted file mode 100644 index ed83a84..0000000 --- a/assets/flappy/bevy.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b501c6ce53a9465e083668a7298e78b514796217a0cb50112bb2d88d2a7b666 -size 15860 diff --git a/assets/flappy/bird.png b/assets/flappy/bird.png new file mode 100644 index 0000000..035078a --- /dev/null +++ b/assets/flappy/bird.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ca8a74c9a35e081d87a658b043fed83cea064eff010f4989624de5759227d39 +size 144 diff --git a/assets/flappy/ground.png b/assets/flappy/ground.png new file mode 100644 index 0000000..d1de86d --- /dev/null +++ b/assets/flappy/ground.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6481fa4d5dda5fd16c0437bc934dbd25fa6ca57ef9bb7b1ed0c8b70794bf3b6d +size 142 diff --git a/assets/flappy/pipe.png b/assets/flappy/pipe.png new file mode 100644 index 0000000..6d93bba --- /dev/null +++ b/assets/flappy/pipe.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d73f8490b64829f8102f23a5bd8461566e9b53741d5eba6d0c8c24c5d46a6f1c +size 127 diff --git a/src/bin/flappy/main.rs b/src/bin/flappy/main.rs index ad3087c..6d30f60 100644 --- a/src/bin/flappy/main.rs +++ b/src/bin/flappy/main.rs @@ -141,7 +141,7 @@ fn init_bird( mut materials: ResMut>, ) { let material = MeshMaterial2d(materials.add(ColorMaterial { - texture: Some(server.load("kenny.nl/1-bit-platformer-pack/tile_0380.png")), + texture: Some(server.load("flappy/bird.png")), color: ORANGE.into(), alpha_mode: AlphaMode2d::Blend, ..default() @@ -340,14 +340,14 @@ fn init_obstacle_assets( server: Res, ) { pipe_assets.material = MeshMaterial2d(materials.add(ColorMaterial { - texture: Some(server.load("kenny.nl/1-bit-platformer-pack/tile_0247.png")), + texture: Some(server.load("flappy/pipe.png")), color: GREEN.into(), ..default() })); pipe_assets.mesh = Mesh2d(meshes.add(Rectangle::new(1.0, 1.0))); ground_assets.material = MeshMaterial2d(materials.add(ColorMaterial { - texture: Some(server.load("kenny.nl/1-bit-platformer-pack/tile_0088.png")), + texture: Some(server.load("flappy/ground.png")), color: BLACK.into(), ..default() }));