diff --git a/GameData/ConformalDecals/Parts/decal-text.cfg b/GameData/ConformalDecals/Parts/decal-text.cfg index 4e3e391..37df801 100644 --- a/GameData/ConformalDecals/Parts/decal-text.cfg +++ b/GameData/ConformalDecals/Parts/decal-text.cfg @@ -52,7 +52,7 @@ PART name = ModuleConformalText text = Text - font = Calibri SDF + fontName = Calibri SDF fillColor = #000000FF outlineColor = #FFFFFFFF fillEnabled = true diff --git a/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/GameData/ConformalDecals/Plugins/ConformalDecals.dll index fba5b8b..f4e5a10 100644 Binary files a/GameData/ConformalDecals/Plugins/ConformalDecals.dll and b/GameData/ConformalDecals/Plugins/ConformalDecals.dll differ diff --git a/Source/ConformalDecals/ModuleConformalDecal.cs b/Source/ConformalDecals/ModuleConformalDecal.cs index 1ff3b53..0cce9a5 100644 --- a/Source/ConformalDecals/ModuleConformalDecal.cs +++ b/Source/ConformalDecals/ModuleConformalDecal.cs @@ -31,7 +31,7 @@ namespace ConformalDecals { [KSPField] public bool scaleAdjustable = true; [KSPField] public float defaultScale = 1; - [KSPField] public Vector2 scaleRange = new Vector2(0, 4); + [KSPField] public Vector2 scaleRange = new Vector2(0, 10); [KSPField] public DecalScaleMode scaleMode = DecalScaleMode.HEIGHT; @@ -60,19 +60,19 @@ namespace ConformalDecals { // INTERNAL VALUES [KSPField(guiName = "#LOC_ConformalDecals_gui-scale", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F2", guiUnits = "m"), - UI_FloatRange(stepIncrement = 0.05f)] + UI_FloatRange()] public float scale = 1.0f; [KSPField(guiName = "#LOC_ConformalDecals_gui-depth", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F2", guiUnits = "m"), - UI_FloatRange(stepIncrement = 0.02f)] + UI_FloatRange()] public float depth = 0.2f; [KSPField(guiName = "#LOC_ConformalDecals_gui-opacity", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "P0"), - UI_FloatRange(stepIncrement = 0.05f)] + UI_FloatRange()] public float opacity = 1.0f; [KSPField(guiName = "#LOC_ConformalDecals_gui-cutoff", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "P0"), - UI_FloatRange(stepIncrement = 0.05f)] + UI_FloatRange()] public float cutoff = 0.5f; [KSPField(guiName = "#LOC_ConformalDecals_gui-wear", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F0"), @@ -215,7 +215,7 @@ namespace ConformalDecals { foreach (var keyword in _decalMaterial.shaderKeywords) { this.Log($"keyword: {keyword}"); } - + if (HighLogic.LoadedSceneIsEditor) { UpdateTweakables(); } @@ -512,7 +512,7 @@ namespace ConformalDecals { cutoffField.guiActiveEditor = cutoffAdjustable; wearField.guiActiveEditor = useBaseNormal; - var steps = 40; + var steps = 20; if (scaleAdjustable) { var minValue = Mathf.Max(Mathf.Epsilon, scaleRange.x); @@ -521,7 +521,7 @@ namespace ConformalDecals { var scaleEditor = (UI_FloatRange) scaleField.uiControlEditor; scaleEditor.minValue = minValue; scaleEditor.maxValue = maxValue; - scaleEditor.stepIncrement = (maxValue - minValue) / steps; + scaleEditor.stepIncrement = 0.01f; //1cm scaleEditor.onFieldChanged = OnSizeTweakEvent; } @@ -532,7 +532,7 @@ namespace ConformalDecals { var depthEditor = (UI_FloatRange) depthField.uiControlEditor; depthEditor.minValue = minValue; depthEditor.maxValue = maxValue; - depthEditor.stepIncrement = (maxValue - minValue) / steps; + depthEditor.stepIncrement = 0.01f; //1cm depthEditor.onFieldChanged = OnSizeTweakEvent; } diff --git a/Source/ConformalDecals/ModuleConformalText.cs b/Source/ConformalDecals/ModuleConformalText.cs index 471f688..d2c85ce 100644 --- a/Source/ConformalDecals/ModuleConformalText.cs +++ b/Source/ConformalDecals/ModuleConformalText.cs @@ -104,6 +104,7 @@ namespace ConformalDecals { if (ParseUtil.ParseStringIndirect(ref fontName, node, "fontName")) { font = DecalConfig.GetFont(fontName); } + else if (font == null) font = DecalConfig.GetFont("Calibri SDF"); int styleInt = 0; if (ParseUtil.ParseIntIndirect(ref styleInt, node, "style")) { diff --git a/Source/ConformalDecals/Text/DecalText.cs b/Source/ConformalDecals/Text/DecalText.cs index 4de8081..d6af8d1 100644 --- a/Source/ConformalDecals/Text/DecalText.cs +++ b/Source/ConformalDecals/Text/DecalText.cs @@ -32,6 +32,7 @@ namespace ConformalDecals.Text { /// The text formatted with newlines for vertical text public string FormattedText { get { + if (string.IsNullOrWhiteSpace(Text)) return "•"; if (Vertical) { return Regex.Replace(Text, @"(.)", "$1\n"); } diff --git a/changelog.txt b/changelog.txt index e3bb636..671d31f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,11 @@ v0.2.4 - Fixes: - Fixed red text appearing on planets due to KSP bug by clearing render textures afterwards. - - Fixed fonts not saving correctly + - Fixed fonts not saving correctly. +- Changes: + - Lowered step size for decal size and depth to 1cm. + - Changed default max size to 10m. + - Text decals now show as a circle if they contain only whitespace. v0.2.3 ------