From 3cfa00be14c37a1f06ab88632e5755cf75ae1e9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zuzana=20Arnoldov=C3=A1?= <zuzana.arnoldova@gmail.com>
Date: Tue, 19 Sep 2023 22:35:46 +0200
Subject: [PATCH] WIP topdown game

---
 Makefile                           |   3 +-
 assets/chicken.png                 | Bin 0 -> 943 bytes
 assets/grass.png                   | Bin 0 -> 292 bytes
 comfy/examples/ecs_topdown_game.rs |  91 +++++++++++++++++++++++++++++
 4 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 assets/chicken.png
 create mode 100644 assets/grass.png
 create mode 100644 comfy/examples/ecs_topdown_game.rs

diff --git a/Makefile b/Makefile
index 0fa17a8..ff8920b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,8 @@
 # EXAMPLE=particles
 # EXAMPLE=post_processing
 # EXAMPLE=shapes
-EXAMPLE=ecs_sprite
+# EXAMPLE=ecs_sprite
+EXAMPLE=ecs_topdown_game
 
 # default: build-examples
 # default: wasm-build
diff --git a/assets/chicken.png b/assets/chicken.png
new file mode 100644
index 0000000000000000000000000000000000000000..570a94aa586f67228a256ed762fc69a1e3bdddc6
GIT binary patch
literal 943
zcmV;g15o^lP)<h;3K|Lk000e1NJLTq00F=N000mO1^@s6fo!kn000AaNkl<Zc%1E;
zziy*I5XQ$Rq4ZasJHG;@%e&T99^i_TEElnq(hrd`Qkuw;3qOD>o*`A_SD;H?A)??4
z174QhWoG{X8_y>pjLmQ68w@)vHUNvoVzF2(7K_DVv2H`Nu??_TEEbEUQ*mCG_3I?v
zd+k}MV6Fz3kDDJ`W7RKmF6=FSXDn7NmvdRZ23=#wtTIpyB<X(UY9K~F_WE7@i@fXs
z<6Y*dn!@o{aW3qT=ZqYK8z^f?`5J!|92Dm@z~KnV^OrUTC4VPKabA~@XP1q|iflk<
zJ}Ta|{;`i=Apb%f^U0^rk82(-{!jB#W@}DZ>;0eRr7hd|S8&yPl$!@DUW_4X=myIC
zZSvm7pFF$9soqcSKWxXJPW~SqSXLbj0E*KbAkX>-?>xJ5G4i6u;3w)oN%#8wF!>G5
z9mV(fH^c=v92?$>t(uT=-@5r~IPvoke8n{lR9yERdsPhGHuKD5H~?@Tf9e?6=10um
zYJg3rU#!~Q6KSBO2zl4~$3A|c{WpX0;b@(|XNK$N_^D>DzklL+S^xf$5hu=)pF#uu
z?)+w%qHf}D(SNY<r~bU>+O^5wYJknox&#;l;*>Qq9sr!`cjc$<zd4CaGcd#q%Xl%l
z`ZvV1=BpTekAjl>kD1ngp7nqKj(kTB4VW_XjfwAT049F3Ov{(u=V<v|`9b`L9Dgt(
z<~RS2f(XDo^H?4hEBx<p0rC&Qn`T*q@v0jrL<7~b$QTrUvrNm^w{t5Nh6lJD2OEC-
z@D4A#Pi+kt9soejJ7oST`)|cjXo}ZwcLu1D)7>-k%vZA;+dKM6_;=WEC>{W=k9@?1
z!cyM1;8o2lIA3Y|^vn3UlFu{PKD@*0+j*wV8#2EuKcs(+V!3`B6_0nNxTZ?vZDPng
zHHOdpRMwRjYaSziXdV-D%KoR$7pHkCFD@)428Q1((^B^+Efl|5rl=ZpET;BQ`D60m
z#EJO&=|Hy4N8F|i=C(zL%5PJ@n9p}T)cu)fp2`=GcbCCWc<qD74932BN&`^lC)6Gy
ze~kW3+f(ATk3i*yL7k0=`zOy|vwE@NZR9&Y#g8hV&w6b37q@qRp3sBH6!|{Rv}PWm
z>L0V>Ht7+PhBrRC49H{u_@T{DmFN7?`3JxKV+@|fVzF2(7K_DVu~^?t{{i()ZNo|_
R;%oo_002ovPDHLkV1kD+*jfMp

literal 0
HcmV?d00001

diff --git a/assets/grass.png b/assets/grass.png
new file mode 100644
index 0000000000000000000000000000000000000000..610e4e8c4f4923a1ad3ddc95bcb8b3e235411eaf
GIT binary patch
literal 292
zcmV+<0o(qGP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0002%Nkl<Zc%1E+
z+Yy5x5JfTNBn_m2^k7w~D-9&=Bwv|f6xekIxtH~PBF^C12go!(AK&1ZOYa37$^Cj;
zjkyx=`n*?Tt^}lj5|Bz!?L6(fOQy34l3<On1dV`H1FHdz04q}FPz%tMg_Jqe0<2{b
zi=!4`B^C!GAeYXqy8j;-0l9S6r1>66Faq{ak~HKluqEO{?gBLrMbH9TH^30U1++T;
z#y|@=0xAJ5N`gv&R1%V))bsN~r1t`PGpqn@zZh14b_<0NP>Pm|zrj+pw2`!4sY3|Z
qLheJgqL%aM1k^qr(+Q}JdjUT`&p&-@1Vxzu0000<MNUMnLSTZkoOM$G

literal 0
HcmV?d00001

diff --git a/comfy/examples/ecs_topdown_game.rs b/comfy/examples/ecs_topdown_game.rs
new file mode 100644
index 0000000..3048b38
--- /dev/null
+++ b/comfy/examples/ecs_topdown_game.rs
@@ -0,0 +1,91 @@
+use comfy::*;
+
+example_game!("ECS Topdown Game", setup, update);
+
+struct Player;
+struct Grass;
+
+fn setup(c: &mut EngineContext) {
+    // Load the grass texture
+    c.load_texture_from_bytes(
+        "grass",
+        include_bytes!(concat!(
+            env!("CARGO_MANIFEST_DIR"),
+            "/../assets/grass.png"
+        )),
+        wgpu::AddressMode::ClampToEdge,
+    );
+
+    // Load the player texture
+    c.load_texture_from_bytes(
+        "player",
+        include_bytes!(concat!(
+            env!("CARGO_MANIFEST_DIR"),
+            "/../assets/chicken.png"
+        )),
+        wgpu::AddressMode::ClampToEdge,
+    );
+
+    for x in 0..30 {
+        for y in 0..30 {
+            let variant = random_i32(0, 2);
+            // Tile the world with random variant of grass sprite
+            c.commands().spawn((
+                Sprite::new("grass".to_string(), vec2(1.0, 1.0), 0, WHITE)
+                    .with_rect(32 * variant, 0, 32, 32),
+                Transform::position(vec2(x as f32, y as f32)),
+                Grass,
+            ));
+        }
+    }
+
+    // Spawn the player entity and make sure z-index is above the grass
+    c.commands().spawn((
+        Transform::position(vec2(10.0, 10.0)),
+        Player,
+        AnimatedSprite::spritesheet(
+            "player",
+            Spritesheet { rows: 1, columns: 28 },
+            0.1,
+            true,
+            10,
+            splat(1.0),
+            WHITE,
+            splat(0.0),
+            Box::new(|_| {}),
+        ),
+    ));
+}
+
+fn update(c: &mut EngineContext) {
+    let dt = c.delta;
+
+    for (entity, (player, animated_sprite, mut transform)) in c
+        .world()
+        .query::<(&Player, &mut AnimatedSprite, &mut Transform)>()
+        .iter()
+    {
+        // Handle movement and animation
+        let mut moved = false;
+        let speed = 1.0;
+
+        if is_key_down(KeyCode::W) {
+            transform.position.y += speed * dt;
+            moved = true;
+        }
+        if is_key_down(KeyCode::S) {
+            transform.position.y -= speed * dt;
+            moved = true;
+        }
+        if is_key_down(KeyCode::A) {
+            transform.position.x -= speed * dt;
+            moved = true;
+        }
+        if is_key_down(KeyCode::D) {
+            transform.position.x += speed * dt;
+            moved = true;
+        }
+
+        main_camera_mut().center = transform.position;
+    }
+}