projects
/
debian
/
openrocket
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
geodetic computations
[debian/openrocket]
/
src
/
net
/
sf
/
openrocket
/
simulation
/
SimulationStatus.java
diff --git
a/src/net/sf/openrocket/simulation/SimulationStatus.java
b/src/net/sf/openrocket/simulation/SimulationStatus.java
index cc77117ba9f8b791d0fd9835e33fd84a87fc6d14..9a39cffda958875960a5bd8853eff51415edddc0 100644
(file)
--- a/
src/net/sf/openrocket/simulation/SimulationStatus.java
+++ b/
src/net/sf/openrocket/simulation/SimulationStatus.java
@@
-13,6
+13,7
@@
import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.util.Monitorable;
import net.sf.openrocket.util.MonitorableSet;
import net.sf.openrocket.util.Quaternion;
import net.sf.openrocket.util.Monitorable;
import net.sf.openrocket.util.MonitorableSet;
import net.sf.openrocket.util.Quaternion;
+import net.sf.openrocket.util.WorldCoordinate;
/**
* A holder class for the dynamic status during the rocket's flight.
/**
* A holder class for the dynamic status during the rocket's flight.
@@
-35,6
+36,7
@@
public class SimulationStatus implements Cloneable, Monitorable {
private double previousTimeStep;
private Coordinate position;
private double previousTimeStep;
private Coordinate position;
+ private WorldCoordinate worldPosition;
private Coordinate velocity;
private Quaternion orientation;
private Coordinate velocity;
private Quaternion orientation;
@@
-146,6
+148,14
@@
public class SimulationStatus implements Cloneable, Monitorable {
return position;
}
return position;
}
+ public void setRocketWorldPosition(WorldCoordinate wc) {
+ this.worldPosition = wc;
+ this.modID++;
+ }
+
+ public WorldCoordinate getRocketWorldPosition() {
+ return worldPosition;
+ }
public void setRocketVelocity(Coordinate velocity) {
this.velocity = velocity;
public void setRocketVelocity(Coordinate velocity) {
this.velocity = velocity;
@@
-341,6
+351,7
@@
public class SimulationStatus implements Cloneable, Monitorable {
this.time = orig.time;
this.previousTimeStep = orig.previousTimeStep;
this.position = orig.position;
this.time = orig.time;
this.previousTimeStep = orig.previousTimeStep;
this.position = orig.position;
+ this.worldPosition = orig.worldPosition;
this.velocity = orig.velocity;
this.orientation = orig.orientation;
this.rotationVelocity = orig.rotationVelocity;
this.velocity = orig.velocity;
this.orientation = orig.orientation;
this.rotationVelocity = orig.rotationVelocity;