From c8e5cfcdef0069d42faed229a453338ab09bcbdd Mon Sep 17 00:00:00 2001
From: Stefan Stefanov <stefan.karolev1@gmail.com>
Date: Sun, 21 Apr 2024 09:38:05 +0300
Subject: [PATCH] add odin-aseprite dependency & start of a generator

---
 .gitmodules                                |   3 +
 .vscode/tasks.json                         | 136 ++++++++++++---------
 README.md                                  |   2 +
 src/aseprite                               |   1 +
 src/aseprite_odin_generator/atlas.png      | Bin 0 -> 10342 bytes
 src/aseprite_odin_generator/big.aseprite   | Bin 0 -> 683 bytes
 src/aseprite_odin_generator/big.png        | Bin 0 -> 515 bytes
 src/aseprite_odin_generator/generator.odin |  82 +++++++++++++
 src/game.odin                              |  10 +-
 9 files changed, 170 insertions(+), 64 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 src/aseprite
 create mode 100644 src/aseprite_odin_generator/atlas.png
 create mode 100644 src/aseprite_odin_generator/big.aseprite
 create mode 100644 src/aseprite_odin_generator/big.png
 create mode 100644 src/aseprite_odin_generator/generator.odin

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..6282b93
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/aseprite"]
+	path = src/aseprite
+	url = https://github.com/bersK/odin-aseprite.git
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index d4d47ba..b1eca51 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,60 +1,80 @@
 {
-    "version": "2.0.0",
-    "command": "",
-    "args": [],
-    "tasks": [
-        {
-            "label": "Build Debug",
-            "type": "shell",
-            "windows": {
-                "command": "${workspaceFolder}/scripts/build_debug.bat",
-            },
-            "linux": {
-                "command": "${workspaceFolder}/scripts/build_debug.sh",
-            },
-            "osx": {
-                "command": "${workspaceFolder}/scripts/build_debug.sh",
-            },
-            "group": "build"
-        },
-        {
-            "label": "Build Release",
-            "type": "shell",
-            "windows": {
-                "command": "${workspaceFolder}/scripts/build_release.bat",
-            },
-            "linux": {
-                "command": "${workspaceFolder}/scripts/build_release.sh",
-            },
-            "osx": {
-                "command": "${workspaceFolder}/scripts/build_release.sh",
-            },
-            "group": "build"
-        },
-        {
-            "label": "Build Hot Reload",
-            "type": "shell",
-            "windows": {
-                "command": "${workspaceFolder}/scripts/build_hot_reload.bat; start game.exe",
-            },
-            "linux": {
-                "command": "${workspaceFolder}/scripts/build_hot_reload.sh",
-            },
-            "osx": {
-                "command": "${workspaceFolder}/scripts/build_hot_reload.sh",
-            },
-            "presentation": {
-                "echo": true,
-                "reveal": "always",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": false,
-                "clear": true
-            },
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-        }
-    ]
+        "version": "2.0.0",
+        "command": "",
+        "args": [],
+        "tasks": [
+                {
+                        "label": "Build Debug",
+                        "type": "shell",
+                        "windows": {
+                                "command": "${workspaceFolder}/scripts/build_debug.bat",
+                        },
+                        "linux": {
+                                "command": "${workspaceFolder}/scripts/build_debug.sh",
+                        },
+                        "osx": {
+                                "command": "${workspaceFolder}/scripts/build_debug.sh",
+                        },
+                        "group": "build"
+                },
+                {
+                        "label": "Build Release",
+                        "type": "shell",
+                        "windows": {
+                                "command": "${workspaceFolder}/scripts/build_release.bat",
+                        },
+                        "linux": {
+                                "command": "${workspaceFolder}/scripts/build_release.sh",
+                        },
+                        "osx": {
+                                "command": "${workspaceFolder}/scripts/build_release.sh",
+                        },
+                        "group": "build"
+                },
+                {
+                        "label": "Build Hot Reload",
+                        "type": "shell",
+                        "windows": {
+                                "command": "${workspaceFolder}/scripts/build_hot_reload.bat; start game.exe",
+                        },
+                        "linux": {
+                                "command": "${workspaceFolder}/scripts/build_hot_reload.sh",
+                        },
+                        "osx": {
+                                "command": "${workspaceFolder}/scripts/build_hot_reload.sh",
+                        },
+                        "presentation": {
+                                "echo": true,
+                                "reveal": "always",
+                                "focus": false,
+                                "panel": "dedicated",
+                                "showReuseMessage": false,
+                                "clear": true
+                        },
+                        "group": {
+                                "kind": "build",
+                                "isDefault": false
+                        },
+                },
+                {
+                        "label": "Build&Run Tile Generator Test",
+                        "type": "shell",
+                        "command": "odin run src/aseprite_odin_generator -out:build/aseprite_odin_generator.exe",
+                        "options": {
+                                "cwd": "${workspaceFolder}"
+                        },
+                        "presentation": {
+                                "echo": true,
+                                "reveal": "always",
+                                "focus": false,
+                                "panel": "dedicated",
+                                "showReuseMessage": false,
+                                "clear": true
+                        },
+                        "group": {
+                                "kind": "build",
+                                "isDefault": true
+                        },
+                }
+        ]
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index 6dc89db..a20f4ac 100644
--- a/README.md
+++ b/README.md
@@ -6,4 +6,6 @@ Yet-Another-Atlas-Packer by Stefan Stefanov
 
 Simple atlas packer using `stb_rect_pack` from the `stb` family of header libraries & `raylib` for rendering/ui.
 
+I'm using a custom marshall/unmarshall odin library for reading .aseprite files found [here](https://github.com/blob1807/odin-aseprite)
+
 Project template provided by Karl Zylinski on github [here](https://github.com/karl-zylinski/odin-raylib-hot-reload-game-template).
diff --git a/src/aseprite b/src/aseprite
new file mode 160000
index 0000000..f21bed8
--- /dev/null
+++ b/src/aseprite
@@ -0,0 +1 @@
+Subproject commit f21bed838a6d1e6bc1178ea0876596eb14190192
diff --git a/src/aseprite_odin_generator/atlas.png b/src/aseprite_odin_generator/atlas.png
new file mode 100644
index 0000000000000000000000000000000000000000..02082b443dfd9eb206f7375267ffaa77d2d3983a
GIT binary patch
literal 10342
zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4YzZe)abUj@hLn`8u-vm$nd%l6K
zE6+YHMS^v)qJb0>f;eo(GQ;h0nF))Va{_{R(t03+Il<&=f7^i!jvffXa5#gxA+h8~
zy@@<j1R*!d8VwS7LK#gAqltl*iGk;?zz_KYALLuy9~U5stQYMJk26&I+87oJ90+@9
zoR=WsYrWVr9jc(MfWx5o*gZ67o#1Y~$aWxOl{|0bMF9yYAt=GL`0$R!C+DpYaG1v?
zA^T6>*91{sj<S$zkI~Q=4Gq-x#Au2bO%X#pML5hBNRU~_`1{m}XZC0Elb-h(^r<aC
z)DIvQqYH-t@9_f;>;AYaS0m~m5R1VW*q~-kMHNf{HmEn`F!b>K>`!}&Y80^MS&+!_
zW#y@V^1KfaQVYeI7I!~(3)a1<*bwtm{BE7itZ8nSFF`9Xo`nJux?9{QYey<JtbJ~O
zi$lWK2bS|noDxa|A7o_7qE~9X4Hr}FQBo&R!~~@`05n4gsGTLjWNxr3i`(=6?!s^@
z*9u7FGW0Bq=yFcj@=4y;1!f<Li9<Z<(F0@DZ=(^4)L9-)@}n7IG((JLh|y|dv?LrY
z2}eu9(UNeqBpfXXM@z!dl5n&n94!e)OTy8TaI_>GEeS_U!qJj&v?LrY2}eu9p;8ha
cwr63OzgS(~VBO7$!1aR+p00i_>zopr0H?L}mjD0&

