summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBigBrotherNii <nicochr1004@gmail.com>2024-07-16 23:47:51 +0200
committerBigBrotherNii <nicochr1004@gmail.com>2024-07-16 23:47:51 +0200
commitcd679169f8e049b3f3ce890c97d62fa72a4e4eb5 (patch)
tree4efaf40f3c818d79be881f81b7d8fa254861731d
parent2f9e2758199ff5148d7f90478be45aa122d6c860 (diff)
parentdf418c0d3fec83fc1cbe0dabc6d4b9dfbdbcbabb (diff)
downloadhurrycurry-cd679169f8e049b3f3ce890c97d62fa72a4e4eb5.tar
hurrycurry-cd679169f8e049b3f3ce890c97d62fa72a4e4eb5.tar.bz2
hurrycurry-cd679169f8e049b3f3ce890c97d62fa72a4e4eb5.tar.zst
trying to merch qwq
-rw-r--r--Cargo.toml4
-rw-r--r--pixel-client/Cargo.toml (renamed from light-client/Cargo.toml)0
-rw-r--r--pixel-client/assets/.gitignore (renamed from light-client/assets/.gitignore)0
-rw-r--r--pixel-client/assets/connect.csv (renamed from light-client/assets/connect.csv)0
-rw-r--r--pixel-client/assets/items.ini (renamed from light-client/assets/items.ini)0
-rw-r--r--pixel-client/assets/misc.ini (renamed from light-client/assets/misc.ini)0
-rw-r--r--pixel-client/assets/palette.csv (renamed from light-client/assets/palette.csv)0
-rw-r--r--pixel-client/assets/textures/book.ta (renamed from light-client/assets/textures/book.ta)0
-rw-r--r--pixel-client/assets/textures/bread.ta (renamed from light-client/assets/textures/bread.ta)0
-rw-r--r--pixel-client/assets/textures/bread_slice.ta (renamed from light-client/assets/textures/bread_slice.ta)0
-rw-r--r--pixel-client/assets/textures/burned.ta (renamed from light-client/assets/textures/burned.ta)0
-rw-r--r--pixel-client/assets/textures/chair.ta (renamed from light-client/assets/textures/chair.ta)0
-rw-r--r--pixel-client/assets/textures/coconut.ta (renamed from light-client/assets/textures/coconut.ta)0
-rw-r--r--pixel-client/assets/textures/coconut_foodprocessor.ta (renamed from light-client/assets/textures/coconut_foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/coconut_strawberry_puree_foodprocessor.ta (renamed from light-client/assets/textures/coconut_strawberry_puree_foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/conveyor.ta (renamed from light-client/assets/textures/conveyor.ta)0
-rw-r--r--pixel-client/assets/textures/conveyor_arrow_left.ta (renamed from light-client/assets/textures/conveyor_arrow_left.ta)0
-rw-r--r--pixel-client/assets/textures/conveyor_arrow_up.ta (renamed from light-client/assets/textures/conveyor_arrow_up.ta)0
-rw-r--r--pixel-client/assets/textures/costumer.ta (renamed from light-client/assets/textures/costumer.ta)0
-rw-r--r--pixel-client/assets/textures/counter.ta (renamed from light-client/assets/textures/counter.ta)0
-rw-r--r--pixel-client/assets/textures/counter_window_ns_bottom.ta (renamed from light-client/assets/textures/counter_window_ns_bottom.ta)0
-rw-r--r--pixel-client/assets/textures/counter_window_ns_top.ta (renamed from light-client/assets/textures/counter_window_ns_top.ta)0
-rw-r--r--pixel-client/assets/textures/counter_window_we_bottom.ta (renamed from light-client/assets/textures/counter_window_we_bottom.ta)0
-rw-r--r--pixel-client/assets/textures/counter_window_we_top.ta (renamed from light-client/assets/textures/counter_window_we_top.ta)0
-rw-r--r--pixel-client/assets/textures/crate_back.ta (renamed from light-client/assets/textures/crate_back.ta)0
-rw-r--r--pixel-client/assets/textures/crate_front.ta (renamed from light-client/assets/textures/crate_front.ta)0
-rw-r--r--pixel-client/assets/textures/cutting_board.ta (renamed from light-client/assets/textures/cutting_board.ta)0
-rw-r--r--pixel-client/assets/textures/door_ns.ta (renamed from light-client/assets/textures/door_ns.ta)0
-rw-r--r--pixel-client/assets/textures/door_we.ta (renamed from light-client/assets/textures/door_we.ta)0
-rw-r--r--pixel-client/assets/textures/dough.ta (renamed from light-client/assets/textures/dough.ta)0
-rw-r--r--pixel-client/assets/textures/dough_foodprocessor.ta (renamed from light-client/assets/textures/dough_foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/fish.ta (renamed from light-client/assets/textures/fish.ta)0
-rw-r--r--pixel-client/assets/textures/fish_slice.ta (renamed from light-client/assets/textures/fish_slice.ta)0
-rw-r--r--pixel-client/assets/textures/floor.ta (renamed from light-client/assets/textures/floor.ta)0
-rw-r--r--pixel-client/assets/textures/flour.ta (renamed from light-client/assets/textures/flour.ta)0
-rw-r--r--pixel-client/assets/textures/flour_foodprocessor.ta (renamed from light-client/assets/textures/flour_foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/foodprocessor.ta (renamed from light-client/assets/textures/foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/freezer.ta (renamed from light-client/assets/textures/freezer.ta)0
-rw-r--r--pixel-client/assets/textures/glass.ta (renamed from light-client/assets/textures/glass.ta)0
-rw-r--r--pixel-client/assets/textures/grass.ta (renamed from light-client/assets/textures/grass.ta)0
-rw-r--r--pixel-client/assets/textures/interact_target_thick.ta (renamed from light-client/assets/textures/interact_target_thick.ta)0
-rw-r--r--pixel-client/assets/textures/interact_target_thin.ta (renamed from light-client/assets/textures/interact_target_thin.ta)0
-rw-r--r--pixel-client/assets/textures/leek.ta (renamed from light-client/assets/textures/leek.ta)0
-rw-r--r--pixel-client/assets/textures/leek_in_pot.ta (renamed from light-client/assets/textures/leek_in_pot.ta)0
-rw-r--r--pixel-client/assets/textures/milk_foodprocessor.ta (renamed from light-client/assets/textures/milk_foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/milk_strawberry_foodprocessor.ta (renamed from light-client/assets/textures/milk_strawberry_foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/mochi_dough.ta (renamed from light-client/assets/textures/mochi_dough.ta)0
-rw-r--r--pixel-client/assets/textures/nigiri_rice.ta (renamed from light-client/assets/textures/nigiri_rice.ta)0
-rw-r--r--pixel-client/assets/textures/oven.ta (renamed from light-client/assets/textures/oven.ta)0
-rw-r--r--pixel-client/assets/textures/particle.ta (renamed from light-client/assets/textures/particle.ta)0
-rw-r--r--pixel-client/assets/textures/path.ta (renamed from light-client/assets/textures/path.ta)0
-rw-r--r--pixel-client/assets/textures/plate.ta (renamed from light-client/assets/textures/plate.ta)0
-rw-r--r--pixel-client/assets/textures/plate_dirty.ta (renamed from light-client/assets/textures/plate_dirty.ta)0
-rw-r--r--pixel-client/assets/textures/player.ta (renamed from light-client/assets/textures/player.ta)0
-rw-r--r--pixel-client/assets/textures/pot_back.ta (renamed from light-client/assets/textures/pot_back.ta)0
-rw-r--r--pixel-client/assets/textures/pot_front.ta (renamed from light-client/assets/textures/pot_front.ta)0
-rw-r--r--pixel-client/assets/textures/rice.ta (renamed from light-client/assets/textures/rice.ta)0
-rw-r--r--pixel-client/assets/textures/rice_cooked_in_pot.ta (renamed from light-client/assets/textures/rice_cooked_in_pot.ta)0
-rw-r--r--pixel-client/assets/textures/rice_flour.ta (renamed from light-client/assets/textures/rice_flour.ta)0
-rw-r--r--pixel-client/assets/textures/rice_flour_foodprocessor.ta (renamed from light-client/assets/textures/rice_flour_foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/rice_foodprocessor.ta (renamed from light-client/assets/textures/rice_foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/rice_in_pot.ta (renamed from light-client/assets/textures/rice_in_pot.ta)0
-rw-r--r--pixel-client/assets/textures/sink.ta (renamed from light-client/assets/textures/sink.ta)0
-rw-r--r--pixel-client/assets/textures/solid.ta (renamed from light-client/assets/textures/solid.ta)0
-rw-r--r--pixel-client/assets/textures/steak.ta (renamed from light-client/assets/textures/steak.ta)0
-rw-r--r--pixel-client/assets/textures/steak_in_pot.ta (renamed from light-client/assets/textures/steak_in_pot.ta)0
-rw-r--r--pixel-client/assets/textures/steak_raw.ta (renamed from light-client/assets/textures/steak_raw.ta)0
-rw-r--r--pixel-client/assets/textures/steak_raw_in_pot.ta (renamed from light-client/assets/textures/steak_raw_in_pot.ta)0
-rw-r--r--pixel-client/assets/textures/stove.ta (renamed from light-client/assets/textures/stove.ta)0
-rw-r--r--pixel-client/assets/textures/strawberry.ta (renamed from light-client/assets/textures/strawberry.ta)0
-rw-r--r--pixel-client/assets/textures/strawberry_foodprocessor.ta (renamed from light-client/assets/textures/strawberry_foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/strawberry_icecream.ta (renamed from light-client/assets/textures/strawberry_icecream.ta)0
-rw-r--r--pixel-client/assets/textures/strawberry_icecream_foodprocessor.ta (renamed from light-client/assets/textures/strawberry_icecream_foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/strawberry_mochi.ta (renamed from light-client/assets/textures/strawberry_mochi.ta)0
-rw-r--r--pixel-client/assets/textures/strawberry_puree_foodprocessor.ta (renamed from light-client/assets/textures/strawberry_puree_foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/strawberry_shake_foodprocessor.ta (renamed from light-client/assets/textures/strawberry_shake_foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/strawberry_shake_glass.ta (renamed from light-client/assets/textures/strawberry_shake_glass.ta)0
-rw-r--r--pixel-client/assets/textures/table.ta (renamed from light-client/assets/textures/table.ta)0
-rw-r--r--pixel-client/assets/textures/tomato.ta (renamed from light-client/assets/textures/tomato.ta)0
-rw-r--r--pixel-client/assets/textures/tomato_foodprocessor.ta (renamed from light-client/assets/textures/tomato_foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/tomato_juice_foodprocessor.ta (renamed from light-client/assets/textures/tomato_juice_foodprocessor.ta)0
-rw-r--r--pixel-client/assets/textures/tomato_juice_in_pot.ta (renamed from light-client/assets/textures/tomato_juice_in_pot.ta)0
-rw-r--r--pixel-client/assets/textures/tomato_slice.ta (renamed from light-client/assets/textures/tomato_slice.ta)0
-rw-r--r--pixel-client/assets/textures/tomato_soup.ta (renamed from light-client/assets/textures/tomato_soup.ta)0
-rw-r--r--pixel-client/assets/textures/tomato_soup_in_pot.ta (renamed from light-client/assets/textures/tomato_soup_in_pot.ta)0
-rw-r--r--pixel-client/assets/textures/trash.ta (renamed from light-client/assets/textures/trash.ta)0
-rw-r--r--pixel-client/assets/textures/tree.ta (renamed from light-client/assets/textures/tree.ta)0
-rw-r--r--pixel-client/assets/textures/wall_ns.ta (renamed from light-client/assets/textures/wall_ns.ta)0
-rw-r--r--pixel-client/assets/textures/wall_we.ta (renamed from light-client/assets/textures/wall_we.ta)0
-rw-r--r--pixel-client/assets/textures/wall_wen.ta (renamed from light-client/assets/textures/wall_wen.ta)0
-rw-r--r--pixel-client/assets/textures/wall_wens.ta (renamed from light-client/assets/textures/wall_wens.ta)0
-rw-r--r--pixel-client/assets/textures/wall_wes.ta (renamed from light-client/assets/textures/wall_wes.ta)0
-rw-r--r--pixel-client/assets/textures/wall_wn.ta (renamed from light-client/assets/textures/wall_wn.ta)0
-rw-r--r--pixel-client/assets/textures/wall_wns.ta (renamed from light-client/assets/textures/wall_wns.ta)0
-rw-r--r--pixel-client/assets/textures/wall_ws.ta (renamed from light-client/assets/textures/wall_ws.ta)0
-rw-r--r--pixel-client/assets/textures/water_glass.ta (renamed from light-client/assets/textures/water_glass.ta)0
-rw-r--r--pixel-client/assets/textures/window.ta (renamed from light-client/assets/textures/window.ta)0
-rw-r--r--pixel-client/assets/tiles.ini (renamed from light-client/assets/tiles.ini)0
-rw-r--r--pixel-client/makefile (renamed from light-client/makefile)0
-rw-r--r--pixel-client/src/game.rs (renamed from light-client/src/game.rs)26
-rw-r--r--pixel-client/src/helper.rs11
-rw-r--r--pixel-client/src/main.rs (renamed from light-client/src/main.rs)8
-rw-r--r--pixel-client/src/network.rs (renamed from light-client/src/network.rs)0
-rw-r--r--pixel-client/src/render/misc.rs (renamed from light-client/src/render/misc.rs)0
-rw-r--r--pixel-client/src/render/mod.rs (renamed from light-client/src/render/mod.rs)20
-rw-r--r--pixel-client/src/render/sprite.rs (renamed from light-client/src/render/sprite.rs)0
-rw-r--r--pixel-client/src/tilemap.rs (renamed from light-client/src/tilemap.rs)0
-rw-r--r--pixel-client/tools/Cargo.toml (renamed from light-client/tools/Cargo.toml)0
-rw-r--r--pixel-client/tools/src/bin/bunnymark.rs (renamed from light-client/tools/src/bin/bunnymark.rs)0
-rw-r--r--pixel-client/tools/src/bin/tex_compose.rs (renamed from light-client/tools/src/bin/tex_compose.rs)0
-rw-r--r--pixel-client/tools/src/bin/tex_export.rs (renamed from light-client/tools/src/bin/tex_export.rs)0
-rw-r--r--pixel-client/tools/src/bin/tex_import.rs (renamed from light-client/tools/src/bin/tex_import.rs)0
-rw-r--r--pixel-client/tools/src/bin/tex_pack.rs (renamed from light-client/tools/src/bin/tex_pack.rs)0
-rw-r--r--pixel-client/tools/src/lib.rs (renamed from light-client/tools/src/lib.rs)0
114 files changed, 52 insertions, 17 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 2b0d4d60..3677580e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ members = [
"server/replaytool",
"server",
"server/protocol",
- "light-client",
- "light-client/tools",
+ "pixel-client",
+ "pixel-client/tools",
]
resolver = "2"
diff --git a/light-client/Cargo.toml b/pixel-client/Cargo.toml
index d7cb336c..d7cb336c 100644
--- a/light-client/Cargo.toml
+++ b/pixel-client/Cargo.toml
diff --git a/light-client/assets/.gitignore b/pixel-client/assets/.gitignore
index 89bda45f..89bda45f 100644
--- a/light-client/assets/.gitignore
+++ b/pixel-client/assets/.gitignore
diff --git a/light-client/assets/connect.csv b/pixel-client/assets/connect.csv
index 9278f64c..9278f64c 100644
--- a/light-client/assets/connect.csv
+++ b/pixel-client/assets/connect.csv
diff --git a/light-client/assets/items.ini b/pixel-client/assets/items.ini
index 7fcff029..7fcff029 100644
--- a/light-client/assets/items.ini
+++ b/pixel-client/assets/items.ini
diff --git a/light-client/assets/misc.ini b/pixel-client/assets/misc.ini
index e1c118d9..e1c118d9 100644
--- a/light-client/assets/misc.ini
+++ b/pixel-client/assets/misc.ini
diff --git a/light-client/assets/palette.csv b/pixel-client/assets/palette.csv
index 87376994..87376994 100644
--- a/light-client/assets/palette.csv
+++ b/pixel-client/assets/palette.csv
diff --git a/light-client/assets/textures/book.ta b/pixel-client/assets/textures/book.ta
index b9ca1ad6..b9ca1ad6 100644
--- a/light-client/assets/textures/book.ta
+++ b/pixel-client/assets/textures/book.ta
diff --git a/light-client/assets/textures/bread.ta b/pixel-client/assets/textures/bread.ta
index 5f4c8b85..5f4c8b85 100644
--- a/light-client/assets/textures/bread.ta
+++ b/pixel-client/assets/textures/bread.ta
diff --git a/light-client/assets/textures/bread_slice.ta b/pixel-client/assets/textures/bread_slice.ta
index 658b2d36..658b2d36 100644
--- a/light-client/assets/textures/bread_slice.ta
+++ b/pixel-client/assets/textures/bread_slice.ta
diff --git a/light-client/assets/textures/burned.ta b/pixel-client/assets/textures/burned.ta
index fa13c7cb..fa13c7cb 100644
--- a/light-client/assets/textures/burned.ta
+++ b/pixel-client/assets/textures/burned.ta
diff --git a/light-client/assets/textures/chair.ta b/pixel-client/assets/textures/chair.ta
index f739e389..f739e389 100644
--- a/light-client/assets/textures/chair.ta
+++ b/pixel-client/assets/textures/chair.ta
diff --git a/light-client/assets/textures/coconut.ta b/pixel-client/assets/textures/coconut.ta
index 78d1d10d..78d1d10d 100644
--- a/light-client/assets/textures/coconut.ta
+++ b/pixel-client/assets/textures/coconut.ta
diff --git a/light-client/assets/textures/coconut_foodprocessor.ta b/pixel-client/assets/textures/coconut_foodprocessor.ta
index 2d52ec49..2d52ec49 100644
--- a/light-client/assets/textures/coconut_foodprocessor.ta
+++ b/pixel-client/assets/textures/coconut_foodprocessor.ta
diff --git a/light-client/assets/textures/coconut_strawberry_puree_foodprocessor.ta b/pixel-client/assets/textures/coconut_strawberry_puree_foodprocessor.ta
index e2d9f4c8..e2d9f4c8 100644
--- a/light-client/assets/textures/coconut_strawberry_puree_foodprocessor.ta
+++ b/pixel-client/assets/textures/coconut_strawberry_puree_foodprocessor.ta
diff --git a/light-client/assets/textures/conveyor.ta b/pixel-client/assets/textures/conveyor.ta
index 453e2048..453e2048 100644
--- a/light-client/assets/textures/conveyor.ta
+++ b/pixel-client/assets/textures/conveyor.ta
diff --git a/light-client/assets/textures/conveyor_arrow_left.ta b/pixel-client/assets/textures/conveyor_arrow_left.ta
index ab03864b..ab03864b 100644
--- a/light-client/assets/textures/conveyor_arrow_left.ta
+++ b/pixel-client/assets/textures/conveyor_arrow_left.ta
diff --git a/light-client/assets/textures/conveyor_arrow_up.ta b/pixel-client/assets/textures/conveyor_arrow_up.ta
index 8f51d6c9..8f51d6c9 100644
--- a/light-client/assets/textures/conveyor_arrow_up.ta
+++ b/pixel-client/assets/textures/conveyor_arrow_up.ta
diff --git a/light-client/assets/textures/costumer.ta b/pixel-client/assets/textures/costumer.ta
index 602b0b21..602b0b21 100644
--- a/light-client/assets/textures/costumer.ta
+++ b/pixel-client/assets/textures/costumer.ta
diff --git a/light-client/assets/textures/counter.ta b/pixel-client/assets/textures/counter.ta
index 846fdbe3..846fdbe3 100644
--- a/light-client/assets/textures/counter.ta
+++ b/pixel-client/assets/textures/counter.ta
diff --git a/light-client/assets/textures/counter_window_ns_bottom.ta b/pixel-client/assets/textures/counter_window_ns_bottom.ta
index 30db9f28..30db9f28 100644
--- a/light-client/assets/textures/counter_window_ns_bottom.ta
+++ b/pixel-client/assets/textures/counter_window_ns_bottom.ta
diff --git a/light-client/assets/textures/counter_window_ns_top.ta b/pixel-client/assets/textures/counter_window_ns_top.ta
index 8ac68858..8ac68858 100644
--- a/light-client/assets/textures/counter_window_ns_top.ta
+++ b/pixel-client/assets/textures/counter_window_ns_top.ta
diff --git a/light-client/assets/textures/counter_window_we_bottom.ta b/pixel-client/assets/textures/counter_window_we_bottom.ta
index 8cce3e6a..8cce3e6a 100644
--- a/light-client/assets/textures/counter_window_we_bottom.ta
+++ b/pixel-client/assets/textures/counter_window_we_bottom.ta
diff --git a/light-client/assets/textures/counter_window_we_top.ta b/pixel-client/assets/textures/counter_window_we_top.ta
index b7113a01..b7113a01 100644
--- a/light-client/assets/textures/counter_window_we_top.ta
+++ b/pixel-client/assets/textures/counter_window_we_top.ta
diff --git a/light-client/assets/textures/crate_back.ta b/pixel-client/assets/textures/crate_back.ta
index 3ef0ce14..3ef0ce14 100644
--- a/light-client/assets/textures/crate_back.ta
+++ b/pixel-client/assets/textures/crate_back.ta
diff --git a/light-client/assets/textures/crate_front.ta b/pixel-client/assets/textures/crate_front.ta
index caeafdb9..caeafdb9 100644
--- a/light-client/assets/textures/crate_front.ta
+++ b/pixel-client/assets/textures/crate_front.ta
diff --git a/light-client/assets/textures/cutting_board.ta b/pixel-client/assets/textures/cutting_board.ta
index e6137c94..e6137c94 100644
--- a/light-client/assets/textures/cutting_board.ta
+++ b/pixel-client/assets/textures/cutting_board.ta
diff --git a/light-client/assets/textures/door_ns.ta b/pixel-client/assets/textures/door_ns.ta
index 8c9270f6..8c9270f6 100644
--- a/light-client/assets/textures/door_ns.ta
+++ b/pixel-client/assets/textures/door_ns.ta
diff --git a/light-client/assets/textures/door_we.ta b/pixel-client/assets/textures/door_we.ta
index d8ccf839..d8ccf839 100644
--- a/light-client/assets/textures/door_we.ta
+++ b/pixel-client/assets/textures/door_we.ta
diff --git a/light-client/assets/textures/dough.ta b/pixel-client/assets/textures/dough.ta
index 157aaaf9..157aaaf9 100644
--- a/light-client/assets/textures/dough.ta
+++ b/pixel-client/assets/textures/dough.ta
diff --git a/light-client/assets/textures/dough_foodprocessor.ta b/pixel-client/assets/textures/dough_foodprocessor.ta
index df2b08fa..df2b08fa 100644
--- a/light-client/assets/textures/dough_foodprocessor.ta
+++ b/pixel-client/assets/textures/dough_foodprocessor.ta
diff --git a/light-client/assets/textures/fish.ta b/pixel-client/assets/textures/fish.ta
index c1f8f151..c1f8f151 100644
--- a/light-client/assets/textures/fish.ta
+++ b/pixel-client/assets/textures/fish.ta
diff --git a/light-client/assets/textures/fish_slice.ta b/pixel-client/assets/textures/fish_slice.ta
index efecbc73..efecbc73 100644
--- a/light-client/assets/textures/fish_slice.ta
+++ b/pixel-client/assets/textures/fish_slice.ta
diff --git a/light-client/assets/textures/floor.ta b/pixel-client/assets/textures/floor.ta
index ed84d15b..ed84d15b 100644
--- a/light-client/assets/textures/floor.ta
+++ b/pixel-client/assets/textures/floor.ta
diff --git a/light-client/assets/textures/flour.ta b/pixel-client/assets/textures/flour.ta
index 94ca56e5..94ca56e5 100644
--- a/light-client/assets/textures/flour.ta
+++ b/pixel-client/assets/textures/flour.ta
diff --git a/light-client/assets/textures/flour_foodprocessor.ta b/pixel-client/assets/textures/flour_foodprocessor.ta
index af9a7c93..af9a7c93 100644
--- a/light-client/assets/textures/flour_foodprocessor.ta
+++ b/pixel-client/assets/textures/flour_foodprocessor.ta
diff --git a/light-client/assets/textures/foodprocessor.ta b/pixel-client/assets/textures/foodprocessor.ta
index ef6fa194..ef6fa194 100644
--- a/light-client/assets/textures/foodprocessor.ta
+++ b/pixel-client/assets/textures/foodprocessor.ta
diff --git a/light-client/assets/textures/freezer.ta b/pixel-client/assets/textures/freezer.ta
index 94c66e46..94c66e46 100644
--- a/light-client/assets/textures/freezer.ta
+++ b/pixel-client/assets/textures/freezer.ta
diff --git a/light-client/assets/textures/glass.ta b/pixel-client/assets/textures/glass.ta
index 10306095..10306095 100644
--- a/light-client/assets/textures/glass.ta
+++ b/pixel-client/assets/textures/glass.ta
diff --git a/light-client/assets/textures/grass.ta b/pixel-client/assets/textures/grass.ta
index 359904f9..359904f9 100644
--- a/light-client/assets/textures/grass.ta
+++ b/pixel-client/assets/textures/grass.ta
diff --git a/light-client/assets/textures/interact_target_thick.ta b/pixel-client/assets/textures/interact_target_thick.ta
index 3ece0dfa..3ece0dfa 100644
--- a/light-client/assets/textures/interact_target_thick.ta
+++ b/pixel-client/assets/textures/interact_target_thick.ta
diff --git a/light-client/assets/textures/interact_target_thin.ta b/pixel-client/assets/textures/interact_target_thin.ta
index b0cbc90d..b0cbc90d 100644
--- a/light-client/assets/textures/interact_target_thin.ta
+++ b/pixel-client/assets/textures/interact_target_thin.ta
diff --git a/light-client/assets/textures/leek.ta b/pixel-client/assets/textures/leek.ta
index d77c9c15..d77c9c15 100644
--- a/light-client/assets/textures/leek.ta
+++ b/pixel-client/assets/textures/leek.ta
diff --git a/light-client/assets/textures/leek_in_pot.ta b/pixel-client/assets/textures/leek_in_pot.ta
index 301222f0..301222f0 100644
--- a/light-client/assets/textures/leek_in_pot.ta
+++ b/pixel-client/assets/textures/leek_in_pot.ta
diff --git a/light-client/assets/textures/milk_foodprocessor.ta b/pixel-client/assets/textures/milk_foodprocessor.ta
index 4697ffd7..4697ffd7 100644
--- a/light-client/assets/textures/milk_foodprocessor.ta
+++ b/pixel-client/assets/textures/milk_foodprocessor.ta
diff --git a/light-client/assets/textures/milk_strawberry_foodprocessor.ta b/pixel-client/assets/textures/milk_strawberry_foodprocessor.ta
index b978a59c..b978a59c 100644
--- a/light-client/assets/textures/milk_strawberry_foodprocessor.ta
+++ b/pixel-client/assets/textures/milk_strawberry_foodprocessor.ta
diff --git a/light-client/assets/textures/mochi_dough.ta b/pixel-client/assets/textures/mochi_dough.ta
index 55b6b016..55b6b016 100644
--- a/light-client/assets/textures/mochi_dough.ta
+++ b/pixel-client/assets/textures/mochi_dough.ta
diff --git a/light-client/assets/textures/nigiri_rice.ta b/pixel-client/assets/textures/nigiri_rice.ta
index 5613626d..5613626d 100644
--- a/light-client/assets/textures/nigiri_rice.ta
+++ b/pixel-client/assets/textures/nigiri_rice.ta
diff --git a/light-client/assets/textures/oven.ta b/pixel-client/assets/textures/oven.ta
index 96e3d2a0..96e3d2a0 100644
--- a/light-client/assets/textures/oven.ta
+++ b/pixel-client/assets/textures/oven.ta
diff --git a/light-client/assets/textures/particle.ta b/pixel-client/assets/textures/particle.ta
index 0ad4d2e5..0ad4d2e5 100644
--- a/light-client/assets/textures/particle.ta
+++ b/pixel-client/assets/textures/particle.ta
diff --git a/light-client/assets/textures/path.ta b/pixel-client/assets/textures/path.ta
index 30f94645..30f94645 100644
--- a/light-client/assets/textures/path.ta
+++ b/pixel-client/assets/textures/path.ta
diff --git a/light-client/assets/textures/plate.ta b/pixel-client/assets/textures/plate.ta
index 15d66e0c..15d66e0c 100644
--- a/light-client/assets/textures/plate.ta
+++ b/pixel-client/assets/textures/plate.ta
diff --git a/light-client/assets/textures/plate_dirty.ta b/pixel-client/assets/textures/plate_dirty.ta
index 50781b21..50781b21 100644
--- a/light-client/assets/textures/plate_dirty.ta
+++ b/pixel-client/assets/textures/plate_dirty.ta
diff --git a/light-client/assets/textures/player.ta b/pixel-client/assets/textures/player.ta
index 065a3255..065a3255 100644
--- a/light-client/assets/textures/player.ta
+++ b/pixel-client/assets/textures/player.ta
diff --git a/light-client/assets/textures/pot_back.ta b/pixel-client/assets/textures/pot_back.ta
index 85456a40..85456a40 100644
--- a/light-client/assets/textures/pot_back.ta
+++ b/pixel-client/assets/textures/pot_back.ta
diff --git a/light-client/assets/textures/pot_front.ta b/pixel-client/assets/textures/pot_front.ta
index ccfdf15e..ccfdf15e 100644
--- a/light-client/assets/textures/pot_front.ta
+++ b/pixel-client/assets/textures/pot_front.ta
diff --git a/light-client/assets/textures/rice.ta b/pixel-client/assets/textures/rice.ta
index 8b2e6c14..8b2e6c14 100644
--- a/light-client/assets/textures/rice.ta
+++ b/pixel-client/assets/textures/rice.ta
diff --git a/light-client/assets/textures/rice_cooked_in_pot.ta b/pixel-client/assets/textures/rice_cooked_in_pot.ta
index 56b32a2b..56b32a2b 100644
--- a/light-client/assets/textures/rice_cooked_in_pot.ta
+++ b/pixel-client/assets/textures/rice_cooked_in_pot.ta
diff --git a/light-client/assets/textures/rice_flour.ta b/pixel-client/assets/textures/rice_flour.ta
index 82ab2133..82ab2133 100644
--- a/light-client/assets/textures/rice_flour.ta
+++ b/pixel-client/assets/textures/rice_flour.ta
diff --git a/light-client/assets/textures/rice_flour_foodprocessor.ta b/pixel-client/assets/textures/rice_flour_foodprocessor.ta
index 06017d8c..06017d8c 100644
--- a/light-client/assets/textures/rice_flour_foodprocessor.ta
+++ b/pixel-client/assets/textures/rice_flour_foodprocessor.ta
diff --git a/light-client/assets/textures/rice_foodprocessor.ta b/pixel-client/assets/textures/rice_foodprocessor.ta
index 58d79651..58d79651 100644
--- a/light-client/assets/textures/rice_foodprocessor.ta
+++ b/pixel-client/assets/textures/rice_foodprocessor.ta
diff --git a/light-client/assets/textures/rice_in_pot.ta b/pixel-client/assets/textures/rice_in_pot.ta
index e9f3221c..e9f3221c 100644
--- a/light-client/assets/textures/rice_in_pot.ta
+++ b/pixel-client/assets/textures/rice_in_pot.ta
diff --git a/light-client/assets/textures/sink.ta b/pixel-client/assets/textures/sink.ta
index e76c2af7..e76c2af7 100644
--- a/light-client/assets/textures/sink.ta
+++ b/pixel-client/assets/textures/sink.ta
diff --git a/light-client/assets/textures/solid.ta b/pixel-client/assets/textures/solid.ta
index 78981922..78981922 100644
--- a/light-client/assets/textures/solid.ta
+++ b/pixel-client/assets/textures/solid.ta
diff --git a/light-client/assets/textures/steak.ta b/pixel-client/assets/textures/steak.ta
index 23f31da7..23f31da7 100644
--- a/light-client/assets/textures/steak.ta
+++ b/pixel-client/assets/textures/steak.ta
diff --git a/light-client/assets/textures/steak_in_pot.ta b/pixel-client/assets/textures/steak_in_pot.ta
index 4aec1c5a..4aec1c5a 100644
--- a/light-client/assets/textures/steak_in_pot.ta
+++ b/pixel-client/assets/textures/steak_in_pot.ta
diff --git a/light-client/assets/textures/steak_raw.ta b/pixel-client/assets/textures/steak_raw.ta
index a0bfb0da..a0bfb0da 100644
--- a/light-client/assets/textures/steak_raw.ta
+++ b/pixel-client/assets/textures/steak_raw.ta
diff --git a/light-client/assets/textures/steak_raw_in_pot.ta b/pixel-client/assets/textures/steak_raw_in_pot.ta
index 2eb5c53b..2eb5c53b 100644
--- a/light-client/assets/textures/steak_raw_in_pot.ta
+++ b/pixel-client/assets/textures/steak_raw_in_pot.ta
diff --git a/light-client/assets/textures/stove.ta b/pixel-client/assets/textures/stove.ta
index f5010163..f5010163 100644
--- a/light-client/assets/textures/stove.ta
+++ b/pixel-client/assets/textures/stove.ta
diff --git a/light-client/assets/textures/strawberry.ta b/pixel-client/assets/textures/strawberry.ta
index 8c3e0282..8c3e0282 100644
--- a/light-client/assets/textures/strawberry.ta
+++ b/pixel-client/assets/textures/strawberry.ta
diff --git a/light-client/assets/textures/strawberry_foodprocessor.ta b/pixel-client/assets/textures/strawberry_foodprocessor.ta
index 419b0b68..419b0b68 100644
--- a/light-client/assets/textures/strawberry_foodprocessor.ta
+++ b/pixel-client/assets/textures/strawberry_foodprocessor.ta
diff --git a/light-client/assets/textures/strawberry_icecream.ta b/pixel-client/assets/textures/strawberry_icecream.ta
index d80366c3..d80366c3 100644
--- a/light-client/assets/textures/strawberry_icecream.ta
+++ b/pixel-client/assets/textures/strawberry_icecream.ta
diff --git a/light-client/assets/textures/strawberry_icecream_foodprocessor.ta b/pixel-client/assets/textures/strawberry_icecream_foodprocessor.ta
index af545930..af545930 100644
--- a/light-client/assets/textures/strawberry_icecream_foodprocessor.ta
+++ b/pixel-client/assets/textures/strawberry_icecream_foodprocessor.ta
diff --git a/light-client/assets/textures/strawberry_mochi.ta b/pixel-client/assets/textures/strawberry_mochi.ta
index 3dcd079e..3dcd079e 100644
--- a/light-client/assets/textures/strawberry_mochi.ta
+++ b/pixel-client/assets/textures/strawberry_mochi.ta
diff --git a/light-client/assets/textures/strawberry_puree_foodprocessor.ta b/pixel-client/assets/textures/strawberry_puree_foodprocessor.ta
index 8be6eb23..8be6eb23 100644
--- a/light-client/assets/textures/strawberry_puree_foodprocessor.ta
+++ b/pixel-client/assets/textures/strawberry_puree_foodprocessor.ta
diff --git a/light-client/assets/textures/strawberry_shake_foodprocessor.ta b/pixel-client/assets/textures/strawberry_shake_foodprocessor.ta
index bea21e2c..bea21e2c 100644
--- a/light-client/assets/textures/strawberry_shake_foodprocessor.ta
+++ b/pixel-client/assets/textures/strawberry_shake_foodprocessor.ta
diff --git a/light-client/assets/textures/strawberry_shake_glass.ta b/pixel-client/assets/textures/strawberry_shake_glass.ta
index 51e32705..51e32705 100644
--- a/light-client/assets/textures/strawberry_shake_glass.ta
+++ b/pixel-client/assets/textures/strawberry_shake_glass.ta
diff --git a/light-client/assets/textures/table.ta b/pixel-client/assets/textures/table.ta
index ea05c05e..ea05c05e 100644
--- a/light-client/assets/textures/table.ta
+++ b/pixel-client/assets/textures/table.ta
diff --git a/light-client/assets/textures/tomato.ta b/pixel-client/assets/textures/tomato.ta
index b6f087d9..b6f087d9 100644
--- a/light-client/assets/textures/tomato.ta
+++ b/pixel-client/assets/textures/tomato.ta
diff --git a/light-client/assets/textures/tomato_foodprocessor.ta b/pixel-client/assets/textures/tomato_foodprocessor.ta
index 8b2719de..8b2719de 100644
--- a/light-client/assets/textures/tomato_foodprocessor.ta
+++ b/pixel-client/assets/textures/tomato_foodprocessor.ta
diff --git a/light-client/assets/textures/tomato_juice_foodprocessor.ta b/pixel-client/assets/textures/tomato_juice_foodprocessor.ta
index 9c0313f8..9c0313f8 100644
--- a/light-client/assets/textures/tomato_juice_foodprocessor.ta
+++ b/pixel-client/assets/textures/tomato_juice_foodprocessor.ta
diff --git a/light-client/assets/textures/tomato_juice_in_pot.ta b/pixel-client/assets/textures/tomato_juice_in_pot.ta
index c8276921..c8276921 100644
--- a/light-client/assets/textures/tomato_juice_in_pot.ta
+++ b/pixel-client/assets/textures/tomato_juice_in_pot.ta
diff --git a/light-client/assets/textures/tomato_slice.ta b/pixel-client/assets/textures/tomato_slice.ta
index 77d257f8..77d257f8 100644
--- a/light-client/assets/textures/tomato_slice.ta
+++ b/pixel-client/assets/textures/tomato_slice.ta
diff --git a/light-client/assets/textures/tomato_soup.ta b/pixel-client/assets/textures/tomato_soup.ta
index 36be679e..36be679e 100644
--- a/light-client/assets/textures/tomato_soup.ta
+++ b/pixel-client/assets/textures/tomato_soup.ta
diff --git a/light-client/assets/textures/tomato_soup_in_pot.ta b/pixel-client/assets/textures/tomato_soup_in_pot.ta
index da39044d..da39044d 100644
--- a/light-client/assets/textures/tomato_soup_in_pot.ta
+++ b/pixel-client/assets/textures/tomato_soup_in_pot.ta
diff --git a/light-client/assets/textures/trash.ta b/pixel-client/assets/textures/trash.ta
index 41d05300..41d05300 100644
--- a/light-client/assets/textures/trash.ta
+++ b/pixel-client/assets/textures/trash.ta
diff --git a/light-client/assets/textures/tree.ta b/pixel-client/assets/textures/tree.ta
index 2d5bee16..2d5bee16 100644
--- a/light-client/assets/textures/tree.ta
+++ b/pixel-client/assets/textures/tree.ta
diff --git a/light-client/assets/textures/wall_ns.ta b/pixel-client/assets/textures/wall_ns.ta
index c381c712..c381c712 100644
--- a/light-client/assets/textures/wall_ns.ta
+++ b/pixel-client/assets/textures/wall_ns.ta
diff --git a/light-client/assets/textures/wall_we.ta b/pixel-client/assets/textures/wall_we.ta
index bc5aec79..bc5aec79 100644
--- a/light-client/assets/textures/wall_we.ta
+++ b/pixel-client/assets/textures/wall_we.ta
diff --git a/light-client/assets/textures/wall_wen.ta b/pixel-client/assets/textures/wall_wen.ta
index a53f4b99..a53f4b99 100644
--- a/light-client/assets/textures/wall_wen.ta
+++ b/pixel-client/assets/textures/wall_wen.ta
diff --git a/light-client/assets/textures/wall_wens.ta b/pixel-client/assets/textures/wall_wens.ta
index 54d6c397..54d6c397 100644
--- a/light-client/assets/textures/wall_wens.ta
+++ b/pixel-client/assets/textures/wall_wens.ta
diff --git a/light-client/assets/textures/wall_wes.ta b/pixel-client/assets/textures/wall_wes.ta
index 78232ee1..78232ee1 100644
--- a/light-client/assets/textures/wall_wes.ta
+++ b/pixel-client/assets/textures/wall_wes.ta
diff --git a/light-client/assets/textures/wall_wn.ta b/pixel-client/assets/textures/wall_wn.ta
index 274a6172..274a6172 100644
--- a/light-client/assets/textures/wall_wn.ta
+++ b/pixel-client/assets/textures/wall_wn.ta
diff --git a/light-client/assets/textures/wall_wns.ta b/pixel-client/assets/textures/wall_wns.ta
index de0134f2..de0134f2 100644
--- a/light-client/assets/textures/wall_wns.ta
+++ b/pixel-client/assets/textures/wall_wns.ta
diff --git a/light-client/assets/textures/wall_ws.ta b/pixel-client/assets/textures/wall_ws.ta
index bbdd75cd..bbdd75cd 100644
--- a/light-client/assets/textures/wall_ws.ta
+++ b/pixel-client/assets/textures/wall_ws.ta
diff --git a/light-client/assets/textures/water_glass.ta b/pixel-client/assets/textures/water_glass.ta
index fcdff0f2..fcdff0f2 100644
--- a/light-client/assets/textures/water_glass.ta
+++ b/pixel-client/assets/textures/water_glass.ta
diff --git a/light-client/assets/textures/window.ta b/pixel-client/assets/textures/window.ta
index 9056295c..9056295c 100644
--- a/light-client/assets/textures/window.ta
+++ b/pixel-client/assets/textures/window.ta
diff --git a/light-client/assets/tiles.ini b/pixel-client/assets/tiles.ini
index c5cd50b3..c5cd50b3 100644
--- a/light-client/assets/tiles.ini
+++ b/pixel-client/assets/tiles.ini
diff --git a/light-client/makefile b/pixel-client/makefile
index 6a56fc62..6a56fc62 100644
--- a/light-client/makefile
+++ b/pixel-client/makefile
diff --git a/light-client/src/game.rs b/pixel-client/src/game.rs
index 13e50a2e..7d8e466a 100644
--- a/light-client/src/game.rs
+++ b/pixel-client/src/game.rs
@@ -16,6 +16,7 @@
*/
use crate::{
+ helper::Vec2InterpolateExt,
render::{
misc::MiscTextures,
sprite::{Sprite, SpriteDraw},
@@ -43,6 +44,7 @@ pub struct Game {
players: HashMap<PlayerID, Player>,
my_id: PlayerID,
+ camera_center: Vec2,
misc_textures: MiscTextures,
item_sprites: Vec<Sprite>,
movement_send_cooldown: f32,
@@ -90,6 +92,7 @@ impl Game {
item_sprites: Vec::new(),
interacting: false,
score: Score::default(),
+ camera_center: Vec2::ZERO,
}
}
@@ -273,17 +276,18 @@ impl Game {
self.interacting = interact;
}
- for (pid, player) in &mut self.players {
- if *pid == self.my_id {
- let movement_packet =
- player
- .movement
- .update(&self.collision_map, direction, boost, dt);
-
- if send_movement {
- packet_out.push_back(movement_packet);
- }
+ if let Some(player) = self.players.get_mut(&self.my_id) {
+ let movement_packet = player
+ .movement
+ .update(&self.collision_map, direction, boost, dt);
+ if send_movement {
+ packet_out.push_back(movement_packet);
}
+
+ self.camera_center.exp_to(player.movement.position, dt * 5.);
+ }
+
+ for (_pid, player) in &mut self.players {
if let Some(item) = &mut player.item {
item.position = player.movement.position
}
@@ -296,6 +300,8 @@ impl Game {
}
pub fn draw(&self, ctx: &mut SpriteRenderer) {
+ ctx.set_view(-self.camera_center + (ctx.size / ctx.get_scale() / 2.), 1.);
+
self.tilemap.draw(ctx);
for p in self.players.values() {
diff --git a/pixel-client/src/helper.rs b/pixel-client/src/helper.rs
new file mode 100644
index 00000000..9654f519
--- /dev/null
+++ b/pixel-client/src/helper.rs
@@ -0,0 +1,11 @@
+use hurrycurry_protocol::glam::Vec2;
+
+pub trait Vec2InterpolateExt {
+ fn exp_to(&mut self, target: Vec2, dt: f32);
+}
+impl Vec2InterpolateExt for Vec2 {
+ fn exp_to(&mut self, target: Vec2, dt: f32) {
+ self.x = target.x + (self.x - target.x) * (-dt).exp();
+ self.y = target.y + (self.y - target.y) * (-dt).exp();
+ }
+}
diff --git a/light-client/src/main.rs b/pixel-client/src/main.rs
index 7526b394..e3aaa5cc 100644
--- a/light-client/src/main.rs
+++ b/pixel-client/src/main.rs
@@ -16,6 +16,7 @@
*/
use game::Game;
+use hurrycurry_protocol::glam::Vec2;
use network::Network;
use render::SpriteRenderer;
use sdl2::{
@@ -26,6 +27,7 @@ use sdl2::{
use std::time::{Duration, Instant};
pub mod game;
+pub mod helper;
pub mod network;
pub mod render;
pub mod tilemap;
@@ -34,6 +36,7 @@ fn main() {
env_logger::init_from_env("LOG");
let sdl_context = sdl2::init().unwrap();
+
let video_subsystem = sdl_context.video().unwrap();
let window = video_subsystem
.window("Hurry Curry! Light Client", 1280, 720)
@@ -64,9 +67,14 @@ fn main() {
let mut last_tick = Instant::now();
+ canvas.set_logical_size(320, 240).unwrap();
+
'mainloop: loop {
net.poll();
+ let (width, height) = canvas.logical_size();
+ renderer.size = Vec2::new(width as f32, height as f32);
+
for packet in net.queue_in.drain(..) {
game.packet_in(packet, &mut renderer);
}
diff --git a/light-client/src/network.rs b/pixel-client/src/network.rs
index ed160773..ed160773 100644
--- a/light-client/src/network.rs
+++ b/pixel-client/src/network.rs
diff --git a/light-client/src/render/misc.rs b/pixel-client/src/render/misc.rs
index 9f866568..9f866568 100644
--- a/light-client/src/render/misc.rs
+++ b/pixel-client/src/render/misc.rs
diff --git a/light-client/src/render/mod.rs b/pixel-client/src/render/mod.rs
index a410da6f..a2aea365 100644
--- a/light-client/src/render/mod.rs
+++ b/pixel-client/src/render/mod.rs
@@ -31,6 +31,7 @@ use std::collections::HashMap;
pub struct SpriteRenderer<'a> {
metadata: AtlasLayout,
+ pub size: Vec2,
texture: Texture<'a>,
view_scale: Vec2,
@@ -103,13 +104,22 @@ impl<'a> SpriteRenderer<'a> {
Self {
texture,
+ size: Vec2::ONE,
metadata,
sprites: vec![],
view_offset: Vec2::ZERO,
- view_scale: Vec2::splat(3.),
+ view_scale: Vec2::ZERO,
}
}
+ pub fn set_view(&mut self, offset: Vec2, scale: f32) {
+ self.view_offset = offset;
+ self.view_scale = Vec2::new(32., 24.) * scale;
+ }
+ pub fn get_scale(&self) -> Vec2 {
+ self.view_scale
+ }
+
#[inline]
pub fn atlas_layout(&self) -> &HashMap<String, Rect> {
&self.metadata
@@ -129,10 +139,10 @@ impl<'a> SpriteRenderer<'a> {
z_order: sprite.z_order,
src: sprite.src,
dst: FRect::new(
- ((sprite.dst.x + self.view_offset.x) * 32.).round() * self.view_scale.x,
- ((sprite.dst.y + self.view_offset.y) * 24.).round() * self.view_scale.y,
- (sprite.dst.w * 32.).round() * self.view_scale.x,
- (sprite.dst.h * 24.).round() * self.view_scale.y,
+ ((sprite.dst.x + self.view_offset.x) * self.view_scale.x).round(),
+ ((sprite.dst.y + self.view_offset.y) * self.view_scale.y).round(),
+ (sprite.dst.w * self.view_scale.x).round(),
+ (sprite.dst.h * self.view_scale.y).round(),
),
})
}
diff --git a/light-client/src/render/sprite.rs b/pixel-client/src/render/sprite.rs
index 711f45bf..711f45bf 100644
--- a/light-client/src/render/sprite.rs
+++ b/pixel-client/src/render/sprite.rs
diff --git a/light-client/src/tilemap.rs b/pixel-client/src/tilemap.rs
index 768f79ba..768f79ba 100644
--- a/light-client/src/tilemap.rs
+++ b/pixel-client/src/tilemap.rs
diff --git a/light-client/tools/Cargo.toml b/pixel-client/tools/Cargo.toml
index f3075594..f3075594 100644
--- a/light-client/tools/Cargo.toml
+++ b/pixel-client/tools/Cargo.toml
diff --git a/light-client/tools/src/bin/bunnymark.rs b/pixel-client/tools/src/bin/bunnymark.rs
index f59fecff..f59fecff 100644
--- a/light-client/tools/src/bin/bunnymark.rs
+++ b/pixel-client/tools/src/bin/bunnymark.rs
diff --git a/light-client/tools/src/bin/tex_compose.rs b/pixel-client/tools/src/bin/tex_compose.rs
index 19c9ed7c..19c9ed7c 100644
--- a/light-client/tools/src/bin/tex_compose.rs
+++ b/pixel-client/tools/src/bin/tex_compose.rs
diff --git a/light-client/tools/src/bin/tex_export.rs b/pixel-client/tools/src/bin/tex_export.rs
index 248990e6..248990e6 100644
--- a/light-client/tools/src/bin/tex_export.rs
+++ b/pixel-client/tools/src/bin/tex_export.rs
diff --git a/light-client/tools/src/bin/tex_import.rs b/pixel-client/tools/src/bin/tex_import.rs
index a5dad499..a5dad499 100644
--- a/light-client/tools/src/bin/tex_import.rs
+++ b/pixel-client/tools/src/bin/tex_import.rs
diff --git a/light-client/tools/src/bin/tex_pack.rs b/pixel-client/tools/src/bin/tex_pack.rs
index 5022d561..5022d561 100644
--- a/light-client/tools/src/bin/tex_pack.rs
+++ b/pixel-client/tools/src/bin/tex_pack.rs
diff --git a/light-client/tools/src/lib.rs b/pixel-client/tools/src/lib.rs
index e69de29b..e69de29b 100644
--- a/light-client/tools/src/lib.rs
+++ b/pixel-client/tools/src/lib.rs