From b3d817e0c3a06e416018456e60aea2373a9e6f8d Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Mon, 8 Jun 2020 13:14:25 -0700 Subject: [PATCH] more things --- Source/ConformalDecals/ConformalDecals.csproj | 2 ++ Source/ConformalDecals/ModuleConformalDecal.cs | 16 ++++++++-------- Source/ConformalDecals/ProjectionTarget.cs | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Source/ConformalDecals/ConformalDecals.csproj b/Source/ConformalDecals/ConformalDecals.csproj index 3372882..912b4f8 100644 --- a/Source/ConformalDecals/ConformalDecals.csproj +++ b/Source/ConformalDecals/ConformalDecals.csproj @@ -29,6 +29,8 @@ TRACE prompt 4 + bin\Release\ConformalDecals.xml + CS1591 diff --git a/Source/ConformalDecals/ModuleConformalDecal.cs b/Source/ConformalDecals/ModuleConformalDecal.cs index 05fc685..f9fb4e7 100644 --- a/Source/ConformalDecals/ModuleConformalDecal.cs +++ b/Source/ConformalDecals/ModuleConformalDecal.cs @@ -36,6 +36,9 @@ namespace ConformalDecals { UI_FloatRange(stepIncrement = 0.05f)] public float cutoff = 0.5f; + /// + /// Shader name. Should be one that supports decal projection. + /// [KSPField] public string shader = "ConformalDecals/Paint/Diffuse"; /// @@ -176,6 +179,7 @@ namespace ConformalDecals { } } + /// public override void OnAwake() { base.OnAwake(); @@ -187,6 +191,7 @@ namespace ConformalDecals { } } + /// public override void OnLoad(ConfigNode node) { this.Log("Loading module"); try { @@ -294,6 +299,7 @@ namespace ConformalDecals { } } + /// public override void OnIconCreate() { UpdateScale(); } @@ -390,8 +396,8 @@ namespace ConformalDecals { Camera.onPreCull += Render; UpdateMaterials(); - UpdateScale(); UpdateTargets(); + UpdateScale(); } protected void OnDetach() { @@ -425,15 +431,9 @@ namespace ConformalDecals { _orthoMatrix[1, 1] = 1 / size.y; _orthoMatrix[2, 2] = 1 / depth; - // generate bounding box for decal for culling purposes - _decalBounds.center = Vector3.forward * (depth / 2); - _decalBounds.extents = new Vector3(size.x / 2, size.y / 2, depth / 2); - - var bounds = new OrientedBounds(decalProjectorTransform.localToWorldMatrix, _decalBounds); - // update projection foreach (var target in _targets) { - target.Project(_orthoMatrix, bounds, decalProjectorTransform, useBaseNormal); + target.Project(_orthoMatrix, decalProjectorTransform, useBaseNormal); } } else { diff --git a/Source/ConformalDecals/ProjectionTarget.cs b/Source/ConformalDecals/ProjectionTarget.cs index c4bb22e..405e9c7 100644 --- a/Source/ConformalDecals/ProjectionTarget.cs +++ b/Source/ConformalDecals/ProjectionTarget.cs @@ -21,7 +21,7 @@ namespace ConformalDecals { _decalMPB = new MaterialPropertyBlock(); } - public void Project(Matrix4x4 orthoMatrix, OrientedBounds projectorBounds, Transform projector, bool useBaseNormal) { + public void Project(Matrix4x4 orthoMatrix, Transform projector, bool useBaseNormal) { _projectionEnabled = true; var targetMaterial = _targetRenderer.sharedMaterial;