literal 0
HcmV?d00001

diff --git a/src/aseprite_odin_generator/big.aseprite b/src/aseprite_odin_generator/big.aseprite
new file mode 100644
index 0000000000000000000000000000000000000000..bfc55aa64ad69013a578098a6aac7774308fdcf1
GIT binary patch
literal 683
zcmZ3@#K7=iDI)^|BLkxXkYHd)0b&GjU|<9ZG6(=6Er2%A{$C&2z_zjhEf51@b_KAN
zNY<SKvROc`bNJ8TAS^5_EiJ9Cu5N2<8yg$j+S<Bh%a;HD{~tepchbV0sl}6=eDbvP
z{iGy~_}Haogk&t`6=QWYx;)JG=X*Vyllkq`{GZRxzg->hpv2;st4g1$?Ee6Uw`C&#
z7m55oq5A)I_~k!!GoQsr9rZV!;VqXRAnfDAqvyh4nahy5iebhbhO<9;KK`Hb_y6BZ
zZ$Ec_y>0)uiu0EN^GzP6$;^`W)*{YHDv6UV`cDO&JQ2|Lt+D-UXzVK^n<FX)opRdY
zGV1ampC~XR`RzZD&CcMHSeaU+V2EGZ=onBfs{#Xq6oU}Me_+T#Kp(>-hKf0FFKy&(
zFc5LQsFU=P=^Ed|6v->9N@9!~4QnPyShC0c@0$I5<&)b&HapB0OGmwE<2Vb`j*I>i
zely7O`fv8+6?<c@{}#T#Tw1Bbc}f~C<rv}(D{3RXW8drdJiOJDm$6iOQOW0Z%#8Mh
y7Un>utiU+7X0Su@1uFvw&=<)G4GngoH~;f^FdS)5EV0uyFtc`KV2IAJ5CQ-VR-(fI

literal 0
HcmV?d00001

diff --git a/src/aseprite_odin_generator/big.png b/src/aseprite_odin_generator/big.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2f4a733dad684329714b55426dfa179171fb62a
GIT binary patch
literal 515
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G!U;i$lZxy-8q?;K=xiw7srr_
zIdAW5<ZTKNU`t5gu=Wz)P{xs#D3DgjkuAPqNpWX-s?!v{hYH_oMHfC)xO09l%L*-^
zF{nTxZtvB`w&Li0-@l$O-29k%|Ew2G4HircLfqU8kL^*_;^wW%vDmJ<i|t0U)vkuM
zzO(n&_q{wPzbwe~z@5qQ91|jiV;Kb8861*;#(K*#T>GCg-HgEmVfX<lukfjtLhEjA
zVqAZClXS6f{QWzNv%P-nGAJ-8m_8QWZ4}EU@gEc*R00qFzk0#c_pWs3wDaFy7M9yu
yPEp&{pgh~mUS=Xg!x5GPOm1~lvI(0p2`kOxveo5Ri_~lcNqf5bxvX<aXaWGx=4)C2

literal 0
HcmV?d00001

diff --git a/src/aseprite_odin_generator/generator.odin b/src/aseprite_odin_generator/generator.odin
new file mode 100644
index 0000000..fd18903
--- /dev/null
+++ b/src/aseprite_odin_generator/generator.odin
@@ -0,0 +1,82 @@
+package generator
+
+import ase "../aseprite"
+import "core:fmt"
+import "core:mem"
+import "core:os"
+import fp "core:path/filepath"
+import "core:slice"
+import "core:strings"
+import "core:testing"
+import rl "vendor:raylib"
+
+ATLAS_SIZE :: 512
+EXPORT_PATH :: "E:/dev/odin-atlas-packer/src/aseprite_odin_generator/atlas.png"
+
+main :: proc() {
+	fmt.println("Hello!")
+	ase_file, ase_ok := os.read_entire_file(
+		"E:/dev/odin-atlas-packer/src/aseprite_odin_generator/big.aseprite",
+	)
+	if !ase_ok {
+		fmt.panicf("Couldn't load file!")
+	}
+
+	doc: ase.Document
+	read, um_err := ase.unmarshal_from_slice(ase_file, &doc)
+	if um_err != nil {
+		fmt.panicf("Couldn't unmarshall file!")
+	} else {
+		fmt.printfln("Read {0} bytes from file", read)
+	}
+
+	fmt.println("Header:\n\t", doc.header)
+	// fmt.println("Frames:\n\t", doc.frames)
+
+	images: [dynamic]rl.Image
+	atlas: rl.Image = rl.GenImageColor(ATLAS_SIZE, ATLAS_SIZE, rl.BLANK)
+
+	for frame in doc.frames {
+		for chunk in frame.chunks {
+			cel_chunk, cok := chunk.(ase.Cel_Chunk)
+			if !cok {
+				continue
+			}
+
+			cel_img, ci_ok := cel_chunk.cel.(ase.Com_Image_Cel)
+			if !ci_ok {
+				continue
+			}
+			append(
+				&images,
+				rl.Image {
+					data = rawptr(&cel_img.pixel[0]),
+					width = auto_cast cel_img.width,
+					height = auto_cast cel_img.height,
+					format = .UNCOMPRESSED_R8G8B8A8,
+				},
+			)
+		}
+	}
+	curr_x, curr_y: i32
+	for img, img_i in images {
+		fmt.printfln("Image_{0}: {1}", img_i, img)
+		rl.ImageDraw(
+			&atlas,
+			img,
+			{0, 0, auto_cast img.width, auto_cast img.height},
+			{auto_cast curr_x, auto_cast curr_y, auto_cast img.width, auto_cast img.height},
+			rl.WHITE,
+		)
+		curr_x += img.width
+		curr_y += img.height
+	}
+
+	// todo: pack the rectangles
+
+	// todo: blit them to the atlas
+
+	// todo: generate metadata (json, odin enums)
+
+	rl.ExportImage(atlas, EXPORT_PATH)
+}
diff --git a/src/game.odin b/src/game.odin
index 34cd934..f2f4057 100644
--- a/src/game.odin
+++ b/src/game.odin
@@ -293,7 +293,7 @@ draw_atlas_settings_and_preview :: proc() {
 		   },
 		   "Pack",
 	   ) {
-                g_mem.atlas_render = true
+		g_mem.atlas_render = true
 	}
 	elements_height += small_offset * 2
 
