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

Fix motor CG

Browse Source
This commit is contained in:
SiboVG 2023-04-01 16:14:30 +02:00
parent c8f79bbdf5
commit 66f7542bcc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/net/sf/openrocket/file/rasaero/importt/SimulationHandler.java
View File

@ -470,11 +470,12 @@ public class SimulationHandler extends AbstractElementHandler {
Coordinate[] CGPoints = motor.getCGPoints(); Coordinate[] CGPoints = motor.getCGPoints();
if (CGPoints != null && CGPoints.length > 1) { if (CGPoints != null && CGPoints.length > 1) {
double motorPositionXRel = mount.getMotorPosition(fcid).x; // Motor position relative to the mount double mountLocationX = mount.getLocations()[0].x + mount.getLength(); // Bottom location of the mount
double mountLocationX = mount.getLocations()[0].x; double motorLength = motor.getLength();
double motorLocationX = mountLocationX + motorPositionXRel;
double motorCG = motor.getCGPoints()[0].x + motorLocationX; // RASAero assumes motor CG to be at half the motor length from the bottom of the parent
// TODO: RASAero assumes motor CG to be at half the motor length from the bottom of the parent double motorCG = mountLocationX - motorLength / 2;
return combinedCG * (1 + motorMass / stageMass) return combinedCG * (1 + motorMass / stageMass)
- motorCG * (motorMass / stageMass); - motorCG * (motorMass / stageMass);
} }