From 2cefd0ee10c535c8ed0a1f93f2eef412d5f4d53c Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Sat, 27 Apr 2024 17:55:28 +0300
Subject: [PATCH] Displacement Map Visualizer QoL (#27392)

* Update Displacement Map Visualizer.lua

* Add files via upload

* Fix background layer being offset

This was caused by not taking the cel's own bounds into account.
Aseprite doesn't make an image layer "full size" if it only covers a
small part of the sprite.

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
---
 .../Displacement Map Visualizer.lua           |  38 +++++++++++++++++-
 .../Displacement Map.png                      | Bin 0 -> 1212 bytes
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 Tools/SS14 Aseprite Plugins/Displacement Map.png

diff --git a/Tools/SS14 Aseprite Plugins/Displacement Map Visualizer.lua b/Tools/SS14 Aseprite Plugins/Displacement Map Visualizer.lua
index b16ab797e7..468636c07d 100644
--- a/Tools/SS14 Aseprite Plugins/Displacement Map Visualizer.lua	
+++ b/Tools/SS14 Aseprite Plugins/Displacement Map Visualizer.lua	
@@ -88,17 +88,45 @@ dialog:canvas{
 
         local layerDisplacement = findLayer(sprite, dialog.data["displacement-select"])
         local layerTarget = findLayer(sprite, dialog.data["reference-select"])
+        local layerBackground = findLayer(sprite, dialog.data["background-select"])
         -- print(layerDisplacement.name)
         -- print(layerTarget.name)
+
         local celDisplacement = layerDisplacement:cel(1)
         local celTarget = layerTarget:cel(1)
+        local celBackground = layerBackground:cel(1)
+
+        -- Draw background
+        context:drawImage(
+            -- srcImage
+            celBackground.image,
+            -- srcPos
+            0, 0,
+            -- srcSize
+            celBackground.image.width, celBackground.image.height,
+            -- dstPos
+            celBackground.position.x * scale, celBackground.position.y * scale,
+            -- dstSize
+            celBackground.image.width * scale, celBackground.image.height * scale)
+
+        -- Apply displacement map and draw
         local image = applyDisplacementMap(
             sprite.width, sprite.height,
             dialog.data["size"],
             celDisplacement.image, celDisplacement.bounds,
             celTarget.image, celTarget.bounds)
 
-        context:drawImage(image, 0, 0, image.width, image.height, 0, 0, image.width * scale, context.width, context.height)
+        context:drawImage(
+            -- srcImage
+            image,
+            -- srcPos
+            0, 0,
+            -- srcSize
+            image.width, image.height,
+            -- dstPos
+            0, 0,
+            -- dstSize
+            image.width * scale, image.height * scale)
     end
 }
 
@@ -120,6 +148,14 @@ dialog:combobox{
     end
 }
 
+dialog:combobox{
+    id = "background-select",
+    label = "background layer",
+    options = layers,
+    onchange = function(ev)
+        dialog:repaint()
+    end
+}
 
 dialog:slider{
     id = "size",
diff --git a/Tools/SS14 Aseprite Plugins/Displacement Map.png b/Tools/SS14 Aseprite Plugins/Displacement Map.png
new file mode 100644
index 0000000000000000000000000000000000000000..50744cef601c4226b24eba32f33de2c185de3471
GIT binary patch
literal 1212
zcmV;t1Vj6YP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(c1c7*RCt{2*tw1zRT#zbW5k0X5@(LC{3N)m>h4Qb^^8MOVp3x8T7`F;CqXA7
z<7I%L57O93*2v2YlJALrYE5f;THjylo*UnOWB$e$ysxhFm&dzAyvyr+3D^4u{2z9s
zCve3}=R`U`oqaqfq8!eNaDMeU^aOeWSFn6W<g?Rxr!ykS@r;OaI3t4W&j^2ZH97PI
zdIFzm<w%s{>5TJ{$Z|RoNsdP%%Hc=^*&hinyCdO_pD%}=Ku_QkuC7E~Pv=@zqR4qA
zvYb{T$#Es399AO8ekHu@R>H}4CG7fXbLa{51U_<YA=+{}%eoL%E(=lQybxJV3z6iw
z5K#^b5oEs*UUm!NWV;Yno)%(SK0b$@Ku_QUHqXR7pU$t%M3d`GRJqJVk@HMsIn6|p
z<4i<3%tVm=OnBMNgp=(|Sb3U>NgiinoIfmwo<L9Fl3N<Fw9}c*jhN-uh$h!YRJk;w
z$hi?&PK`)%Y($hpBZBN3;bqqdC)-9?d1}NYkBu1Rp%Fv7d=5Q<p1^yyR${HEb6P5~
z$a5uTxmBXcwGve>l_+wqM3z$}k{l}$<xq(r`$~A(Rl>=(5>}onG09^kMtP{jARj7m
zsPE6AC(sjkXU9Su%js;^Lag#qh((?YG0UwGO|FHgaw$ZSb0M;v3X$Ykh$x3b1lbqD
z%dQYkwuP|rRES9)3o*(=AqM$Sh=Y8m5O>OdbLa_NR|0?j@%DRv^VVP2@iOo=0G#F1
zY5cqy9OYj&gH^t_87%Vs&0v-vYz9q!xEWOW(PmKO$D2Wxx6L5sf6wqXe*Eco0KgC5
z-$u~mPc{QDKiv$R{A@F@^7GALl3#2Fqx^C+801%*!9jk#8QhWIYzE)Szip-`&=Yv~
zfn!nvyTK~o+YJ`^{%$bK4|anlKimzf{Af2Q^5fkg%iC^{<eRq)qWtS_5acJjftR1|
z22Osq8(8`IZZOF&c7suVxf=}ftKHxrzupb*$ZvM@*5BI`=pTgMvo#WH)CZwREb<(Q
zS#FVNa*aflOC*Y%Ba!74i6qBJL^(tv$UYKYc9C$hjf9n_NKEn=iBTRRG02BV9Af`2
z@ZR+VF8hN^AeNv60x`=i5KXRusB#HJk#iujoC1;L7>Fo`Km^$b!pklYPPT!t@)U?k
z9s@DTLm-CG|08ti^#nfTNwX(ruLL~N<m!nk7f%#9dm_up6G@Jqh;r~mki93o>^$LQ
z>j^7Qo|xp(6QjTU*<V~wpeOK=YmR762{@w4#Sul$j>vLyM3SQ;q8uC%WbX(sJ4ZO#
zI>O46BPRD@XMb@$fu6u8T(v~CO286D&X&k>vP6=jC88WG5oB)(FFQ*(*;>Ndk3aj1
z>k0G(KGVuXlt~FpM3&P;Bsoq*l*2>>*-wO*-9)(Q)1Ljs^#pnXSFk)1c~k-;k>ofM
zQ4S*!WIqyq{CsDBaXo>az!fhIL>iR9KtwqVL>R8->@Th-&=a`E#RCx!SAX^w*Aw{C
a6Zi)qOv$-@EJcU_0000<MNUMnLSTZ8t}-qF

literal 0
HcmV?d00001