From e4e099618dc820a77fc52431c494b50c5c350ab5 Mon Sep 17 00:00:00 2001
From: drewcassidy <drewcassidy@me.com>
Date: Mon, 1 Jun 2020 16:54:07 -0700
Subject: [PATCH] Fix decal projection being scaled twice

---
 .../ConformalDecals/Assets/decal-blank.mu     | Bin 4294 -> 4294 bytes
 .../ConformalDecals/Localization/en-us.cfg    |  16 ++++++++--------
 .../Plugins/ConformalDecals.dll               | Bin 26624 -> 26624 bytes
 .../ConformalDecals/ModuleConformalDecal.cs   |   6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Distribution/GameData/ConformalDecals/Assets/decal-blank.mu b/Distribution/GameData/ConformalDecals/Assets/decal-blank.mu
index 7af0dce1d039233215c0a859953ea28a03b0973c..b6c5c440aba3c90665d8c23085cd5e026b1ca1e5 100644
GIT binary patch
delta 84
zcmX@6cua9Znj`}fXaKUIxWRt1BCG1gB|$9Wj8GL^E~&|hIl4}X$=M*0$*XuxH`}rL
RaZH}TE6K>Pc@?h=GXR(B5ZwR(

delta 64
zcmX@6cua9Z8gByw64+SW%pwfpbGf7@C+6rnB_?MBc@3L+S(`Z~_wdRxHcaMaHQjul
H_c;>)#>5Ye

diff --git a/Distribution/GameData/ConformalDecals/Localization/en-us.cfg b/Distribution/GameData/ConformalDecals/Localization/en-us.cfg
index 37f4af2..e00f16f 100644
--- a/Distribution/GameData/ConformalDecals/Localization/en-us.cfg
+++ b/Distribution/GameData/ConformalDecals/Localization/en-us.cfg
@@ -1,11 +1,11 @@
 Localization
 {
-    en-us
-    {
-        #LOC_ConformalDecals_gui_scale = Scale
-        #LOC_ConformalDecals_gui_depth = Depth
-        #LOC_ConformalDecals_gui_opacity = Opacity
-        #LOC_ConformalDecals_gui_cutoff = Cutoff
-        #LOC_ConformalDecals_gui_aspect-ratio = Aspect Ratio
-    }
+  en-us
+  {
+    #LOC_ConformalDecals_gui-scale = Scale
+    #LOC_ConformalDecals_gui-depth = Depth
+    #LOC_ConformalDecals_gui-opacity = Opacity
+    #LOC_ConformalDecals_gui-cutoff = Cutoff
+    #LOC_ConformalDecals_gui-aspectratio = Aspect Ratio
+  }
 }
\ No newline at end of file
diff --git a/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll
index c36e025bdc6ed26ca0fb456f7a7b924fb6aef521..1cc22947b46e155ce1ec225eae44d63dcd537ee4 100644
GIT binary patch
delta 1407
zcmX}seM}p59LMp`@5lYv(dP#q#)hK>MtLYu=77r6T1EmaENKi+%PKU}2qxN*4U-v}
zrIB^$He)@q4Ee{=7&J?CdYM_wG;@hWBW9R6XClFWaEUIFNPIwy(cj(uv`HUc_rAOD
zrFZ#Ft&ph|^6Cs-csBj=9<r2vdyt$|2=TE~r-44jOa00b;v>sSk|YWjUx5DV=ARS{
z*V}-b2LPh{5^GW;^gN}%6Ln3xNK9@@D_Q~5@qA?_JL(3)MaHpa{`DOJ?yJ9LR~M38
z)$92|N^F&BbqS}P4<s`t%QdC&p^LzRySkFt;oOugcp&r@*_Ld`^=W%1;dM&Pfe9g+
zL*Rm3X|z9OO-~4&lQg|mWwdi<O=XE{gX0z(bK#P%)Xt!lz>Rvp)-Ga0&Sh>K5W2;c
zhr>d7)?8MAqe6GhMXV6Vb*1rlmX8(Tf>0N$V|#E#S4v*9PNNvAKcS6C$v;~gSut*i
z_@*TT4?Y*VYKc=1?g@?CGw@<vXwn|1UTg~0n=>fEKSGa~<Fo|U8e_seX9lI%CG@>B
zPD@cy18sgv4$2vnp+Us39H(XI6ta*E_F_y|QqCuFx)<j~^YB)VtD;r$R*tVl+s~U1
zTcWk|=EJU9<6>%EFQEb@Tzq~~?sT=X3iyr4|NIVC34fiwE4FQ$v>K;`y6uOUA1nVW
z!fH?y(DqE@wrzmbVzog(j-O>++6POcrX`$l9b*r}qf5KJ>(YLNHSH9!0sTglqpXKE
zBBspwb|*g7w@qW*G{%Bh6Z*n_g0<ogp<9kg7J{Qm8#Il-EGgEBN}(<LEbB&x&=3|_
zFQU4Vu*&bS2nvJRaVgpD{)F|zD^%@X;;KprnoZ4g0Q+<$<%djp7(k0?XGsqo#6i*K
zhy#P@743|(hYq1nv`bD0h7dCv4#~^x2)=FB$Ky`UH|!_^ExPo_KZ;<BcsMVZdT10O
zBg&(4rxZoEP#wRtC?Y~(v!)@T4<t=7p*8y|i(*Wu$g;}YtRek|L=onT%6~WOF+A4>
zwZ8Ik*=@>65(Q!YIS*6LW&ZnJb+P_hsl(J&KhtHq-f^Y6`J=gspWN!x{qwRECt!+s
z_$e9*C@&5-NzZ8hcz8^6!^mg>a3ZvD2jp;s@@Z52z04Q9W#zq*0@llyxnAYVky1yf
zZ8ZD&_cspCzJ9+}o+!TjTI^(v*p}5NwrS_d|21&)?2n=Lj@x;!%!@^mpAy%UH)6ZV
cqIx6tC{Y5`quP#bXVK5vRp*l%BpulCFC8Ts8~^|S

delta 1399
zcmX}sdrVtZ90&04Iotz>KIn@I1l)i!N}=U38DnhBF)^dKEzL5Zi{%lvNKLRdn#@Gm
z+8U^vQ?uqyGP5N<I{(-onk6?bM*PDqhG~2a7j%Ch@CRF#h>pxZRE)uMZ_jLUZ~Hml
zd(Q9P{%%h4CQ05TXHU`N$;|7U$lc840ivpec-i?Az+ttD`qd-EOIFnsNtE3<3FFfv
z&J+w^bON^@2Z%a1vRw<&Hz)<w7L{qDn(|B4SM$S;u8Q0gv-rA0fHm#6{Dv~(*UBpI
zC<$!Q(^;Hw{HmBSS*t6J&zuAn{9-7D0>=Zzf<L6@$huO53a@@;3RMn;*)btS3kjUC
z`*PXeT-UhN8AaEX`doI#tjnKh$T4myVotngC|%laC2(PfU(cp-pBFP1_DNkAa-&bm
zZ7pUcI4U)7u3%+&$xsIW=6P8K-j>?On%E|2hSGe|I*HAg@h9{WY5u#ljcvx4GW^hz
zMJ48>u2^EU5=&BXTNYJVm71`{Xcg9_TFhBgqacu5bB8%btKpXV*^z|@)ly5281<kz
z0KI;ixAQD&&?&<%9-}qbFJ&QF(WAJb6n})o=oXxlS*6Ho@u|$}MOKRinYD^cbfr<h
znH1kGGB2tPrFo<CH0n?<B<iPlw{sV(Lu)P+fBs(PLu-@q6j(2MKpT*h>aq1QKW_i8
z5DTEDS-&!aABy@}BUZK<^TaAE%2pJ&>6*oqbCf-XIzxJUSCm!+b(P9+8wPVBkFX$Z
zLsZRp%M;%jW0Q!RqO2WvrM|Jfz;<Cn>biY`?Lp~wz0f57v7}iyTBQE6ont-dl?vkn
zwjaj~rC{YBvk<D<^?7OTa$RG6@JTheW`(vUB+aG{+K&!HDgLO*jea~Kv)4$F4&W)7
zy+iC6z+st9If68dh|JDA><A;8%h1ceWk;~wVU)+M!k^gFXy0kbc>N>Tvs1pDZ<>NM
zf}UK+$9T6AK}f1e+*$--sV=jw5vi++uBg<aZGlA)m#VNVi0oocMnfV9ioN7vvj&ms
zgy!=d<*t&#6j5<doG+lH@O|<7Ywg{ZPds)l@YUz;tCtSUoLcxk@A%sD+OfV1TzQ2c
zU(FkOR$UvksRsw`>d7Im^0Gd7c_?ZOx`xNx({J6H2RRU;qGD1Ut75NPRWrjSY+USc
z<LXDl9{Y1K&!vs%z2NE5X48*DdzaPa;THoB2ZM4@U+CJ>p>os4)Y(6u9OE-`gA{9G
eUQLdalN;K_kwZi)8ePw$_jYTJXYP|sbHRVMJtLO@

diff --git a/Source/ConformalDecals/ModuleConformalDecal.cs b/Source/ConformalDecals/ModuleConformalDecal.cs
index b8e7039..20a28f7 100644
--- a/Source/ConformalDecals/ModuleConformalDecal.cs
+++ b/Source/ConformalDecals/ModuleConformalDecal.cs
@@ -13,11 +13,11 @@ namespace ConformalDecals {
          UI_FloatRange(minValue = 0.05f, maxValue = 4f, stepIncrement = 0.05f)]
         public float depth = 1.0f;
 
-        [KSPField(guiName = "#LOC_ConformalDecals_gui-opacity", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F2", guiUnits = "m"),
+        [KSPField(guiName = "#LOC_ConformalDecals_gui-opacity", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "P0"),
          UI_FloatRange(minValue = 0.0f, maxValue = 1f, stepIncrement = 0.05f)]
         public float opacity = 1.0f;
 
-        [KSPField(guiName = "#LOC_ConformalDecals_gui-cutoff", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F2", guiUnits = "m"),
+        [KSPField(guiName = "#LOC_ConformalDecals_gui-cutoff", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "P0"),
          UI_FloatRange(minValue = 0.0f, maxValue = 1f, stepIncrement = 0.05f)]
         public float cutoff = 0.5f;
 
@@ -97,7 +97,7 @@ namespace ConformalDecals {
 
                 // find projector transform
                 if (string.IsNullOrEmpty(decalProjector)) {
-                    decalProjectorTransform = part.transform.Find("model");
+                    decalProjectorTransform = part.transform;
                 }
                 else {
                     decalProjectorTransform = part.FindModelTransform(decalProjector);