aj/CincyLib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Round all floating points numbers.

Browse Source
This commit is contained in:
AJ
2018-11-15 15:19:54 -05:00
parent 1802488449
commit a76b7c6294
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CincyLib/Laser/MaterialLibReader.cs
View File

@@ -33,7 +33,7 @@ namespace CincyLib.Laser
var reader = new BinaryReader(stream); var reader = new BinaryReader(stream);
MaterialLib.Machine = reader.ReadString(); MaterialLib.Machine = reader.ReadString();
MaterialLib.PierceDwell = reader.ReadSingle(); MaterialLib.PierceDwell = Math.Round(reader.ReadSingle(), 4);
reader.BaseStream.Seek(2, SeekOrigin.Current); // Unknown 2 bytes reader.BaseStream.Seek(2, SeekOrigin.Current); // Unknown 2 bytes
MaterialLib.PiercePower = reader.ReadInt16(); MaterialLib.PiercePower = reader.ReadInt16();
@@ -55,9 +55,9 @@ namespace CincyLib.Laser
reader.BaseStream.Seek(1, SeekOrigin.Current); // Unknown 1 byte 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.UsePartCoolantOnPierce = Convert.ToBoolean(reader.ReadInt16());
MaterialLib.PierceAssistGas = (AssistGasType)reader.ReadInt16(); MaterialLib.PierceAssistGas = (AssistGasType)reader.ReadInt16();
@@ -73,8 +73,8 @@ namespace CincyLib.Laser
MaterialLib.DPCMinPower = reader.ReadInt16(); MaterialLib.DPCMinPower = reader.ReadInt16();
reader.BaseStream.Seek(4, SeekOrigin.Current); // Unknown 4 bytes reader.BaseStream.Seek(4, SeekOrigin.Current); // Unknown 4 bytes
MaterialLib.NozzleStandoff1 = reader.ReadSingle(); MaterialLib.NozzleStandoff1 = Math.Round(reader.ReadSingle(), 4);
MaterialLib.KerfWidth = reader.ReadSingle(); MaterialLib.KerfWidth = Math.Round(reader.ReadSingle(), 4);
reader.BaseStream.Seek(2, SeekOrigin.Current); // Unknown 2 bytes reader.BaseStream.Seek(2, SeekOrigin.Current); // Unknown 2 bytes
MaterialLib.AssistGas = (AssistGasType)reader.ReadInt16(); MaterialLib.AssistGas = (AssistGasType)reader.ReadInt16();
@@ -94,7 +94,7 @@ namespace CincyLib.Laser
for (int i = 0; i < steps; ++i) for (int i = 0; i < steps; ++i)
{ {
MaterialLib.RampedPierceSteps[i] = new RampedPierceStep(); 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(); MaterialLib.RampedPierceSteps[i].Power = reader.ReadInt16();
} }

4
CincyLib/Laser/RampedPierceStep.cs
View File

@@ -3,9 +3,9 @@ namespace CincyLib.Laser
{ {
public struct RampedPierceStep public struct RampedPierceStep
{ {
public float Time; public double Time { get; set; }
public int Power; public int Power { get; set; }
public override string ToString() public override string ToString()
{ {