hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of linearAcceleration and angularAcceleration from DataStore; that data is in AccelerationData

Browse Source
This commit is contained in:
JoePfeiffer 2024-07-15 09:45:35 -06:00
parent 46ed6942b2
commit e346969c24
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/info/openrocket/core/simulation/AbstractSimulationStepper.java
View File

@ -244,9 +244,6 @@ public abstract class AbstractSimulationStepper implements SimulationStepper {
public Coordinate coriolisAcceleration; public Coordinate coriolisAcceleration;
public Coordinate linearAcceleration;
public Coordinate angularAcceleration;
public Coordinate launchRodDirection = null; public Coordinate launchRodDirection = null;
public double maxZvelocity = Double.NaN; public double maxZvelocity = Double.NaN;
@ -282,12 +279,12 @@ public abstract class AbstractSimulationStepper implements SimulationStepper {
dataBranch.setValue(FlightDataType.TYPE_CORIOLIS_ACCELERATION, coriolisAcceleration.length()); dataBranch.setValue(FlightDataType.TYPE_CORIOLIS_ACCELERATION, coriolisAcceleration.length());
} }
if (null != linearAcceleration) { if (null != accelerationData) {
dataBranch.setValue(FlightDataType.TYPE_ACCELERATION_XY, dataBranch.setValue(FlightDataType.TYPE_ACCELERATION_XY,
MathUtil.hypot(linearAcceleration.x, linearAcceleration.y)); MathUtil.hypot(accelerationData.getLinearAccelerationWC().x, accelerationData.getLinearAccelerationWC().y));
dataBranch.setValue(FlightDataType.TYPE_ACCELERATION_TOTAL, linearAcceleration.length()); dataBranch.setValue(FlightDataType.TYPE_ACCELERATION_TOTAL, accelerationData.getLinearAccelerationWC().length());
dataBranch.setValue(FlightDataType.TYPE_ACCELERATION_Z, linearAcceleration.z); dataBranch.setValue(FlightDataType.TYPE_ACCELERATION_Z, accelerationData.getLinearAccelerationWC().z);
} }
if (null != rocketMass) { if (null != rocketMass) {