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

[fix] simulations now correctly count motors on boosters and pods

Browse Source 
- thrust now counts motors on InnerTubes AND BodyTubes.
This commit is contained in:
Daniel_M_Williams 2017-06-19 05:23:32 -05:00
parent 76d4136011
commit 95a927b3b7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/net/sf/openrocket/simulation/MotorClusterState.java
View File

@ -129,7 +129,9 @@ public class MotorClusterState {
if( this.currentState.isThrusting() ) { if( this.currentState.isThrusting() ) {
double motorStartTime = this.getMotorTime( startSimulationTime); double motorStartTime = this.getMotorTime( startSimulationTime);
double motorEndTime = this.getMotorTime( endSimulationTime); double motorEndTime = this.getMotorTime( endSimulationTime);
return this.motorCount * motor.getAverageThrust( motorStartTime, motorEndTime );
int instanceCount = this.config.getMount().getLocations().length;
return instanceCount * motor.getAverageThrust( motorStartTime, motorEndTime );
}else{ }else{
return 0.00; return 0.00;
} }