rename textures dir

37 files changed, 49 insertions, 20 deletions

diff --git a/Cargo.lock b/Cargo.lock
index ab7577aa..15385fb2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1998,6 +1998,7 @@ dependencies = [
  "log",
  "rand 0.8.5",
  "rustls",
+ "rustls-native-certs",
  "rustls-pki-types",
  "sha1",
  "thiserror",
diff --git a/light-client/Cargo.toml b/light-client/Cargo.toml
index 534ab300..ec8b75ec 100644
--- a/light-client/Cargo.toml
+++ b/light-client/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 sdl2 = { version = "0.37.0", features = ["image", "ttf"] }
 hurrycurry-protocol = { path = "../server/protocol" }
-tungstenite = "0.23.0"
+tungstenite = { version = "0.23.0", features = ["rustls-tls-native-roots"] }
 serde_json = "1.0.120"
 bincode = "2.0.0-rc.3"
 log = "0.4.22"
diff --git a/light-client/textures/.gitignore b/light-client/assets/.gitignore
index d235d3ec..96a451b4 100644
--- a/light-client/textures/.gitignore
+++ b/light-client/assets/.gitignore
@@ -1,4 +1,3 @@
 *.png
 /atlas.ta
 /atlas.meta.csv
-
diff --git a/light-client/assets/items.ini b/light-client/assets/items.ini
new file mode 100644
index 00000000..bb8108cd
--- /dev/null
+++ b/light-client/assets/items.ini
@@ -0,0 +1,2 @@
+
+tomato-slice-plate=plate,tomato-slice+5
diff --git a/light-client/textures/palette.csv b/light-client/assets/palette.csv
index 985d23ab..985d23ab 100644
--- a/light-client/textures/palette.csv
+++ b/light-client/assets/palette.csv
diff --git a/light-client/textures/tiles/chair.ta b/light-client/assets/textures/chair.ta
index f739e389..f739e389 100644
--- a/light-client/textures/tiles/chair.ta
+++ b/light-client/assets/textures/chair.ta
diff --git a/light-client/textures/tiles/counter.ta b/light-client/assets/textures/counter.ta
index 846fdbe3..846fdbe3 100644
--- a/light-client/textures/tiles/counter.ta
+++ b/light-client/assets/textures/counter.ta
diff --git a/light-client/textures/tiles/crate_back.ta b/light-client/assets/textures/crate_back.ta
index 2f434d67..2f434d67 100644
--- a/light-client/textures/tiles/crate_back.ta
+++ b/light-client/assets/textures/crate_back.ta
diff --git a/light-client/textures/tiles/crate_front.ta b/light-client/assets/textures/crate_front.ta
index ff6e2d83..ff6e2d83 100644
--- a/light-client/textures/tiles/crate_front.ta
+++ b/light-client/assets/textures/crate_front.ta
diff --git a/light-client/textures/tiles/cutting_board.ta b/light-client/assets/textures/cutting_board.ta
index e6137c94..e6137c94 100644
--- a/light-client/textures/tiles/cutting_board.ta
+++ b/light-client/assets/textures/cutting_board.ta
diff --git a/light-client/textures/tiles/door_ns.ta b/light-client/assets/textures/door_ns.ta
index 9d03d91e..9d03d91e 100644
--- a/light-client/textures/tiles/door_ns.ta
+++ b/light-client/assets/textures/door_ns.ta
diff --git a/light-client/textures/tiles/door_we.ta b/light-client/assets/textures/door_we.ta
index f8faf0ef..f8faf0ef 100644
--- a/light-client/textures/tiles/door_we.ta
+++ b/light-client/assets/textures/door_we.ta
diff --git a/light-client/textures/tiles/floor.ta b/light-client/assets/textures/floor.ta
index ed84d15b..ed84d15b 100644
--- a/light-client/textures/tiles/floor.ta
+++ b/light-client/assets/textures/floor.ta
diff --git a/light-client/textures/tiles/freezer.ta b/light-client/assets/textures/freezer.ta
index 94c66e46..94c66e46 100644
--- a/light-client/textures/tiles/freezer.ta
+++ b/light-client/assets/textures/freezer.ta
diff --git a/light-client/textures/tiles/grass.ta b/light-client/assets/textures/grass.ta
index 359904f9..359904f9 100644
--- a/light-client/textures/tiles/grass.ta
+++ b/light-client/assets/textures/grass.ta
diff --git a/light-client/textures/tiles/oven.ta b/light-client/assets/textures/oven.ta
index eba199cc..eba199cc 100644
--- a/light-client/textures/tiles/oven.ta
+++ b/light-client/assets/textures/oven.ta
diff --git a/light-client/textures/tiles/path.ta b/light-client/assets/textures/path.ta
index 30f94645..30f94645 100644
--- a/light-client/textures/tiles/path.ta
+++ b/light-client/assets/textures/path.ta
diff --git a/light-client/textures/tiles/plate.ta b/light-client/assets/textures/plate.ta
index 6766989f..6766989f 100644
--- a/light-client/textures/tiles/plate.ta
+++ b/light-client/assets/textures/plate.ta
diff --git a/light-client/textures/tiles/player.ta b/light-client/assets/textures/player.ta
index 065a3255..065a3255 100644
--- a/light-client/textures/tiles/player.ta
+++ b/light-client/assets/textures/player.ta
diff --git a/light-client/textures/tiles/sink.ta b/light-client/assets/textures/sink.ta
index e76c2af7..e76c2af7 100644
--- a/light-client/textures/tiles/sink.ta
+++ b/light-client/assets/textures/sink.ta
diff --git a/light-client/textures/tiles/stove.ta b/light-client/assets/textures/stove.ta
index f5010163..f5010163 100644
--- a/light-client/textures/tiles/stove.ta
+++ b/light-client/assets/textures/stove.ta
diff --git a/light-client/textures/tiles/table.ta b/light-client/assets/textures/table.ta
index ea05c05e..ea05c05e 100644
--- a/light-client/textures/tiles/table.ta
+++ b/light-client/assets/textures/table.ta
diff --git a/light-client/textures/tiles/tomato.ta b/light-client/assets/textures/tomato.ta
index b6f087d9..b6f087d9 100644
--- a/light-client/textures/tiles/tomato.ta
+++ b/light-client/assets/textures/tomato.ta
diff --git a/light-client/textures/tiles/tomato_slice.ta b/light-client/assets/textures/tomato_slice.ta
index 77d257f8..77d257f8 100644
--- a/light-client/textures/tiles/tomato_slice.ta
+++ b/light-client/assets/textures/tomato_slice.ta
diff --git a/light-client/textures/tiles/trash.ta b/light-client/assets/textures/trash.ta
index 41d05300..41d05300 100644
--- a/light-client/textures/tiles/trash.ta
+++ b/light-client/assets/textures/trash.ta
diff --git a/light-client/textures/tiles/tree.ta b/light-client/assets/textures/tree.ta
index 2d5bee16..2d5bee16 100644
--- a/light-client/textures/tiles/tree.ta
+++ b/light-client/assets/textures/tree.ta
diff --git a/light-client/textures/tiles/wall_ns.ta b/light-client/assets/textures/wall_ns.ta
index c381c712..c381c712 100644
--- a/light-client/textures/tiles/wall_ns.ta
+++ b/light-client/assets/textures/wall_ns.ta
diff --git a/light-client/textures/tiles/wall_we.ta b/light-client/assets/textures/wall_we.ta
index bb33d762..bb33d762 100644
--- a/light-client/textures/tiles/wall_we.ta
+++ b/light-client/assets/textures/wall_we.ta
diff --git a/light-client/textures/tiles/wall_wen.ta b/light-client/assets/textures/wall_wen.ta
index fd7c8bdf..fd7c8bdf 100644
--- a/light-client/textures/tiles/wall_wen.ta
+++ b/light-client/assets/textures/wall_wen.ta
diff --git a/light-client/textures/tiles/wall_wens.ta b/light-client/assets/textures/wall_wens.ta
index 278c42aa..278c42aa 100644
--- a/light-client/textures/tiles/wall_wens.ta
+++ b/light-client/assets/textures/wall_wens.ta
diff --git a/light-client/textures/tiles/wall_wes.ta b/light-client/assets/textures/wall_wes.ta
index 10939371..10939371 100644
--- a/light-client/textures/tiles/wall_wes.ta
+++ b/light-client/assets/textures/wall_wes.ta
diff --git a/light-client/textures/tiles/wall_wn.ta b/light-client/assets/textures/wall_wn.ta
index 187d3248..187d3248 100644
--- a/light-client/textures/tiles/wall_wn.ta
+++ b/light-client/assets/textures/wall_wn.ta
diff --git a/light-client/textures/tiles/wall_wns.ta b/light-client/assets/textures/wall_wns.ta
index f03dae86..f03dae86 100644
--- a/light-client/textures/tiles/wall_wns.ta
+++ b/light-client/assets/textures/wall_wns.ta
diff --git a/light-client/textures/tiles/wall_ws.ta b/light-client/assets/textures/wall_ws.ta
index 76bd7374..76bd7374 100644
--- a/light-client/textures/tiles/wall_ws.ta
+++ b/light-client/assets/textures/wall_ws.ta
diff --git a/light-client/assets/tiles.ini b/light-client/assets/tiles.ini
new file mode 100644
index 00000000..fcc0c28a
--- /dev/null
+++ b/light-client/assets/tiles.ini
@@ -0,0 +1,24 @@
+chair=floor,chair
+table=floor,table
+
+door=ns:floor,door_ns
+door=we:floor,door_we
+
+; wall=:wall
+; wall=w:wall
+; wall=e:wall
+wall=we:wall_we
+; wall=n:wall
+wall=wn:wall_wn
+wall=en:wall_wn~hflip
+wall=wen:wall_wen
+; wall=s:wall
+wall=ws:wall_ws
+wall=es:wall_ws~hflip
+wall=wes:wall_wes
+wall=ns:wall_ns
+wall=wns:wall_wns
+wall=ens:wall_wns~hflip
+wall=wens:wall_wens
+
+tomato-crate=crate_back,tomato,crate_front
diff --git a/light-client/makefile b/light-client/makefile
new file mode 100644
index 00000000..39199caa
--- /dev/null
+++ b/light-client/makefile
@@ -0,0 +1,21 @@
+
+ALL_TA = $(shell find textures/tiles -name '*.ta')
+ALL_PNG = $(shell find textures/tiles -name '*.png')
+ALL_TA_IMPORT = $(patsubst %.import.png,%.ta,$(shell find textures/tiles -name '*.import.png'))
+ALL_PNG_EXPORT = $(patsubst %.ta,%.png,$(ALL_TA))
+
+.PHONY: tex_pack tex_export tex_import clean
+tex_pack: textures/atlas.ta
+tex_import: $(ALL_TA_IMPORT)
+tex_export: $(ALL_PNG_EXPORT)
+clean:
+	rm -f $(ALL_PNG) 
+	rm -f textures/atlas.ta textures/atlas.meta.csv
+
+%.ta: %.import.png
+	../target/release/tex_import $< $@
+%.png: %.ta
+	../target/release/tex_export $< $@
+
+textures/atlas.ta textures/atlas.meta.csv: $(ALL_TA)
+	../target/release/tex_pack textures/atlas.ta textures/atlas.meta.csv $^
diff --git a/light-client/textures/makefile b/light-client/textures/makefile
deleted file mode 100644
index ce416a76..00000000
--- a/light-client/textures/makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-
-ALL_TA = $(patsubst %.png,%.ta,$(shell find tiles -name '*.png'))
-ALL_PNG = $(patsubst %.ta,%.png,$(shell find tiles -name '*.ta'))
-
-.PHONY: tex_export tex_import clean
-tex_import: $(ALL_TA)
-tex_export: $(ALL_PNG)
-tex_pack: atlas.ta
-clean:
-	rm -f $(ALL_PNG)
-
-%.ta: %.png
-	../../target/release/tex_import $< $@
-%.png: %.ta
-	../../target/release/tex_export $< $@
-
-atlas.ta atlas.meta.csv: $(ALL_TA)
-	../../target/release/tex_pack $@ atlas.meta.csv $^