From d54887414f978dcf3234ff2a4352858c8b27b2de Mon Sep 17 00:00:00 2001
From: drewcassidy <drewcassidy@me.com>
Date: Mon, 1 Jun 2020 15:57:57 -0700
Subject: [PATCH] Fix part highlighting and the collider disappearing

Completes #2
---
 .../ConformalDecals/Assets/decal-blank.mu     | Bin 4294 -> 4294 bytes
 .../Plugins/ConformalDecals.dll               | Bin 26624 -> 26624 bytes
 .../ConformalDecals/ModuleConformalDecal.cs   |  16 ++++++++--------
 Source/ConformalDecals/ProjectionTarget.cs    |   2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Distribution/GameData/ConformalDecals/Assets/decal-blank.mu b/Distribution/GameData/ConformalDecals/Assets/decal-blank.mu
index f1d1a87e5660e7344e6a633ffc1f94592f4004c2..7af0dce1d039233215c0a859953ea28a03b0973c 100644
GIT binary patch
delta 452
zcmX@6cua9aA7g!kJp%-oFfcd(F$05HfVaIufsoz5|Mft*2Kzri`optdw*Mh~<2lnp
z>?Kz1fbtm_Zdt_JKbTc$3srBt>_WP|!zXiFkX|4*<~osYFYr$o&X+k*X5X;W!3M0J
zA86sT8C76~APtjcm>z?yg@K0s5MvO0_N(>wFLRIY`PFmV1}L}x(eZkF(>(v(hks~*
ztiVwJTB^o=@vjCO4KqVKko^0}RrZbi_xEmUgz#5R%(vG#)ogpOU?W(*u&F-J{%_>g
zz2PZazygySyzSo#GTF7?7Y8|We`=+Ry}xPX-pRenU_Q%kF?+w2m3Gx0u3&zTxT^i{
z+DUdcxu#%#=Eqrf-`LLD^<>3@`IBC(wd*gwXZNNj6wKfB|D^3}6%~8gOHN?EytK5J
o-Hc9UdzV-{uz-tKw#}8CK>KEWVf)PzEG3+iJ9tYr@f~9V0NePXUH||9

delta 453
zcmX@6cua9aA7ecO5H#5T`(JPWABaJ0gZ)8vKa!(?YzGsdq%i}7f{D`N1R$Tm1f*ul
zQeC^fuQI@VkopBO%yvP~3P5_n@^`8Z+TLj>fvexLztL9yKp9Bh7^FYppRlde-x?qv
zXg)vCfP}|uY#^31m`s*odR)IB<R}Pe0J1?C1{(IWU#;ICoqOEod(Z7XAh}1!>-U@F
z`&%FWp|KaD7FGRgsha(5zZ&*vni=i`$$y?)wf`;OecLsS5dO-E`TLnpHSfJ&un{bu
z*HoXk|9I3^+vJojV1fPy@BM29nfCSH7Y92gtI}nEqDiD}U#~Kl&$U}@f7{B+eT5#b
zVE$xr)%{9!llJN7nu7ToKhE0c&wh4ac2+Ey-}YkdzWU;O`#$%Cg8BCUPwsuFqOxE8
yk`tJJS6bR@-_B0u{nD{^U;$67>^(bk0{5@c7v8^Ff~ACW@&w+3&3|}LF#!Nu!L~jC

diff --git a/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll
index e10635015efd78e164ef4c7e39e14ffc523d4c78..c36e025bdc6ed26ca0fb456f7a7b924fb6aef521 100644
GIT binary patch
delta 2473
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

delta 2505
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

diff --git a/Source/ConformalDecals/ModuleConformalDecal.cs b/Source/ConformalDecals/ModuleConformalDecal.cs
index c3b02e3..b8e7039 100644
--- a/Source/ConformalDecals/ModuleConformalDecal.cs
+++ b/Source/ConformalDecals/ModuleConformalDecal.cs
@@ -14,14 +14,14 @@ namespace ConformalDecals {
         public float depth = 1.0f;
 
         [KSPField(guiName = "#LOC_ConformalDecals_gui-opacity", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F2", guiUnits = "m"),
-         UI_FloatRange(minValue = 0.05f, maxValue = 4f, stepIncrement = 0.05f)]
+         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"),
-         UI_FloatRange(minValue = 0.05f, maxValue = 4f, stepIncrement = 0.05f)]
+         UI_FloatRange(minValue = 0.0f, maxValue = 1f, stepIncrement = 0.05f)]
         public float cutoff = 0.5f;
 
-        [KSPField(guiName = "#LOC_ConformalDecals_gui-aspectratio", guiActive = true, guiFormat = "F2")]
+        [KSPField(guiName = "#LOC_ConformalDecals_gui-aspectratio", guiActive = false, guiActiveEditor = true, guiFormat = "F2")]
         public float aspectRatio = 1.0f;
 
         [KSPField] public string decalFront     = string.Empty;
@@ -74,8 +74,6 @@ namespace ConformalDecals {
                 if (decalFrontTransform == null) throw new FormatException($"Could not find decalFront transform: '{decalFront}'.");
 
                 // find back transform
-                this.Log($"decalBack name is {decalBack}");
-                this.Log($"updateBaseScale is {updateBackScale}");
                 if (string.IsNullOrEmpty(decalBack)) {
                     if (updateBackScale) {
                         this.LogWarning("updateBackScale is true but has no specified decalBack transform!");
@@ -90,7 +88,7 @@ namespace ConformalDecals {
 
                 // find model transform
                 if (string.IsNullOrEmpty(decalModel)) {
-                    decalModelTransform = decalFrontTransform;
+                    decalModelTransform = part.transform.Find("model");
                 }
                 else {
                     decalModelTransform = part.FindModelTransform(decalModel);
@@ -232,7 +230,8 @@ namespace ConformalDecals {
             }
 
             // hide preview model
-            decalModelTransform.gameObject.SetActive(false);
+            decalFrontTransform.gameObject.SetActive(false);
+            decalBackTransform.gameObject.SetActive(false);
 
             // add to preCull delegate
             Camera.onPreCull += Render;
@@ -245,7 +244,8 @@ namespace ConformalDecals {
             _isAttached = false;
 
             // unhide preview model
-            decalModelTransform.gameObject.SetActive(true);
+            decalFrontTransform.gameObject.SetActive(true);
+            decalBackTransform.gameObject.SetActive(true);
 
             // remove from preCull delegate
             Camera.onPreCull -= Render;
diff --git a/Source/ConformalDecals/ProjectionTarget.cs b/Source/ConformalDecals/ProjectionTarget.cs
index 1accc20..f94dc01 100644
--- a/Source/ConformalDecals/ProjectionTarget.cs
+++ b/Source/ConformalDecals/ProjectionTarget.cs
@@ -69,7 +69,7 @@ namespace ConformalDecals {
         public bool Render(Material decalMaterial, MaterialPropertyBlock partMPB, Camera camera) {
             if (_projectionEnabled) {
                 decalMPB.SetFloat(PropertyIDs._RimFalloff, partMPB.GetFloat(PropertyIDs._RimFalloff));
-                decalMPB.SetColor(PropertyIDs._RimColor, partMPB.GetColor(PropertyIDs._RimFalloff));
+                decalMPB.SetColor(PropertyIDs._RimColor, partMPB.GetColor(PropertyIDs._RimColor));
 
                 Graphics.DrawMesh(_targetMesh, target.localToWorldMatrix, decalMaterial, 0, camera, 0, decalMPB, ShadowCastingMode.Off, true);