diff --git a/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/GameData/ConformalDecals/Plugins/ConformalDecals.dll index 054bcd3..e55b33d 100644 --- a/GameData/ConformalDecals/Plugins/ConformalDecals.dll +++ b/GameData/ConformalDecals/Plugins/ConformalDecals.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:930a6697e1070339e12e612e0db5c5bb89237960ea941de9c0e1db0d8694dfd1 +oid sha256:162fe1f8fe6eb10578271fc3dfb8b69ec9654eee698afb51db935eb45c95643f size 41472 diff --git a/Source/ConformalDecals/DecalConfig.cs b/Source/ConformalDecals/DecalConfig.cs index b0b8e78..9304988 100644 --- a/Source/ConformalDecals/DecalConfig.cs +++ b/Source/ConformalDecals/DecalConfig.cs @@ -6,7 +6,7 @@ namespace ConformalDecals { public static class DecalConfig { private static Texture2D _blankNormal; private static List _shaderBlacklist; - private static int _decalLayer = 3; + private static int _decalLayer = 31; public static Texture2D BlankNormal => _blankNormal; public static int DecalLayer => _decalLayer; diff --git a/Source/ConformalDecals/ModuleConformalDecal.cs b/Source/ConformalDecals/ModuleConformalDecal.cs index 9b67eea..466ea57 100644 --- a/Source/ConformalDecals/ModuleConformalDecal.cs +++ b/Source/ConformalDecals/ModuleConformalDecal.cs @@ -57,8 +57,6 @@ namespace ConformalDecals { // INTERNAL VALUES - - [KSPField(guiName = "#LOC_ConformalDecals_gui-scale", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F2", guiUnits = "m"), UI_FloatRange(stepIncrement = 0.05f)] public float scale = 1.0f; @@ -78,6 +76,9 @@ namespace ConformalDecals { [KSPField(guiName = "#LOC_ConformalDecals_gui-wear", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F0"), UI_FloatRange()] public float wear = 100; + + [KSPField(isPersistant = true)] + public bool projectMultiple; // reserved for future features. do not modify [KSPField] public MaterialPropertyCollection materialProperties; @@ -245,7 +246,7 @@ namespace ConformalDecals { materialProperties.RenderQueue = DecalQueue; - _boundsCollider = decalProjectorTransform.GetComponent(); + _boundsCollider = decalColliderTransform.GetComponent(); UpdateMaterials(); @@ -260,6 +261,7 @@ namespace ConformalDecals { } if (HighLogic.LoadedSceneIsFlight) { + Part.layerMask |= 1 << DecalConfig.DecalLayer; decalColliderTransform.gameObject.layer = DecalConfig.DecalLayer; } }