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

Fix CMy & CMz of rail button and launch lug

Browse Source
This commit is contained in:
SiboVG 2023-05-23 23:35:54 +02:00
parent 7ff01c3b4f
commit dceed80dff
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/net/sf/openrocket/rocketcomponent/LaunchLug.java
View File

@ -228,9 +228,12 @@ public class LaunchLug extends Tube implements AnglePositionable, BoxBounded, Li
@Override @Override
public Coordinate getComponentCG() { public Coordinate getComponentCG() {
final double parentRadius = parent instanceof SymmetricComponent ?
((SymmetricComponent) parent).getRadius(getAxialOffset()) : 0;
final double CMx = length / 2 + (instanceSeparation * (instanceCount-1)) / 2; final double CMx = length / 2 + (instanceSeparation * (instanceCount-1)) / 2;
final double CMy = Math.cos(this.angleOffsetRad)*getOuterRadius(); final double CMy = Math.cos(this.angleOffsetRad) * (parentRadius + getOuterRadius());
final double CMz = Math.sin(this.angleOffsetRad)*getOuterRadius(); final double CMz = Math.sin(this.angleOffsetRad) * (parentRadius + getOuterRadius());
return new Coordinate(CMx, CMy, CMz, getComponentMass()); return new Coordinate(CMx, CMy, CMz, getComponentMass());
} }

6
core/src/net/sf/openrocket/rocketcomponent/RailButton.java
View File

@ -381,14 +381,16 @@ public class RailButton extends ExternalComponent implements AnglePositionable,
final double flangeCM = this.totalHeight_m - getFlangeHeight()/2; final double flangeCM = this.totalHeight_m - getFlangeHeight()/2;
final double screwCM = this.totalHeight_m + 4 * this.screwHeight_m / (3 * Math.PI); final double screwCM = this.totalHeight_m + 4 * this.screwHeight_m / (3 * Math.PI);
final double heightCM = (massBase*baseCM + massInner*innerCM + massFlange*flangeCM + massScrew*screwCM)/totalMass; final double heightCM = (massBase*baseCM + massInner*innerCM + massFlange*flangeCM + massScrew*screwCM)/totalMass;
final double parentRadius = parent instanceof SymmetricComponent ?
((SymmetricComponent) parent).getRadius(getAxialOffset()) : 0;
if (heightCM > this.totalHeight_m + this.screwHeight_m) { if (heightCM > this.totalHeight_m + this.screwHeight_m) {
throw new BugException(" bug found while computing the CG of a RailButton: "+this.getName()+"\n height of CG: "+heightCM); throw new BugException(" bug found while computing the CG of a RailButton: "+this.getName()+"\n height of CG: "+heightCM);
} }
final double CMx = (instanceSeparation * (instanceCount-1)) / 2; final double CMx = (instanceSeparation * (instanceCount-1)) / 2;
final double CMy = Math.cos(this.angleOffsetRad)*heightCM; final double CMy = Math.cos(this.angleOffsetRad) * (parentRadius + heightCM);
final double CMz = Math.sin(this.angleOffsetRad)*heightCM; final double CMz = Math.sin(this.angleOffsetRad) * (parentRadius + heightCM);
return new Coordinate( CMx, CMy, CMz, getComponentMass()); return new Coordinate( CMx, CMy, CMz, getComponentMass());
} }