diff --git a/Source/ConformalDecals/ConformalDecals.csproj b/Source/ConformalDecals/ConformalDecals.csproj index 19d5ed4..b748385 100644 --- a/Source/ConformalDecals/ConformalDecals.csproj +++ b/Source/ConformalDecals/ConformalDecals.csproj @@ -54,11 +54,11 @@ - - - - - + + + + + diff --git a/Source/ConformalDecals/MaterialModifiers/MaterialColorProperty.cs b/Source/ConformalDecals/MaterialProperties/MaterialColorProperty.cs similarity index 91% rename from Source/ConformalDecals/MaterialModifiers/MaterialColorProperty.cs rename to Source/ConformalDecals/MaterialProperties/MaterialColorProperty.cs index f60d388..7a665e3 100644 --- a/Source/ConformalDecals/MaterialModifiers/MaterialColorProperty.cs +++ b/Source/ConformalDecals/MaterialProperties/MaterialColorProperty.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace ConformalDecals.MaterialModifiers { +namespace ConformalDecals.MaterialProperties { public class MaterialColorProperty : MaterialProperty { [SerializeField] public Color color; diff --git a/Source/ConformalDecals/MaterialModifiers/MaterialFloatProperty.cs b/Source/ConformalDecals/MaterialProperties/MaterialFloatProperty.cs similarity index 91% rename from Source/ConformalDecals/MaterialModifiers/MaterialFloatProperty.cs rename to Source/ConformalDecals/MaterialProperties/MaterialFloatProperty.cs index 1dad8df..db5c987 100644 --- a/Source/ConformalDecals/MaterialModifiers/MaterialFloatProperty.cs +++ b/Source/ConformalDecals/MaterialProperties/MaterialFloatProperty.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace ConformalDecals.MaterialModifiers { +namespace ConformalDecals.MaterialProperties { public class MaterialFloatProperty : MaterialProperty { [SerializeField] public float value; diff --git a/Source/ConformalDecals/MaterialModifiers/MaterialProperty.cs b/Source/ConformalDecals/MaterialProperties/MaterialProperty.cs similarity index 98% rename from Source/ConformalDecals/MaterialModifiers/MaterialProperty.cs rename to Source/ConformalDecals/MaterialProperties/MaterialProperty.cs index 0bce511..6416d22 100644 --- a/Source/ConformalDecals/MaterialModifiers/MaterialProperty.cs +++ b/Source/ConformalDecals/MaterialProperties/MaterialProperty.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace ConformalDecals.MaterialModifiers { +namespace ConformalDecals.MaterialProperties { public abstract class MaterialProperty : ScriptableObject { public string PropertyName { get => _propertyName; diff --git a/Source/ConformalDecals/MaterialModifiers/MaterialPropertyCollection.cs b/Source/ConformalDecals/MaterialProperties/MaterialPropertyCollection.cs similarity index 99% rename from Source/ConformalDecals/MaterialModifiers/MaterialPropertyCollection.cs rename to Source/ConformalDecals/MaterialProperties/MaterialPropertyCollection.cs index 8698f88..ce464eb 100644 --- a/Source/ConformalDecals/MaterialModifiers/MaterialPropertyCollection.cs +++ b/Source/ConformalDecals/MaterialProperties/MaterialPropertyCollection.cs @@ -5,7 +5,7 @@ using UniLinq; using UnityEngine; using UnityEngine.Rendering; -namespace ConformalDecals.MaterialModifiers { +namespace ConformalDecals.MaterialProperties { public class MaterialPropertyCollection : ScriptableObject, ISerializationCallbackReceiver { public int RenderQueue { get => _renderQueue; diff --git a/Source/ConformalDecals/MaterialModifiers/MaterialTextureProperty.cs b/Source/ConformalDecals/MaterialProperties/MaterialTextureProperty.cs similarity index 98% rename from Source/ConformalDecals/MaterialModifiers/MaterialTextureProperty.cs rename to Source/ConformalDecals/MaterialProperties/MaterialTextureProperty.cs index e6004bb..e1b229c 100644 --- a/Source/ConformalDecals/MaterialModifiers/MaterialTextureProperty.cs +++ b/Source/ConformalDecals/MaterialProperties/MaterialTextureProperty.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace ConformalDecals.MaterialModifiers { +namespace ConformalDecals.MaterialProperties { public class MaterialTextureProperty : MaterialProperty { [SerializeField] public bool isNormal; [SerializeField] public bool isMain; diff --git a/Source/ConformalDecals/ModuleConformalDecal.cs b/Source/ConformalDecals/ModuleConformalDecal.cs index 863eea7..6eee5e2 100644 --- a/Source/ConformalDecals/ModuleConformalDecal.cs +++ b/Source/ConformalDecals/ModuleConformalDecal.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using ConformalDecals.MaterialModifiers; +using ConformalDecals.MaterialProperties; using ConformalDecals.Util; using UnityEngine; @@ -48,6 +48,8 @@ namespace ConformalDecals { /// [KSPField] public string decalProjector = "Decal-Projector"; + [KSPField] public string decalCollider = "Decal-Collider"; + // Parameters [KSPField] public bool scaleAdjustable = true;