@@ -307,7 +307,7 @@ draw_atlas_settings_and_preview :: proc() {
 		   },
 		   "Save",
 	   ) {
-                save_output()
+		save_output()
 	}
 	if rl.GuiButton(
 		    {
@@ -334,7 +334,7 @@ draw_atlas_settings_and_preview :: proc() {
 		height = short_edge,
 	}
 	rl.GuiDummyRec(preview_rect, "PREVIEW")
-        preview_rect.x += 10; preview_rect.y += 10; preview_rect.height-=20;preview_rect.width-=20
+	preview_rect.x += 10;preview_rect.y += 10;preview_rect.height -= 20;preview_rect.width -= 20
 	texture := &g_mem.atlas_render_texture_target.texture
 	rl.DrawTexturePro(
 		texture^,
@@ -394,7 +394,7 @@ open_file_dialog_and_store_output_paths :: proc() {
 }
 
 draw_and_handle_source_files_logic :: proc() {
-	switch g_mem.app_screen {
+	#partial switch g_mem.app_screen {
 	case .SourceFilesPicker:
 		result := rl.GuiTextInputBox(
 			rl.Rectangle{width = (w / scaling), height = (h / scaling)},
@@ -445,8 +445,6 @@ draw_and_handle_source_files_logic :: proc() {
 			handle_source_file_logic(file_dialg_type)
 			fmt.println("result: ", result)
 		}
-	case .PackSettingsAndPreview:
-		draw_packer_and_settings()
 	}
 }