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

Refactor yet again and add autotiling

Browse Source
This commit is contained in:
Andrew Cassidy
2020-06-06 13:20:50 -07:00
parent a6fa2dd61c
commit d2f81058f8
11 changed files with 101 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
using System;
using UnityEngine;
using Object = UnityEngine.Object;
namespace ConformalDecals.MaterialModifiers {
public abstract class MaterialProperty : ScriptableObject {
@ -16,7 +15,7 @@ namespace ConformalDecals.MaterialModifiers {
[SerializeField] protected string _propertyName;
public virtual void ParseNode(ConfigNode node) {
if (node == null) throw new ArgumentNullException("node cannot be null");
if (node == null) throw new ArgumentNullException(nameof(node));
PropertyName = node.GetValue("name");
}

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

@ -210,12 +210,33 @@ namespace ConformalDecals.MaterialModifiers {
public void UpdateScale(Vector2 scale) {
foreach (var entry in _materialProperties) {
if (entry.Value is MaterialTextureProperty textureProperty) {
textureProperty.UpdateScale(DecalMaterial, scale);
textureProperty.UpdateScale(PreviewMaterial, scale);
textureProperty.UpdateScale(scale);
textureProperty.Modify(_decalMaterial);
textureProperty.Modify(_previewMaterial);
}
}
}
public void UpdateTile(Rect tile) {
if (_mainTexture == null) throw new InvalidOperationException("UpdateTile called but no main texture is specified!");
Vector2 scale;
Vector2 offset;
scale.x = tile.width / _mainTexture.texture.width;
scale.y = tile.height / _mainTexture.texture.height;
offset.x = tile.x / _mainTexture.texture.width;
offset.y = tile.y / _mainTexture.texture.height;
foreach (var entry in _materialProperties) {
if (entry.Value is MaterialTextureProperty textureProperty) {
textureProperty.UpdateTiling(scale, offset);
textureProperty.Modify(_decalMaterial);
textureProperty.Modify(_previewMaterial);
}
}
}
public void SetOpacity(float opacity) {
DecalMaterial.SetFloat(DecalPropertyIDs._DecalOpacity, opacity);
PreviewMaterial.SetFloat(DecalPropertyIDs._DecalOpacity, opacity);

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

@ -8,9 +8,12 @@ namespace ConformalDecals.MaterialModifiers {
[SerializeField] public bool isNormal;
[SerializeField] public bool isMain;
[SerializeField] public bool autoScale;
[SerializeField] public bool autoTile;
[SerializeField] private bool _hasTile;
[SerializeField] private Rect _tileRect;
[SerializeField] private Vector2 _baseTextureScale = Vector2.one;
[SerializeField] private Vector2 _textureOffset = Vector2.zero;
[SerializeField] private Vector2 _textureScale = Vector2.one;
@ -27,6 +30,7 @@ namespace ConformalDecals.MaterialModifiers {
public Rect TileRect {
get => _tileRect;
set {
if (autoTile) return;
_hasTile = !(Mathf.Abs(value.width) < 0.1) || !(Mathf.Abs(value.height) < 0.1);
_tileRect = value;
@ -40,10 +44,11 @@ namespace ConformalDecals.MaterialModifiers {
isNormal = ParsePropertyBool(node, "isNormalMap", true, (PropertyName == "_BumpMap") || (PropertyName == "_DecalBumpMap") || isNormal);
isMain = ParsePropertyBool(node, "isMain", true, isMain);
autoScale = ParsePropertyBool(node, "autoScale", true, autoScale);
autoTile = ParsePropertyBool(node, "autoTile", true, autoTile);
SetTexture(node.GetValue("textureUrl"));
if (node.HasValue("tileRect")) {
if (node.HasValue("tileRect") && !autoTile) {
TileRect = ParsePropertyRect(node, "tileRect", true, _tileRect);
}
}
@ -82,23 +87,26 @@ namespace ConformalDecals.MaterialModifiers {
material.SetTextureScale(_propertyID, _textureScale);
}
public void UpdateScale(Material material, Vector2 scale) {
public void UpdateScale(Vector2 scale) {
if (autoScale) {
material.SetTextureScale(_propertyID, new Vector2(_textureScale.x * scale.x, _textureScale.y * scale.y));
_textureScale = _baseTextureScale * scale;
}
}
public void UpdateTiling(Vector2 textureScale, Vector2 textureOffset) {
if (autoTile) {
_textureScale = textureScale;
_textureOffset = textureOffset;
}
}
private void UpdateTiling() {
if (_hasTile) {
_textureScale.x = Mathf.Approximately(0, _tileRect.width) ? 1 : _tileRect.width / texture.width;
_textureScale.y = Mathf.Approximately(0, _tileRect.height) ? 1 : _tileRect.height / texture.height;
_textureOffset.x = _tileRect.x / texture.width;
_textureOffset.y = _tileRect.y / texture.height;
_baseTextureScale.x = Mathf.Approximately(0, _tileRect.width) ? 1 : _tileRect.width / texture.width;
_baseTextureScale.y = Mathf.Approximately(0, _tileRect.height) ? 1 : _tileRect.height / texture.height;
}
else {
_textureScale = Vector2.one;
_textureOffset = Vector2.zero;
_baseTextureScale = Vector2.one;
}
}
}