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

Merge pull request #545 from bweissinger/unstable

Browse Source 
[Fix #544] InnerTube.getInstanceOffsets() returning Coordinate.ZERO for single inner tube
This commit is contained in:
Wes Cravens 2019-09-01 11:26:13 -05:00 committed by GitHub
commit 0509f9e8ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/net/sf/openrocket/rocketcomponent/InnerTube.java
View File

@ -217,12 +217,15 @@ public class InnerTube extends ThicknessRingComponent implements AxialPositionab
@Override @Override
public Coordinate[] getInstanceOffsets(){ public Coordinate[] getInstanceOffsets(){
if ( 1 == getInstanceCount()) if ( 1 == getInstanceCount()) {
return new Coordinate[] { Coordinate.ZERO }; double yOffset = this.radialPosition * Math.cos(this.radialDirection);
double zOffset = this.radialPosition * Math.sin(this.radialDirection);
return new Coordinate[] { Coordinate.ZERO.add(0.0, yOffset, zOffset) };
}
List<Coordinate> points = getClusterPoints(); List<Coordinate> points = getClusterPoints();
return points.toArray( new Coordinate[ points.size()]); return points.toArray( new Coordinate[ points.size() ]);
} }
// @Override // @Override
@ -387,4 +390,4 @@ public class InnerTube extends ThicknessRingComponent implements AxialPositionab
return this.motors.toDebug(); return this.motors.toDebug();
} }
} }