diff --git a/CincyLib/Laser/MaterialLib.cs b/CincyLib/Laser/MaterialLib.cs index f3d9f42..d280906 100644 --- a/CincyLib/Laser/MaterialLib.cs +++ b/CincyLib/Laser/MaterialLib.cs @@ -30,7 +30,7 @@ namespace CincyLib.Laser public double PierceNozzleStandoffRampFrom { get; set; } - //public float PierceNozzleStandoffRampTo { get; set; } + public double PierceNozzleStandoffRampTo { get; set; } public AssistGasType PierceAssistGas { get; set; } diff --git a/CincyLib/Laser/MaterialLibReader.cs b/CincyLib/Laser/MaterialLibReader.cs index 79d379c..d80d076 100644 --- a/CincyLib/Laser/MaterialLibReader.cs +++ b/CincyLib/Laser/MaterialLibReader.cs @@ -125,15 +125,18 @@ namespace CincyLib.Laser MaterialLib.PierceFocusFarField = Math.Round(reader.ReadSingle(), 4); // older files wont go this far... - const int seek = 76; + const int seek = 18; var hasExtendedInfo = reader.BaseStream.Length > reader.BaseStream.Position + seek; if (hasExtendedInfo) { reader.BaseStream.Seek(seek, SeekOrigin.Current); + MaterialLib.PierceNozzleStandoffRampTo = Math.Round(reader.ReadSingle(), 4); + reader.BaseStream.Seek(54, SeekOrigin.Current); var lensType = reader.ReadByte(); + switch (lensType) { case 0: