Merge branch 'main' into release

drewcassidy · Dec 20, 2020 · 938babb · 938babb
2 parents 1e7c6d8 + 3173dd9
commit 938babb
Show file tree

Hide file tree

Showing 14 changed files with 128 additions and 227 deletions.
diff --git a/Assets/Scripts/TextRenderTest.cs b/Assets/Scripts/TextRenderTest.cs
@@ -30,6 +30,8 @@ void Start() {
         Debug.Log("starting...");
 
         StartCoroutine(OnRender());
+        var thing = new GameObject();
+        thing.AddComponent<TextMeshPro>();
     }
 
     // Update is called once per frame

diff --git a/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/GameData/ConformalDecals/Plugins/ConformalDecals.dll
diff --git a/GameData/ConformalDecals/Versioning/ConformalDecals.version b/GameData/ConformalDecals/Versioning/ConformalDecals.version
@@ -6,14 +6,14 @@
     {
         "MAJOR":0,
         "MINOR":2,
-        "PATCH":6,
-        "BUILD":1
+        "PATCH":7,
+        "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
-        "MINOR":10,
-        "PATCH":1
+        "MINOR":11,
+        "PATCH":0
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,
@@ -22,7 +22,7 @@
     },
     "KSP_VERSION_MAX":{
         "MAJOR":1,
-        "MINOR":10,
+        "MINOR":11,
         "PATCH":99
     }
 }
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# Conformal Decals v0.2.6
-[![Build Status](https://travis-ci.org/drewcassidy/KSP-Conformal-Decals.svg?branch=release)](https://travis-ci.org/drewcassidy/KSP-Conformal-Decals) [![Art: CC BY-SA 4.0](https://img.shields.io/badge/Art%20License-CC%20BY--SA%204.0-orange.svg)](https://creativecommons.org/licenses/by-sa/4.0/) [![Code: GPL v3](https://img.shields.io/badge/Code%20License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) 
+# Conformal Decals v0.2.7
+[![Build Status](https://travis-ci.com/drewcassidy/KSP-Conformal-Decals.svg?branch=release)](https://travis-ci.com/drewcassidy/KSP-Conformal-Decals) [![Art: CC BY-SA 4.0](https://img.shields.io/badge/Art%20License-CC%20BY--SA%204.0-orange.svg)](https://creativecommons.org/licenses/by-sa/4.0/) [![Code: GPL v3](https://img.shields.io/badge/Code%20License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) 
 
 ![Screenshot](http://pileof.rocks/KSP/images/ConformalDecalsHeader.png)
 

diff --git a/Source/ConformalDecals/ConformalDecals.csproj b/Source/ConformalDecals/ConformalDecals.csproj
@@ -5,6 +5,7 @@
         <IsPackable>false</IsPackable>
         <PlatformTarget>x64</PlatformTarget>
         <NoWarn>1701;1702;CS0649;CS1591</NoWarn>
+        <AssemblyVersion>0.2.7</AssemblyVersion>
     </PropertyGroup>
 
     <ItemGroup>
@@ -35,19 +36,19 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Compile Remove="dlls\**"/>
+        <Compile Remove="dlls\**" />
     </ItemGroup>
 
     <ItemGroup>
-        <EmbeddedResource Remove="dlls\**"/>
+        <EmbeddedResource Remove="dlls\**" />
     </ItemGroup>
 
     <ItemGroup>
-        <None Remove="dlls\**"/>
+        <None Remove="dlls\**" />
     </ItemGroup>
 
     <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-        <Exec Command="/bin/cp -v '$(OutDir)ConformalDecals.dll' '$(SolutionDir)../GameData/ConformalDecals/Plugins'" IgnoreExitCode="true"/>
+        <Exec Command="/bin/cp -v '$(OutDir)ConformalDecals.dll' '$(SolutionDir)../GameData/ConformalDecals/Plugins'" IgnoreExitCode="true" />
         <!--Fuck you MSBuild stop trying to run CMD.exe on macOS-->
     </Target>
 

diff --git a/Source/ConformalDecals/ModuleConformalText.cs b/Source/ConformalDecals/ModuleConformalText.cs
@@ -89,7 +89,6 @@ public void SetOutlineColor() {
         private MaterialColorProperty   _outlineColorProperty;
         private MaterialFloatProperty   _outlineWidthProperty;
 
-        private TextRenderJob _currentJob;
         private DecalText     _currentText;
 
         public override void OnLoad(ConfigNode node) {
@@ -253,7 +252,6 @@ private void UpdateTextRecursive() {
                 decal.charSpacing = charSpacing;
                 decal.lineSpacing = lineSpacing;
 
-                decal._currentJob = _currentJob;
                 decal._currentText = _currentText;
                 decal.UpdateText();
             }
@@ -267,7 +265,7 @@ private IEnumerator UpdateTextLate() {
         private void UpdateText() {
             // Render text
             var newText = new DecalText(text, font, style, vertical, lineSpacing, charSpacing);
-            var output = TextRenderer.UpdateTextNow(_currentText, newText);
+            var output = TextRenderer.UpdateText(_currentText, newText);
             _currentText = newText;
 
             UpdateTexture(output);

diff --git a/Source/ConformalDecals/Properties/AssemblyInfo.cs b/Source/ConformalDecals/Properties/AssemblyInfo.cs
@@ -1 +1 @@
-[assembly: KSPAssembly("ConformalDecals", 0, 2, 6)]
+[assembly: KSPAssembly("ConformalDecals", 0, 2)]
diff --git a/Source/ConformalDecals/Text/DecalFont.cs b/Source/ConformalDecals/Text/DecalFont.cs
@@ -105,5 +105,9 @@ public override int GetHashCode() {
         public void OnBeforeSerialize() { }
 
         public void OnAfterDeserialize() { }
+
+        public override string ToString() {
+            return _title;
+        }
     }
 }
diff --git a/Source/ConformalDecals/Text/DecalText.cs b/Source/ConformalDecals/Text/DecalText.cs
@@ -86,5 +86,9 @@ public override int GetHashCode() {
         public static bool operator !=(DecalText left, DecalText right) {
             return !Equals(left, right);
         }
+
+        public override string ToString() {
+            return $"{nameof(_text)}: {_text}, {nameof(_font)}: {_font}, {nameof(_style)}: {_style}, {nameof(_vertical)}: {_vertical}, {nameof(_lineSpacing)}: {_lineSpacing}, {nameof(_charSpacing)}: {_charSpacing}";
+        }
     }
 }
diff --git a/Source/ConformalDecals/Text/TextRenderJob.cs b/Source/ConformalDecals/Text/TextRenderJob.cs
diff --git a/Source/ConformalDecals/Text/TextRenderOutput.cs b/Source/ConformalDecals/Text/TextRenderOutput.cs
@@ -9,7 +9,7 @@ public class TextRenderOutput {
         /// The rectangle that the rendered text takes up within the texture
         public Rect Window { get; private set; }
 
-        /// The number of users for this render output. If 0, it can be discarded from the cache and the texture reused
+        /// The number of users for this render output. If 0, it can be discarded from the cache
         public int UserCount { get; set; }
 
         public TextRenderOutput(Texture2D texture, Rect window) {