From e346969c24392d97a22374c7931810388919b120 Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Mon, 15 Jul 2024 09:45:35 -0600 Subject: [PATCH] Get rid of linearAcceleration and angularAcceleration from DataStore; that data is in AccelerationData --- .../core/simulation/AbstractSimulationStepper.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/info/openrocket/core/simulation/AbstractSimulationStepper.java b/core/src/main/java/info/openrocket/core/simulation/AbstractSimulationStepper.java index ec2bb586b..7ef9de44d 100644 --- a/core/src/main/java/info/openrocket/core/simulation/AbstractSimulationStepper.java +++ b/core/src/main/java/info/openrocket/core/simulation/AbstractSimulationStepper.java @@ -243,9 +243,6 @@ public abstract class AbstractSimulationStepper implements SimulationStepper { public RigidBody motorMass; public Coordinate coriolisAcceleration; - - public Coordinate linearAcceleration; - public Coordinate angularAcceleration; public Coordinate launchRodDirection = null; @@ -282,12 +279,12 @@ public abstract class AbstractSimulationStepper implements SimulationStepper { dataBranch.setValue(FlightDataType.TYPE_CORIOLIS_ACCELERATION, coriolisAcceleration.length()); } - if (null != linearAcceleration) { + if (null != accelerationData) { 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_Z, linearAcceleration.z); + dataBranch.setValue(FlightDataType.TYPE_ACCELERATION_TOTAL, accelerationData.getLinearAccelerationWC().length()); + dataBranch.setValue(FlightDataType.TYPE_ACCELERATION_Z, accelerationData.getLinearAccelerationWC().z); } if (null != rocketMass) {