From a76b7c6294daf3a3caa626093e3fe08a75df9c65 Mon Sep 17 00:00:00 2001 From: AJ Date: Thu, 15 Nov 2018 15:19:54 -0500 Subject: [PATCH] Round all floating points numbers. --- CincyLib/Laser/MaterialLibReader.cs | 12 ++++++------ CincyLib/Laser/RampedPierceStep.cs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CincyLib/Laser/MaterialLibReader.cs b/CincyLib/Laser/MaterialLibReader.cs index 154966a..a9533ed 100644 --- a/CincyLib/Laser/MaterialLibReader.cs +++ b/CincyLib/Laser/MaterialLibReader.cs @@ -33,7 +33,7 @@ namespace CincyLib.Laser var reader = new BinaryReader(stream); MaterialLib.Machine = reader.ReadString(); - MaterialLib.PierceDwell = reader.ReadSingle(); + MaterialLib.PierceDwell = Math.Round(reader.ReadSingle(), 4); reader.BaseStream.Seek(2, SeekOrigin.Current); // Unknown 2 bytes MaterialLib.PiercePower = reader.ReadInt16(); @@ -55,9 +55,9 @@ namespace CincyLib.Laser reader.BaseStream.Seek(1, SeekOrigin.Current); // Unknown 1 byte - MaterialLib.PierceNozzleStandoffRampFrom = reader.ReadSingle(); + MaterialLib.PierceNozzleStandoffRampFrom = Math.Round(reader.ReadSingle(), 4); - MaterialLib.RampedPierceCoolingTime = reader.ReadSingle(); + MaterialLib.RampedPierceCoolingTime = Math.Round(reader.ReadSingle(), 4); MaterialLib.UsePartCoolantOnPierce = Convert.ToBoolean(reader.ReadInt16()); MaterialLib.PierceAssistGas = (AssistGasType)reader.ReadInt16(); @@ -73,8 +73,8 @@ namespace CincyLib.Laser MaterialLib.DPCMinPower = reader.ReadInt16(); reader.BaseStream.Seek(4, SeekOrigin.Current); // Unknown 4 bytes - MaterialLib.NozzleStandoff1 = reader.ReadSingle(); - MaterialLib.KerfWidth = reader.ReadSingle(); + MaterialLib.NozzleStandoff1 = Math.Round(reader.ReadSingle(), 4); + MaterialLib.KerfWidth = Math.Round(reader.ReadSingle(), 4); reader.BaseStream.Seek(2, SeekOrigin.Current); // Unknown 2 bytes MaterialLib.AssistGas = (AssistGasType)reader.ReadInt16(); @@ -94,7 +94,7 @@ namespace CincyLib.Laser for (int i = 0; i < steps; ++i) { MaterialLib.RampedPierceSteps[i] = new RampedPierceStep(); - MaterialLib.RampedPierceSteps[i].Time = reader.ReadSingle(); + MaterialLib.RampedPierceSteps[i].Time = Math.Round(reader.ReadSingle(), 4); MaterialLib.RampedPierceSteps[i].Power = reader.ReadInt16(); } diff --git a/CincyLib/Laser/RampedPierceStep.cs b/CincyLib/Laser/RampedPierceStep.cs index 564b7db..f1d7294 100644 --- a/CincyLib/Laser/RampedPierceStep.cs +++ b/CincyLib/Laser/RampedPierceStep.cs @@ -3,9 +3,9 @@ namespace CincyLib.Laser { public struct RampedPierceStep { - public float Time; + public double Time { get; set; } - public int Power; + public int Power { get; set; } public override string ToString() {