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

Pass acceleration data to post listeners

Browse Source 
Also, existing code wouldn't call calculation post-listeners if pre-listeners had been called. Fixes that.
This commit is contained in:
JoePfeiffer 2023-09-26 16:48:54 -06:00
parent 7a2ede6e24
commit 7bafe94f23
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java
View File

@ -283,11 +283,17 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
throws SimulationException {
RK4Parameters params = new RK4Parameters();
// if (dataStore == null) {
// dataStore = new DataStore();
// }
// Call pre-listeners
store.accelerationData = SimulationListenerHelper.firePreAccelerationCalculation(status);
// Calculate acceleration (if not overridden by pre-listeners)
if (store.accelerationData == null) {
store.accelerationData = calculateAcceleration(status, dataStore);
}
// Call post-listeners
store.accelerationData = SimulationListenerHelper.firePostAccelerationCalculation(status, store.accelerationData);
calculateAcceleration(status, dataStore);
params.a = dataStore.linearAcceleration;
params.ra = dataStore.angularAcceleration;
params.v = status.getRocketVelocity();
@ -312,13 +318,7 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
* @param status the status of the rocket.
* @throws SimulationException
*/
private void calculateAcceleration(RK4SimulationStatus status, DataStore store) throws SimulationException {
// Call pre-listeners
store.accelerationData = SimulationListenerHelper.firePreAccelerationCalculation(status);
if (store.accelerationData != null) {
return;
}
private AccelerationData calculateAcceleration(RK4SimulationStatus status, DataStore store) throws SimulationException {
// Compute the forces affecting the rocket
calculateForces(status, store);
@ -403,9 +403,8 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
store.angularAcceleration = status.getRocketOrientationQuaternion().rotate(store.angularAcceleration);
}
// Call post-listeners
store.accelerationData = SimulationListenerHelper.firePostAccelerationCalculation(status, store.accelerationData);
return new AccelerationData(null, null, store.linearAcceleration, store.angularAcceleration, status.getRocketOrientationQuaternion());
}