From 2ad7cd1c95d12f9b42095a3f255839e5d9585bbb Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Sun, 31 Jul 2022 18:13:27 -0600 Subject: [PATCH 1/2] When sitting on the ground, advance simulation time to next event time --- core/src/net/sf/openrocket/simulation/GroundStepper.java | 1 + swing/resources-src/datafiles/components | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/net/sf/openrocket/simulation/GroundStepper.java b/core/src/net/sf/openrocket/simulation/GroundStepper.java index 49c8b5b4f..b13cfde8c 100644 --- a/core/src/net/sf/openrocket/simulation/GroundStepper.java +++ b/core/src/net/sf/openrocket/simulation/GroundStepper.java @@ -20,5 +20,6 @@ public class GroundStepper extends AbstractSimulationStepper { @Override public void step(SimulationStatus status, double timeStep) throws SimulationException { log.trace("step: position=" + status.getRocketPosition() + ", velocity=" + status.getRocketVelocity()); + status.setSimulationTime(status.getSimulationTime() + timeStep); } } diff --git a/swing/resources-src/datafiles/components b/swing/resources-src/datafiles/components index 4c3604313..860757167 160000 --- a/swing/resources-src/datafiles/components +++ b/swing/resources-src/datafiles/components @@ -1 +1 @@ -Subproject commit 4c3604313f0cc8f52274c8fa07e4970e6bfaa273 +Subproject commit 860757167c4835a7bb960a4cbb52b06f3309791c From 9e22cd396846dc2c28914bdcf6909e3b31a1891e Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Mon, 1 Aug 2022 07:15:02 -0600 Subject: [PATCH 2/2] update dbcook component library --- swing/resources-src/datafiles/components | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swing/resources-src/datafiles/components b/swing/resources-src/datafiles/components index 860757167..4c3604313 160000 --- a/swing/resources-src/datafiles/components +++ b/swing/resources-src/datafiles/components @@ -1 +1 @@ -Subproject commit 860757167c4835a7bb960a4cbb52b06f3309791c +Subproject commit 4c3604313f0cc8f52274c8fa07e4970e6bfaa273