Remove broken culling code and fix flag switching

pull/13/head
Andrew Cassidy 4 years ago
parent 4ed65bdf4a
commit f0c5a112fe
No known key found for this signature in database
GPG Key ID: 963017B38FD477A1

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:81553ade6fce5028845f7a6753471e5106dc4768f79a2d482fa03dd0cc8f5d42
oid sha256:7e601de8640b2b5019203d5c39452e10c804efa5d6f6631dea8787da3012927c
size 38400

@ -51,7 +51,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="DecalBoundsBehaviour.cs" />
<Compile Include="DecalConfig.cs" />
<Compile Include="DecalIconFixer.cs" />
<Compile Include="DecalPropertyIDs.cs" />

@ -1,12 +0,0 @@
using System;
using UnityEngine;
namespace ConformalDecals {
public class DecalBoundsBehaviour : MonoBehaviour {
public ModuleConformalDecal decalRenderer;
private void OnWillRenderObject() {
decalRenderer._shouldRender = true;
}
}
}

@ -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));
}
}

@ -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<DecalBoundsBehaviour>();
boundsBehaviour.decalRenderer = this;
_boundsCollider = decalBoundsTransform.GetComponent<BoxCollider>();
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<MeshRenderer>().material = _previewMaterial;
if (!_isAttached) decalFrontTransform.GetComponent<MeshRenderer>().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);

@ -82,7 +82,7 @@ namespace ConformalDecals {
}
private void OnEditorFlagSelected(string newFlagUrl) {
if (useCustomFlag) {
if (!useCustomFlag) {
SetFlag(newFlagUrl);
SetFlagSymmetryCounterparts(newFlagUrl);
}

Loading…
Cancel
Save