drewcassidy/ReStocked
1
0
Fork 0
mirror of https://github.com/PorktoberRevolution/ReStocked synced 2024-09-01 17:34:42 +00:00
Code Issues Releases Wiki Activity

Convert ModuleRestockLookAtConstrain into ModuleRestockConstraints

Browse Source 
New module is extendable and modular, allowing constraints to be run in the expected order without relying on possibly undefined behavior
This commit is contained in:
Andrew Cassidy 2020-01-30 18:37:27 -08:00
parent 073b7d2948
commit 931d891644
No known key found for this signature in database
GPG Key ID: 963017B38FD477A1
12 changed files with 255 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg
View File

@ -32,15 +32,15 @@
MODULE
{
name = ModuleRestockLookAtConstraint
name = ModuleRestockConstraints
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = Suspension1
targetName = Suspension2
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = Suspension2
targetName = Suspension1
@ -130,82 +130,69 @@
MODULE
{
name = FXModuleLookAtConstraint
name = ModuleRestockConstraints
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = Link1
targetName = Link1Target
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = Link2
targetName = Link2Target
}
}
MODULE
{
name = FXModuleConstrainPosition
matchRotation = true
matchPosition = false
CONSTRAINFX
COPYROTATIONCONSTRAINT
{
moversName = LowerBracket
rotatorsName = LowerBracket
targetName = Base
}
CONSTRAINFX
COPYROTATIONCONSTRAINT
{
moversName = SteeringPivotFollower
rotatorsName = SteeringPivotFollower
targetName = SteeringPivot
}
CONSTRAINFX
COPYROTATIONCONSTRAINT
{
moversName = WheelPivotFollower
rotatorsName = WheelPivotFollower
targetName = WheelPivot
}
}
MODULE
{
name = FXModuleLookAtConstraint
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = ShockCylinder
targetName = ShockPiston
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = ShockPiston
targetName = ShockCylinder
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = SteeringPiston1
targetName = SteeringCylinder1
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = SteeringCylinder1
targetName = SteeringPiston1
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = SteeringPiston2
targetName = SteeringCylinder2
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = SteeringCylinder2
targetName = SteeringPiston2
@ -241,27 +228,27 @@
MODULE
{
name = ModuleRestockLookAtConstraint
name = ModuleRestockConstraints
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = DamperCylinder
targetName = DamperPiston
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = DamperPiston
targetName = DamperCylinder
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = SteeringCylinder1
targetName = SteeringPiston1
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = SteeringPiston1
targetName = SteeringCylinder1

38
Distribution/Restock/GameData/ReStock/PatchesMH/Ground/restock-mh-wheels.cfg
View File

@ -103,67 +103,51 @@
MODULE
{
name = ModuleAdvancedLookAtConstraint
name = ModuleRestockConstraints
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = Link1
targetName = Link1Target
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = Link2
targetName = Link2Target
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = SuspensionPiston
targetName = SuspensionPistonTarget
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = SuspensionCylinder
targetName = SuspensionCylinderTarget
}
}
MODULE
{
name = FXModuleConstrainPosition
matchRotation = true
matchPosition = false
CONSTRAINFX
COPYROTATIONCONSTRAINT
{
moversName = LowerBracket
rotatorsName = LowerBracket
targetName = UpperBracket
}
CONSTRAINFX
COPYROTATIONCONSTRAINT
{
moversName = SteeringPivotFollower
rotatorsName = SteeringPivotFollower
targetName = SteeringPivot
}
}
MODULE
{
name = FXModuleConstrainPosition
matchRotation = false
matchPosition = true
CONSTRAINFX
COPYPOSITIONCONSTRAINT
{
moversName = WheelMesh
targetName = WheelPivotFollower
}
CONSTRAINFX
COPYPOSITIONCONSTRAINT
{
moversName = WheelMeshBusted
targetName = WheelPivotFollower

BIN
Distribution/Restock/GameData/ReStock/Plugins/Restock.dll
View File

Binary file not shown.

6
Distribution/RestockPlus/GameData/ReStockPlus/Parts/Ground/restock-wheel-1-T.cfg
View File

@ -138,15 +138,15 @@ PART
MODULE
{
name = ModuleRestockLookAtConstraint
name = ModuleRestockConstraints
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = Suspension1
targetName = Suspension2
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = Suspension2
targetName = Suspension1

38
Distribution/RestockPlus/GameData/ReStockPlus/Parts/Ground/restock-wheel-4.cfg
View File

@ -235,67 +235,51 @@ PART
MODULE
{
name = ModuleRestockLookAtConstraint
name = ModuleRestockConstraints
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = Link1
targetName = Link1Target
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = Link2
targetName = Link2Target
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = SuspensionPiston
targetName = SuspensionPistonTarget
}
CONSTRAINLOOKFX
LOOKATCONSTRAINT
{
rotatorsName = SuspensionCylinder
targetName = SuspensionCylinderTarget
}
}
MODULE
{
name = FXModuleConstrainPosition
matchRotation = true
matchPosition = false
CONSTRAINFX
COPYROTATIONCONSTRAINT
{
moversName = LowerBracket
rotatorsName = LowerBracket
targetName = UpperBracket
}
CONSTRAINFX
COPYROTATIONCONSTRAINT
{
moversName = SteeringPivotFollower
rotatorsName = SteeringPivotFollower
targetName = SteeringPivot
}
}
MODULE
{
name = FXModuleConstrainPosition
matchRotation = false
matchPosition = true
CONSTRAINFX
COPYPOSITIONCONSTRAINT
{
moversName = WheelMesh
targetName = WheelPivotFollower
}
CONSTRAINFX
COPYPOSITIONCONSTRAINT
{
moversName = WheelMeshBusted
targetName = WheelPivotFollower

40
Source/Restock/Constraints/CopyPositionConstraint.cs Normal file
View File

@ -0,0 +1,40 @@
using UnityEngine;
namespace Restock.Constraints
{
[System.Serializable]
public class CopyPositionConstraint : IConstraint
{
private readonly string moversName;
private readonly string targetName;
private readonly bool local = false;
// Cached components
private readonly Transform mover;
private readonly Transform target;
public CopyPositionConstraint(ConfigNode node, Part p)
{
node.TryGetValue("rotatorsName", ref moversName);
node.TryGetValue("targetName", ref targetName);
mover = p.FindModelTransform(moversName);
target = p.FindModelTransform(targetName);
}
public void Update()
{
if (mover == null || target == null) return;
if (local)
{
mover.localPosition = target.localPosition;
}
else
{
mover.position = target.position;
}
}
}
}

40
Source/Restock/Constraints/CopyRotationConstraint.cs Normal file
View File

@ -0,0 +1,40 @@
using UnityEngine;
namespace Restock.Constraints
{
[System.Serializable]
public class CopyRotationConstraint : IConstraint
{
private readonly string rotatorsName;
private readonly string targetName;
private readonly bool local = false;
// Cached components
private readonly Transform target;
private readonly Transform rotator;
public CopyRotationConstraint(ConfigNode node, Part p)
{
node.TryGetValue("rotatorsName", ref rotatorsName);
node.TryGetValue("targetName", ref targetName);
rotator = p.FindModelTransform(rotatorsName);
target = p.FindModelTransform(targetName);
}
public void Update()
{
if (rotator == null || target == null) return;
if (local)
{
rotator.localRotation = target.localRotation;
}
else
{
rotator.rotation = target.rotation;
}
}
}
}

10
Source/Restock/Constraints/IConstraint.cs Normal file
View File

@ -0,0 +1,10 @@
using System;
using UnityEngine;
namespace Restock.Constraints
{
public interface IConstraint
{
void Update();
}
}

33
Source/Restock/Constraints/LookAtConstraint.cs Normal file
View File

@ -0,0 +1,33 @@
using UnityEngine;
namespace Restock.Constraints
{
[System.Serializable]
public class LookAtConstraint : IConstraint
{
private readonly string rotatorsName;
private readonly string targetName;
// Cached components
private readonly Transform target;
private readonly Transform rotator;
public LookAtConstraint(ConfigNode node, Part p)
{
node.TryGetValue("rotatorsName", ref rotatorsName);
node.TryGetValue("targetName", ref targetName);
rotator = p.FindModelTransform(rotatorsName);
target = p.FindModelTransform(targetName);
}
public void Update()
{
if (rotator == null || target == null) return;
var lookPos = target.position - rotator.position;
var rotation = Quaternion.LookRotation(lookPos, target.up);
rotator.rotation = rotation;
}
}
}

79
Source/Restock/ModuleRestockConstraints.cs Normal file
View File

@ -0,0 +1,79 @@
using System.Collections.Generic;
using System.Linq;
using Restock.Constraints;
namespace Restock
{
public class ModuleRestockConstraints : PartModule
{
public List<IConstraint> constraints;
public override void OnLoad(ConfigNode node)
{
base.OnLoad(node);
constraints = new List<IConstraint>();
var cnodes = node.GetNodes();
this.Log($"Loading {cnodes.Length} constraints");
foreach (var cnode in cnodes)
{
switch (cnode.name)
{
//LookAtConstraint
case "CONSTRAINLOOKFX":
case "LOOKATCONSTRAINT":
constraints.Add(new LookAtConstraint(cnode, this.part));
break;
//CopyPositionConstraint
case "COPYPOSITIONCONSTRAINT":
constraints.Add(new CopyPositionConstraint(cnode, this.part));
break;
//CopyRotationConstraint
case "COPYROTATIONCONSTRAINT":
constraints.Add(new CopyRotationConstraint(cnode, this.part));
break;
//Unknown
default:
this.LogError($"Unknown constraint type \"{cnode.name}\"");
break;
}
}
this.Log($"Loaded {constraints.Count} constraints");
}
public override void OnStart(StartState state)
{
if (HighLogic.LoadedSceneIsFlight || HighLogic.LoadedSceneIsEditor)
{
if (constraints == null || constraints.Count == 0)
{
ConfigNode cfg;
foreach (UrlDir.UrlConfig pNode in GameDatabase.Instance.GetConfigs("PART"))
{
if (pNode.name.Replace("_", ".") == part.partInfo.name)
{
cfg = pNode.config;
ConfigNode node = cfg.GetNodes("MODULE").Single(n => n.GetValue("name") == moduleName);
OnLoad(node);
}
}
}
}
}
void LateUpdate()
{
if (constraints == null) return;
foreach (var constraint in constraints)
{
constraint.Update();
}
}
}
}

95
Source/Restock/ModuleRestockLookAtConstraint.cs
View File

@ -1,95 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using UnityEngine;
namespace Restock
{
public class ModuleRestockLookAtConstraint : PartModule
{
[System.Serializable]
public class LookConstraint
{
string rotatorsName;
string targetName;
// Cached components
Transform target;
Transform rotator;
Part part;
public LookConstraint(ConfigNode node, Part p)
{
node.TryGetValue("rotatorsName", ref rotatorsName);
node.TryGetValue("targetName", ref targetName);
part = p;
rotator = p.FindModelTransform(rotatorsName);
target = p.FindModelTransform(targetName);
}
public void UpdateRotators()
{
if (rotator != null && target != null)
{
Vector3 targetPostition = new Vector3(target.position.x,
target.position.y,
target.position.z);
Vector3 lookPos = target.position - rotator.position;
var rotation = Quaternion.LookRotation(lookPos, target.up);
rotator.rotation = rotation;
}
}
}
public List<LookConstraint> constraints;
public override void OnLoad(ConfigNode node)
{
base.OnLoad(node);
constraints = new List<LookConstraint>();
ConfigNode[] cnodes = node.GetNodes("CONSTRAINLOOKFX");
Debug.Log(String.Format("[ModuleAdvancedLookAtConstraint]: Loading {0} constraints", cnodes.Length));
for (int i = 0; i < cnodes.Length; i++)
{
constraints.Add(new LookConstraint(cnodes[i], this.part));
}
Debug.Log(String.Format("[ModuleAdvancedLookAtConstraint]: Loaded {0} constraints", constraints.Count));
}
public override void OnStart(StartState state)
{
if (HighLogic.LoadedSceneIsFlight || HighLogic.LoadedSceneIsEditor)
{
if (constraints == null || constraints.Count == 0)
{
ConfigNode cfg;
foreach (UrlDir.UrlConfig pNode in GameDatabase.Instance.GetConfigs("PART"))
{
if (pNode.name.Replace("_", ".") == part.partInfo.name)
{
cfg = pNode.config;
ConfigNode node = cfg.GetNodes("MODULE").Single(n => n.GetValue("name") == moduleName);
OnLoad(node);
}
}
}
}
}
void LateUpdate()
{
if (constraints != null)
{
for (int i = 0; i < constraints.Count; i++)
{
constraints[i].UpdateRotators();
}
}
}
}
}

6
Source/Restock/Restock.csproj
View File

@ -44,6 +44,10 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Constraints\CopyPositionConstraint.cs" />
<Compile Include="Constraints\CopyRotationConstraint.cs" />
<Compile Include="Constraints\IConstraint.cs" />
<Compile Include="Constraints\LookAtConstraint.cs" />
<Compile Include="InstallChecker.cs" />
<Compile Include="MaterialModifiers\ColorPropertyMaterialModifier.cs" />
<Compile Include="MaterialModifiers\FloatPropertyMaterialModifier.cs" />
@ -55,7 +59,7 @@
<Compile Include="ModuleRestockDepthMask.cs" />
<Compile Include="ModuleRestockHeatEffects.cs" />
<Compile Include="ModuleRestockISRUAnimation.cs" />
<Compile Include="ModuleRestockLookAtConstraint.cs" />
<Compile Include="ModuleRestockConstraints.cs" />
<Compile Include="ModuleRestockModifyFairingMaterials.cs" />
<Compile Include="ModuleRestockModifyMaterials.cs" />
<Compile Include="PartModuleExtensions.cs" />