From ffff9d629c558f4998f82ac31f7d82b01ae1fcb0 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Tue, 2 Jun 2020 19:11:05 -0700 Subject: [PATCH] small tweaks --- .../GameData/ConformalDecals/Plugins/ConformalDecals.dll | 2 +- Source/ConformalDecals/ModuleConformalDecal.cs | 1 - Source/ConformalDecals/ProjectionTarget.cs | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll index 7638b81..3546826 100644 --- a/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll +++ b/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b71c371f4db1ec56730e30d79c3dcfaeca02167a15e25d595e066907f4e5a3a +oid sha256:928c876dbb2ffadb39a567a5d74bef52f3fc466030b75e15ca67bd895ba2684e size 29184 diff --git a/Source/ConformalDecals/ModuleConformalDecal.cs b/Source/ConformalDecals/ModuleConformalDecal.cs index ac0f3bd..8e2217b 100644 --- a/Source/ConformalDecals/ModuleConformalDecal.cs +++ b/Source/ConformalDecals/ModuleConformalDecal.cs @@ -427,6 +427,5 @@ namespace ConformalDecals { target.Render(decalMaterial, part.mpb, camera); } } - } } \ No newline at end of file diff --git a/Source/ConformalDecals/ProjectionTarget.cs b/Source/ConformalDecals/ProjectionTarget.cs index 3cbbe31..ce69143 100644 --- a/Source/ConformalDecals/ProjectionTarget.cs +++ b/Source/ConformalDecals/ProjectionTarget.cs @@ -17,6 +17,9 @@ namespace ConformalDecals { // property block private readonly MaterialPropertyBlock _decalMPB; + + private static readonly int normalID = Shader.PropertyToID("_BumpMap"); + private static readonly int normalIDST = Shader.PropertyToID("_BumpMap_ST"); public ProjectionTarget(MeshRenderer targetRenderer, Mesh targetMesh, bool useBaseNormal) { target = targetRenderer.transform; @@ -26,10 +29,7 @@ namespace ConformalDecals { _decalMPB = new MaterialPropertyBlock(); - if (useBaseNormal) { - var normalID = Shader.PropertyToID("_BumpMap"); - var normalIDST = Shader.PropertyToID("_BumpMap_ST"); - + if (useBaseNormal && targetMaterial.HasProperty(normalID)) { var normal = targetMaterial.GetTexture(normalID); if (normal != null) {