From b69023038765d9a64eae149e6a576ccf482b7fae Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Thu, 6 Feb 2020 11:54:55 -0300
Subject: [PATCH] Test that "spriteSourceSize" are generated correctly when
 -trim -merge-duplicates are used together

---
 cli/sheet.sh                  |  31 ++++++++++++++++++++++++++++++-
 sprites/README.md             |   4 ++++
 sprites/point4frames.aseprite | Bin 0 -> 591 bytes
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 sprites/point4frames.aseprite

diff --git a/cli/sheet.sh b/cli/sheet.sh
index 373bfe517..d633fefcd 100644
--- a/cli/sheet.sh
+++ b/cli/sheet.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
-# Copyright (C) 2019 Igara Studio S.A.
+# Copyright (C) 2019-2020 Igara Studio S.A.
 
 # $1 = first sprite sheet json file
 # $2 = second sprite sheet json file
@@ -243,3 +243,32 @@ for type in horizontal vertical rows columns ; do
 		  -script scripts/compare_sprite_sheets.lua || exit $?
     done
 done
+
+# "Trim Cels" (-trim) with -merge-duplicates didn't generate the
+# correct "spriteSourceSize" for each frame.
+# https://igarastudio.zendesk.com/agent/tickets/407
+d=$t/ticket-407
+for layer in a b ; do
+    $ASEPRITE -b -layer "$layer" "sprites/point4frames.aseprite" \
+	      -trim \
+	      -data "$d/data1-$layer.json" \
+	      -format json-array -sheet "$d/sheet1-$layer.png" || exit 1
+    $ASEPRITE -b -layer "$layer" "sprites/point4frames.aseprite" \
+	      -trim -merge-duplicates \
+	      -data "$d/data2-$layer.json" \
+	      -format json-array -sheet "$d/sheet2-$layer.png" || exit 1
+    cat >$d/compare.lua <<EOF
+local json = dofile('third_party/json/json.lua')
+local data1 = json.decode(io.open('$d/data1-$layer.json'):read('a'))
+local data2 = json.decode(io.open('$d/data2-$layer.json'):read('a'))
+for i = 1,4 do
+    local a = data1.frames[i].spriteSourceSize
+    local b = data2.frames[i].spriteSourceSize
+    assert(a.x == b.x)
+    assert(a.y == b.y)
+    assert(a.w == b.w)
+    assert(a.h == b.h)
+end
+EOF
+    $ASEPRITE -b -script "$d/compare.lua" || exit 1
+done
diff --git a/sprites/README.md b/sprites/README.md
index 98e3f8267..8e45671a5 100644
--- a/sprites/README.md
+++ b/sprites/README.md
@@ -15,3 +15,7 @@
 * `tags3.aseprite`: 3 tags ("forward", "reverse", "pingpong") and 3
   layers ("a", "b", "c"), 4x4, several linked cels + layer "c" with
   empty cels.
+* `point4frames.aseprite`: Indexed, 4 frames, 2 layers, same cel
+  content but different positions, can be used to test
+  `-merge-duplicates` to check if all cels go to the same sprite sheet
+  position.
diff --git a/sprites/point4frames.aseprite b/sprites/point4frames.aseprite
new file mode 100644
index 0000000000000000000000000000000000000000..a888f17342bb0285f16abf75f8a055a4b6a0a985
GIT binary patch
literal 591
zcmeZgVqkc%l!ZY62ss!S85kH+fEWRo85lu=V0nZn^;n02M*aH82DX(A$QA=)b_KAN
zNS5dT*^&y(P!XV$QNe!(23HLmAo-tR!+&9*91F-NAmw1;4U!-sxOR|Upjx1kL|hU{
zAPZR)fCLcyhug=>z{*fDCpjS{B_+XyRlyDzI9d#189+6^J~Dy508$Fm%K~%;A-xc_
yj6jvx)Fve*B{+fYVX|h>#$^vX13S_7U{{N3j}6#Aj9~wOA_C?gZU%0G_5c9Lvpe4a

literal 0
HcmV?d00001