From 38ce1184eac0d16d5997c4e1e863453fc7b62c62 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Thu, 11 Jun 2020 21:58:04 -0700 Subject: [PATCH] Remove broken culling code and fix flag switching --- .../Plugins/ConformalDecals.dll | Bin 38400 -> 38400 bytes Source/ConformalDecals/ConformalDecals.csproj | 1 - .../ConformalDecals/DecalBoundsBehaviour.cs | 12 ------------ .../MaterialTextureProperty.cs | 4 ++-- .../ConformalDecals/ModuleConformalDecal.cs | 13 ++----------- Source/ConformalDecals/ModuleConformalFlag.cs | 2 +- 6 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 Source/ConformalDecals/DecalBoundsBehaviour.cs diff --git a/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll index d26d9ad57a0c9b91ac11dc9fae449e913cfe2c97..60acaafbacfaa9b291457491365fbef22add4f5e 100644 GIT binary patch literal 38400 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 E0ct>9V*mgE literal 38400 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 - diff --git a/Source/ConformalDecals/DecalBoundsBehaviour.cs b/Source/ConformalDecals/DecalBoundsBehaviour.cs deleted file mode 100644 index 4b6cc0b..0000000 --- a/Source/ConformalDecals/DecalBoundsBehaviour.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using UnityEngine; - -namespace ConformalDecals { - public class DecalBoundsBehaviour : MonoBehaviour { - public ModuleConformalDecal decalRenderer; - - private void OnWillRenderObject() { - decalRenderer._shouldRender = true; - } - } -} \ No newline at end of file diff --git a/Source/ConformalDecals/MaterialModifiers/MaterialTextureProperty.cs b/Source/ConformalDecals/MaterialModifiers/MaterialTextureProperty.cs index 595e66c..e6004bb 100644 --- a/Source/ConformalDecals/MaterialModifiers/MaterialTextureProperty.cs +++ b/Source/ConformalDecals/MaterialModifiers/MaterialTextureProperty.cs @@ -58,8 +58,8 @@ namespace ConformalDecals.MaterialModifiers { TextureUrl = node.GetValue("textureUrl"); } - if (node.HasValue("tileRect") && !autoTile) { - SetTile(ParsePropertyRect(node, "tileRect", true, _tileRect)); + if (node.HasValue("tile") && !autoTile) { + SetTile(ParsePropertyRect(node, "tile", true, _tileRect)); } } diff --git a/Source/ConformalDecals/ModuleConformalDecal.cs b/Source/ConformalDecals/ModuleConformalDecal.cs index 04097b7..c85030c 100644 --- a/Source/ConformalDecals/ModuleConformalDecal.cs +++ b/Source/ConformalDecals/ModuleConformalDecal.cs @@ -144,8 +144,6 @@ namespace ConformalDecals { private Material _previewMaterial; private BoxCollider _boundsCollider; - internal bool _shouldRender; - private int DecalQueue { get { _decalQueueCounter++; @@ -318,9 +316,6 @@ namespace ConformalDecals { materialProperties.RenderQueue = DecalQueue; - var boundsBehaviour = decalBoundsTransform.gameObject.AddComponent(); - boundsBehaviour.decalRenderer = this; - _boundsCollider = decalBoundsTransform.GetComponent(); UpdateMaterials(); @@ -439,10 +434,6 @@ namespace ConformalDecals { UpdateScale(); } - protected void Update() { - _shouldRender = false; - } - protected void UpdateScale() { var aspectRatio = materialProperties.AspectRatio; Vector2 size; @@ -509,7 +500,7 @@ namespace ConformalDecals { _decalMaterial = materialProperties.DecalMaterial; _previewMaterial = materialProperties.PreviewMaterial; - decalFrontTransform.GetComponent().material = _previewMaterial; + if (!_isAttached) decalFrontTransform.GetComponent().material = _previewMaterial; } protected void UpdateTargets() { @@ -618,7 +609,7 @@ namespace ConformalDecals { public void Render(Camera camera) { if (!_isAttached) return; - + // render on each target object foreach (var target in _targets) { target.Render(_decalMaterial, part.mpb, camera); diff --git a/Source/ConformalDecals/ModuleConformalFlag.cs b/Source/ConformalDecals/ModuleConformalFlag.cs index 31f226f..d82ea41 100644 --- a/Source/ConformalDecals/ModuleConformalFlag.cs +++ b/Source/ConformalDecals/ModuleConformalFlag.cs @@ -82,7 +82,7 @@ namespace ConformalDecals { } private void OnEditorFlagSelected(string newFlagUrl) { - if (useCustomFlag) { + if (!useCustomFlag) { SetFlag(newFlagUrl); SetFlagSymmetryCounterparts(newFlagUrl); }