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

Debug statement cleanup and fix icon creation

Browse Source
This commit is contained in:
Andrew Cassidy 2020-06-07 19:52:17 -07:00
parent 79bdc03c4b
commit a8313127e2
5 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll
View File

Binary file not shown.

1
Source/ConformalDecals/MaterialModifiers/MaterialProperty.cs
View File

@ -18,6 +18,7 @@ namespace ConformalDecals.MaterialModifiers {
if (node == null) throw new ArgumentNullException(nameof(node));
PropertyName = node.GetValue("name");
Debug.Log($"Parsing material property {_propertyName}");
}
public abstract void Modify(Material material);

3
Source/ConformalDecals/MaterialModifiers/MaterialPropertyCollection.cs
View File

@ -74,7 +74,6 @@ namespace ConformalDecals.MaterialModifiers {
for (var i = 0; i < _serializedNames.Length; i++) {
var property = MaterialProperty.Instantiate(_serializedProperties[i]);
Debug.Log($"insantiating {property.GetType().Name} {property.GetInstanceID()}");
_materialProperties.Add(_serializedNames[i], property);
if (property is MaterialTextureProperty textureProperty && textureProperty.isMain) {
@ -155,13 +154,11 @@ namespace ConformalDecals.MaterialModifiers {
public T ParseProperty<T>(ConfigNode node) where T : MaterialProperty {
var propertyName = node.GetValue("name");
if (string.IsNullOrEmpty(propertyName)) throw new ArgumentException("node has no name");
Debug.Log($"Parsing material property {propertyName}");
var newProperty = AddOrGetProperty<T>(propertyName);
newProperty.ParseNode(node);
if (newProperty is MaterialTextureProperty textureProperty && textureProperty.isMain) {
Debug.Log("new texture has isMain enabled");
_mainTexture = textureProperty;
}

19
Source/ConformalDecals/MaterialModifiers/MaterialTextureProperty.cs
View File

@ -2,15 +2,14 @@ using System;
using UnityEngine;
namespace ConformalDecals.MaterialModifiers {
public class MaterialTextureProperty : MaterialProperty, ISerializationCallbackReceiver {
public class MaterialTextureProperty : MaterialProperty {
[SerializeField] public bool isNormal;
[SerializeField] public bool isMain;
[SerializeField] public bool autoScale;
[SerializeField] public bool autoTile;
[SerializeField] private string _textureUrl;
private Texture2D _texture;
[SerializeField] private string _textureUrl;
[SerializeField] private Texture2D _texture;
[SerializeField] private bool _hasTile;
[SerializeField] private Rect _tileRect;
@ -40,13 +39,6 @@ namespace ConformalDecals.MaterialModifiers {
public float AspectRatio => MaskedHeight / (float) MaskedWidth;
public void OnBeforeSerialize() { }
public void OnAfterDeserialize() {
// Unity appears to be screwing up textures when deserializing them, so this is the fix?
_texture = LoadTexture(_textureUrl, isNormal);
}
public override void ParseNode(ConfigNode node) {
base.ParseNode(node);
@ -66,12 +58,9 @@ namespace ConformalDecals.MaterialModifiers {
TextureUrl = node.GetValue("textureUrl");
}
Debug.Log($"parsed texture node with texture {_textureUrl}, {isMain}");
if (node.HasValue("tileRect") && !autoTile) {
SetTile(ParsePropertyRect(node, "tileRect", true, _tileRect));
}
}
public override void Modify(Material material) {
@ -91,7 +80,7 @@ namespace ConformalDecals.MaterialModifiers {
}
public void SetTile(Rect tile) {
SetTile(tile, new Vector2(_texture.width, _texture.height));
SetTile(tile, Dimensions);
}
public void SetTile(Rect tile, Vector2 mainTexDimensions) {

4
Source/ConformalDecals/ModuleConformalDecal.cs
View File

@ -93,7 +93,6 @@ namespace ConformalDecals {
public override void OnLoad(ConfigNode node) {
this.Log("Loading module");
this.Log($"{node.ToString()}");
try {
// SETUP TRANSFORMS
@ -192,8 +191,9 @@ namespace ConformalDecals {
this.LogException("Exception parsing partmodule", e);
}
UpdateMaterials();
if (HighLogic.LoadedSceneIsGame) {
UpdateMaterials();
UpdateScale();
UpdateProjection();
}