drewcassidy/KSP-Conformal-Decals
1
0
Fork 0
mirror of https://github.com/drewcassidy/KSP-Conformal-Decals.git synced 2024-09-01 18:23:54 +00:00
Code Issues Releases Wiki Activity

Fix text rendering more

Browse Source
This commit is contained in:
Andrew Cassidy
2020-08-21 23:44:58 -07:00
parent ae351c021f
commit 93c3ff8a49
5 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/ConformalDecals/ModuleConformalText.cs
View File

@ -78,7 +78,6 @@ namespace ConformalDecals {
private ColorPickerController _outlineColorPickerController;
private MaterialTextureProperty _decalTextureProperty;
private MaterialFloatProperty _decalTextWeightProperty;
private MaterialKeywordProperty _fillEnabledProperty;
private MaterialColorProperty _fillColorProperty;
@ -112,7 +111,6 @@ namespace ConformalDecals {
base.OnAwake();
_decalTextureProperty = materialProperties.AddOrGetTextureProperty("_Decal", true);
_decalTextWeightProperty = materialProperties.AddOrGetProperty<MaterialFloatProperty>("_Weight");
_fillEnabledProperty = materialProperties.AddOrGetProperty<MaterialKeywordProperty>("DECAL_FILL");
_fillColorProperty = materialProperties.AddOrGetProperty<MaterialColorProperty>("_DecalColor");
@ -194,12 +192,12 @@ namespace ConformalDecals {
style = (int) _style.FontStyle;
vertical = _style.Vertical;
lineSpacing = _style.LineSpacing;
characterSpacing = _style.CharacterSpacing;
charSpacing = _style.CharSpacing;
}
public void OnAfterDeserialize() {
_font = DecalConfig.GetFont(fontName);
_style = new DecalTextStyle((FontStyles) style, vertical, lineSpacing, characterSpacing);
_style = new DecalTextStyle((FontStyles) style, vertical, lineSpacing, charSpacing);
}
public override void OnDestroy() {
@ -210,9 +208,9 @@ namespace ConformalDecals {
protected override void OnDetach() {
// close all UIs
if (_textEntryController != null) _textEntryController.OnClose();
if (_fillColorPickerController != null) _fillColorPickerController.OnClose();
if (_outlineColorPickerController != null) _outlineColorPickerController.OnClose();
if (_textEntryController != null) _textEntryController.Close();
if (_fillColorPickerController != null) _fillColorPickerController.Close();
if (_outlineColorPickerController != null) _outlineColorPickerController.Close();
base.OnDetach();
}
@ -283,7 +281,5 @@ namespace ConformalDecals {
base.UpdateTweakables();
}
protected void UpdateCachedProperties() { }
}
}

15
Source/ConformalDecals/Text/TextRenderer.cs
View File

@ -24,7 +24,7 @@ namespace ConformalDecals.Text {
[Serializable]
public class TextRenderEvent : UnityEvent<TextRenderOutput> { }
private const string BlitShader = "ConformalDecals/Text Blit";
private const string ShaderName = "ConformalDecals/Text Blit";
private const int MaxTextureSize = 4096;
private const float FontSize = 100;
private const float PixelDensity = 5;
@ -90,9 +90,8 @@ namespace ConformalDecals.Text {
_tmp = gameObject.AddComponent<TextMeshPro>();
_tmp.renderer.enabled = false; // dont automatically render
var shader = Shabby.Shabby.FindShader(BlitShader);
if (shader == null) Debug.LogError($"[ConformalDecals] could not find text blit shader named '{shader}'");
_blitShader = Shabby.Shabby.FindShader(BlitShader);
_blitShader = Shabby.Shabby.FindShader(ShaderName);
if (_blitShader == null) Debug.LogError($"[ConformalDecals] could not find text blit shader named '{ShaderName}'");
_isSetup = true;
}
@ -157,7 +156,7 @@ namespace ConformalDecals.Text {
_tmp.font = text.Font.FontAsset;
_tmp.fontStyle = text.Style.FontStyle | text.Font.FontStyle;
_tmp.lineSpacing = text.Style.LineSpacing;
_tmp.characterSpacing = text.Style.CharacterSpacing;
_tmp.characterSpacing = text.Style.CharSpacing;
_tmp.extraPadding = true;
_tmp.enableKerning = true;
@ -236,10 +235,10 @@ namespace ConformalDecals.Text {
// SETUP TEXTURE
if (texture == null) {
texture = new Texture2D(textureSize.x, textureSize.y, TextTextureFormat, false);
texture = new Texture2D(textureSize.x, textureSize.y, TextTextureFormat, true);
}
else if (texture.width != textureSize.x || texture.height != textureSize.y || texture.format != TextTextureFormat) {
texture.Resize(textureSize.x, textureSize.y, TextTextureFormat, false);
texture.Resize(textureSize.x, textureSize.y, TextTextureFormat, true);
}
// GENERATE PROJECTION MATRIX
@ -268,7 +267,7 @@ namespace ConformalDecals.Text {
// COPY TEXTURE BACK INTO RAM
RenderTexture.active = renderTex;
texture.ReadPixels(new Rect(0, 0, textureSize.x, textureSize.y), 0, 0, false);
texture.ReadPixels(new Rect(0, 0, textureSize.x, textureSize.y), 0, 0, true);
texture.Apply();
// RELEASE RENDERTEX