diff --git a/.gitignore b/.gitignore index 5b4dea1..7154405 100644 --- a/.gitignore +++ b/.gitignore @@ -49,5 +49,7 @@ Source/ConformalDecals/bin .ds_store *.sublime* .idea +.vs obj *.swp +Source/.editorconfig diff --git a/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/GameData/ConformalDecals/Plugins/ConformalDecals.dll index 6607c25..ede398e 100644 Binary files a/GameData/ConformalDecals/Plugins/ConformalDecals.dll and b/GameData/ConformalDecals/Plugins/ConformalDecals.dll differ diff --git a/Source/ConformalDecals.sln b/Source/ConformalDecals.sln index 2e27ad0..b57dbb5 100644 --- a/Source/ConformalDecals.sln +++ b/Source/ConformalDecals.sln @@ -1,6 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConformalDecals", "ConformalDecals/ConformalDecals.csproj", "{1EA983F9-42E5-494E-9683-FDAC9C9121F4}" +# Visual Studio Version 16 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConformalDecals", "ConformalDecals\ConformalDecals.csproj", "{1EA983F9-42E5-494E-9683-FDAC9C9121F4}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C2564402-B081-479B-B723-D5C065BC884E}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,4 +19,28 @@ Global {1EA983F9-42E5-494E-9683-FDAC9C9121F4}.Release|Any CPU.ActiveCfg = Release|Any CPU {1EA983F9-42E5-494E-9683-FDAC9C9121F4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + Policies = $0 + $0.DotNetNamingPolicy = $1 + $1.DirectoryNamespaceAssociation = PrefixedHierarchical + $0.TextStylePolicy = $2 + $2.FileWidth = 80 + $2.TabsToSpaces = True + $2.scope = text/x-csharp + $2.NoTabsAfterNonTabs = True + $2.EolMarker = Unix + $0.CSharpFormattingPolicy = $3 + $3.NewLinesForBracesInTypes = False + $3.NewLinesForBracesInMethods = False + $3.NewLinesForBracesInProperties = False + $3.NewLinesForBracesInAccessors = False + $3.NewLinesForBracesInAnonymousMethods = False + $3.NewLinesForBracesInControlBlocks = False + $3.NewLinesForBracesInAnonymousTypes = False + $3.NewLinesForBracesInObjectCollectionArrayInitializers = False + $3.NewLinesForBracesInLambdaExpressionBody = False + $3.scope = text/x-csharp + $3.SpaceAfterCast = True + $0.StandardHeader = $4 + EndGlobalSection EndGlobal diff --git a/Source/ConformalDecals/ConformalDecals.csproj b/Source/ConformalDecals/ConformalDecals.csproj index 08605e4..909c3a8 100644 --- a/Source/ConformalDecals/ConformalDecals.csproj +++ b/Source/ConformalDecals/ConformalDecals.csproj @@ -35,19 +35,22 @@ - + - + - + + + + - + diff --git a/Source/ConformalDecals/ModuleConformalText.cs b/Source/ConformalDecals/ModuleConformalText.cs index 608fb58..cb33a41 100644 --- a/Source/ConformalDecals/ModuleConformalText.cs +++ b/Source/ConformalDecals/ModuleConformalText.cs @@ -123,7 +123,7 @@ namespace ConformalDecals { vertical = newVertical; lineSpacing = newLineSpacing; charSpacing = newCharSpacing; - UpdateText(); + UpdateAll(); foreach (var decal in part.symmetryCounterparts.Select(o => o.GetComponent())) { decal.text = newText; @@ -132,7 +132,7 @@ namespace ConformalDecals { decal.vertical = newVertical; decal.lineSpacing = newLineSpacing; decal.charSpacing = newCharSpacing; - decal.UpdateText(); + decal.UpdateAll(); } } @@ -271,16 +271,9 @@ namespace ConformalDecals { } } - protected void UpdateText() { - UpdateTextures(); - UpdateMaterials(); - UpdateScale(); - UpdateTargets(); - } - private IEnumerator UpdateTextLate() { yield return null; - UpdateText(); + UpdateAll(); } protected override void UpdateTextures() {