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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Distribution/GameData/ConformalDecals/Parts/decal-blank.cfg
View File

@ -43,15 +43,13 @@ PART
MODULE
{
name = ModuleConformalDecalGeneric
name = ModuleConformalDecal
decalFront = Decal-Front
decalBack = Decal-Back
decalModel = Decal-Model
useBaseNormal = false
}
MODULE {
@ -62,7 +60,7 @@ PART
MODULE {
IDENTIFIER {
name = ModuleConformalDecalGeneric
name = ModuleConformalDecal
}
DATA {
shader = ConformalDecals/Feature/Bumped
@ -88,7 +86,7 @@ PART
MODULE {
IDENTIFIER {
name = ModuleConformalDecalGeneric
name = ModuleConformalDecal
}
DATA {
shader = ConformalDecals/Paint/Diffuse

2
Distribution/GameData/ConformalDecals/Parts/decal-flag.cfg
View File

@ -44,7 +44,7 @@ PART
MODULE
{
name = ModuleConformalDecalFlag
name = ModuleConformalFlag
decalFront = Decal-Front
decalBack = Decal-Back

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

Binary file not shown.

5
Source/ConformalDecals/ConformalDecals.csproj
View File

@ -57,10 +57,9 @@
<Compile Include="MaterialModifiers\MaterialProperty.cs" />
<Compile Include="MaterialModifiers\MaterialPropertyCollection.cs" />
<Compile Include="MaterialModifiers\MaterialTextureProperty.cs" />
<Compile Include="ModuleConformalDecalFlag.cs" />
<Compile Include="ModuleConformalDecalGeneric.cs" />
<Compile Include="ModuleConformalFlag.cs" />
<Compile Include="ProjectionTarget.cs" />
<Compile Include="ModuleConformalDecalBase.cs" />
<Compile Include="ModuleConformalDecal.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Util\Logging.cs" />
<Compile Include="Util\OrientedBounds.cs" />

2
Source/ConformalDecals/DecalIconFixer.cs
View File

@ -22,7 +22,7 @@ namespace ConformalDecals {
var icon = partInfo.iconPrefab;
var decalModule = partInfo.partPrefab.FindModuleImplementing<ModuleConformalDecalBase>();
var decalModule = partInfo.partPrefab.FindModuleImplementing<ModuleConformalDecal>();
var frontTransform = Part.FindHeirarchyTransform(icon.transform, decalModule.decalFront);
var backTransform = Part.FindHeirarchyTransform(icon.transform, decalModule.decalBack);

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,8 +210,29 @@ 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);
}
}
}

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;
}
}
}

59
Source/ConformalDecals/ModuleConformalDecalBase.cs → Source/ConformalDecals/ModuleConformalDecal.cs
View File

@ -5,7 +5,7 @@ using ConformalDecals.Util;
using UnityEngine;
namespace ConformalDecals {
public abstract class ModuleConformalDecalBase : PartModule {
public class ModuleConformalDecal : PartModule {
[KSPField(guiName = "#LOC_ConformalDecals_gui-scale", guiActive = false, guiActiveEditor = true, isPersistant = true, guiFormat = "F2", guiUnits = "m"),
UI_FloatRange(stepIncrement = 0.05f)]
public float scale = 1.0f;
@ -77,9 +77,22 @@ namespace ConformalDecals {
}
}
public override void OnAwake() {
base.OnAwake();
if (materialProperties == null) {
materialProperties = ScriptableObject.CreateInstance<MaterialPropertyCollection>();
}
else {
materialProperties = ScriptableObject.Instantiate(materialProperties);
}
}
public override void OnLoad(ConfigNode node) {
this.Log("Loading module");
try {
// SETUP TRANSFORMS
// find front transform
decalFrontTransform = part.FindModelTransform(decalFront);
if (decalFrontTransform == null) throw new FormatException($"Could not find decalFront transform: '{decalFront}'.");
@ -135,10 +148,38 @@ namespace ConformalDecals {
}
}
DecalIconFixer.QueuePart(part.name);
// PARSE MATERIAL PROPERTIES
// set shader
materialProperties.SetShader(shader);
// add texture nodes
foreach (var textureNode in node.GetNodes("TEXTURE")) {
materialProperties.ParseProperty<MaterialTextureProperty>(textureNode);
}
// add float nodes
foreach (var floatNode in node.GetNodes("FLOAT")) {
materialProperties.ParseProperty<MaterialTextureProperty>(floatNode);
}
// add color nodes
foreach (var colorNode in node.GetNodes("COLOR")) {
materialProperties.ParseProperty<MaterialColorProperty>(colorNode);
}
var tileString = node.GetValue("tile");
if (!string.IsNullOrEmpty(tileString)) {
var tileValid = ParseExtensions.TryParseRect(tileString, out var tile);
if (!tileValid) throw new FormatException($"Improperly formatted value for tile '{tileString}");
else {
materialProperties.UpdateTile(tile);
}
}
// QUEUE PART FOR ICON FIXING IN VAB
DecalIconFixer.QueuePart(part.name);
}
catch (Exception e) {
this.LogException("Exception parsing partmodule", e);
@ -149,20 +190,10 @@ namespace ConformalDecals {
UpdateScale();
UpdateProjection();
}
else {
UpdateScale();
}
}
public override void OnAwake() {
base.OnAwake();
if (materialProperties == null) {
materialProperties = ScriptableObject.CreateInstance<MaterialPropertyCollection>();
}
else {
materialProperties = ScriptableObject.Instantiate(materialProperties);
}
public override void OnIconCreate() {
UpdateScale();
}
public override void OnStart(StartState state) {

34
Source/ConformalDecals/ModuleConformalDecalGeneric.cs
View File

@ -1,34 +0,0 @@
using ConformalDecals.MaterialModifiers;
using ConformalDecals.Util;
using UnityEngine;
namespace ConformalDecals {
public class ModuleConformalDecalGeneric : ModuleConformalDecalBase {
public override void OnLoad(ConfigNode node) {
// set shader
materialProperties.SetShader(shader);
// add texture nodes
foreach (var textureNode in node.GetNodes("TEXTURE")) {
materialProperties.ParseProperty<MaterialTextureProperty>(textureNode);
}
// add float nodes
foreach (var floatNode in node.GetNodes("FLOAT")) {
materialProperties.ParseProperty<MaterialTextureProperty>(floatNode);
}
// add color nodes
foreach (var colorNode in node.GetNodes("COLOR")) {
materialProperties.ParseProperty<MaterialColorProperty>(colorNode);
}
base.OnLoad(node);
}
public override void OnIconCreate() {
this.Log("called OnIconCreate");
UpdateScale();
}
}
}

7
Source/ConformalDecals/ModuleConformalDecalFlag.cs → Source/ConformalDecals/ModuleConformalFlag.cs
View File

@ -1,7 +1,7 @@
using ConformalDecals.Util;
namespace ConformalDecals {
public class ModuleConformalDecalFlag : ModuleConformalDecalBase {
public class ModuleConformalFlag : ModuleConformalDecal {
private const string DefaultFlag = "Squad/Flags/default";
public override void OnLoad(ConfigNode node) {
@ -20,11 +20,6 @@ namespace ConformalDecals {
UpdateFlag(GetDefaultFlag());
}
public override void OnIconCreate() {
this.Log("called OnIconCreate");
UpdateScale();
}
public override void OnDestroy() {
GameEvents.onMissionFlagSelect.Remove(UpdateFlag);
base.OnDestroy();