From 10300f7f804c636f0507c5217f9bde51118619a7 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Mon, 8 Jun 2020 02:16:30 -0700 Subject: [PATCH] Temporarily remove nonfunctional intersection code Will probably fix at a later date, but its not needed for the plugin to work --- .../Plugins/ConformalDecals.dll | 2 +- Source/ConformalDecals/ProjectionTarget.cs | 38 ++++++++----------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll index 2b63448..55a46c8 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:8c0cdc1e59cda8543d4982273469cf0bd577130fd451dc4ac219748f5e1ac9df +oid sha256:1f8a1ff89feeae2d29fb7b378f6b65a2daea3962dfd8c36b136be8858487ec37 size 34816 diff --git a/Source/ConformalDecals/ProjectionTarget.cs b/Source/ConformalDecals/ProjectionTarget.cs index 232f9cf..c4bb22e 100644 --- a/Source/ConformalDecals/ProjectionTarget.cs +++ b/Source/ConformalDecals/ProjectionTarget.cs @@ -22,37 +22,31 @@ namespace ConformalDecals { } public void Project(Matrix4x4 orthoMatrix, OrientedBounds projectorBounds, Transform projector, bool useBaseNormal) { - var targetBounds = _targetRenderer.bounds; - if (projectorBounds.Intersects(targetBounds)) { - _projectionEnabled = true; + _projectionEnabled = true; - var targetMaterial = _targetRenderer.sharedMaterial; - var projectorToTargetMatrix = target.worldToLocalMatrix * projector.localToWorldMatrix; + var targetMaterial = _targetRenderer.sharedMaterial; + var projectorToTargetMatrix = target.worldToLocalMatrix * projector.localToWorldMatrix; - var projectionMatrix = orthoMatrix * projectorToTargetMatrix.inverse; - var decalNormal = projectorToTargetMatrix.MultiplyVector(Vector3.back).normalized; - var decalTangent = projectorToTargetMatrix.MultiplyVector(Vector3.right).normalized; + var projectionMatrix = orthoMatrix * projectorToTargetMatrix.inverse; + var decalNormal = projectorToTargetMatrix.MultiplyVector(Vector3.back).normalized; + var decalTangent = projectorToTargetMatrix.MultiplyVector(Vector3.right).normalized; - _decalMPB.SetMatrix(DecalPropertyIDs._ProjectionMatrix, projectionMatrix); - _decalMPB.SetVector(DecalPropertyIDs._DecalNormal, decalNormal); - _decalMPB.SetVector(DecalPropertyIDs._DecalTangent, decalTangent); + _decalMPB.SetMatrix(DecalPropertyIDs._ProjectionMatrix, projectionMatrix); + _decalMPB.SetVector(DecalPropertyIDs._DecalNormal, decalNormal); + _decalMPB.SetVector(DecalPropertyIDs._DecalTangent, decalTangent); - if (useBaseNormal && targetMaterial.HasProperty(DecalPropertyIDs._BumpMap)) { - var normal = targetMaterial.GetTexture(DecalPropertyIDs._BumpMap); - if (normal != null) { + if (useBaseNormal && targetMaterial.HasProperty(DecalPropertyIDs._BumpMap)) { + var normal = targetMaterial.GetTexture(DecalPropertyIDs._BumpMap); + if (normal != null) { - _decalMPB.SetTexture(DecalPropertyIDs._BumpMap, targetMaterial.GetTexture(DecalPropertyIDs._BumpMap)); + _decalMPB.SetTexture(DecalPropertyIDs._BumpMap, targetMaterial.GetTexture(DecalPropertyIDs._BumpMap)); - var normalScale = targetMaterial.GetTextureScale(DecalPropertyIDs._BumpMap); - var normalOffset = targetMaterial.GetTextureOffset(DecalPropertyIDs._BumpMap); + var normalScale = targetMaterial.GetTextureScale(DecalPropertyIDs._BumpMap); + var normalOffset = targetMaterial.GetTextureOffset(DecalPropertyIDs._BumpMap); - _decalMPB.SetVector(DecalPropertyIDs._BumpMap_ST, new Vector4(normalScale.x, normalScale.y, normalOffset.x, normalOffset.y)); - } + _decalMPB.SetVector(DecalPropertyIDs._BumpMap_ST, new Vector4(normalScale.x, normalScale.y, normalOffset.x, normalOffset.y)); } } - else { - _projectionEnabled = false; - } } public bool Render(Material decalMaterial, MaterialPropertyBlock partMPB, Camera camera) {