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

Added extra checks to OutsideComponent implementations. Minor commit.

Browse Source
This commit is contained in:
Daniel_M_Williams 2015-06-03 10:45:14 -04:00
parent 58d9e8f682
commit 5d2e7730f5
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java
View File

@ -144,6 +144,9 @@ public abstract class ExternalComponent extends RocketComponent implements Outsi
@Override
public double getAngularPosition() {
if (axial) {
return 0.;
}
return this.position_angular_rad;
}
@ -154,6 +157,9 @@ public abstract class ExternalComponent extends RocketComponent implements Outsi
@Override
public double getRadialPosition() {
if (axial) {
return 0.;
}
return this.position_radial_m;
}
@ -164,6 +170,9 @@ public abstract class ExternalComponent extends RocketComponent implements Outsi
@Override
public double getRotation() {
if (axial) {
return 0.;
}
return this.rotation_rad;
}

9
core/src/net/sf/openrocket/rocketcomponent/Stage.java
View File

@ -77,6 +77,9 @@ public class Stage extends ComponentAssembly implements FlightConfigurableCompon
@Override
public double getAngularPosition() {
if (axial) {
return 0.;
}
return this.position_angular_rad;
}
@ -87,6 +90,9 @@ public class Stage extends ComponentAssembly implements FlightConfigurableCompon
@Override
public double getRadialPosition() {
if (axial) {
return 0.;
}
return this.position_radial_m;
}
@ -97,6 +103,9 @@ public class Stage extends ComponentAssembly implements FlightConfigurableCompon
@Override
public double getRotation() {
if (axial) {
return 0.;
}
return this.rotation_rad;
}