Handle JSBSim weights.

2021-09-23 10:05:59 +02:00
parent 178ad7b301
commit 2e383ccf7f
2 changed files with 44 additions and 13 deletions
@@ -286,9 +286,18 @@ var importFOB = func (ofp) {
 var importPayload = func (ofp) {
    var unit = ofp.getNode('params/units').getValue();
    var factor = ((unit == 'lbs') ? 1 : KG2LB);
-    var weightNodes = props.globals.getNode('/sim').getChildren('weight');
+    var weightNodes = [];
    var cargoWeightNodes = [];
    var paxWeightNodes = [];
+    var payloadNode = props.globals.getNode('payload');
+    if (payloadNode == nil) {
+        # yasim puts weights in `/sim/weight[]`
+        weightNodes = props.globals.getNode('/sim').getChildren('weight');
+    }
+    else {
+        # jsbsim puts weights in `/payload/weight[]`
+        weightNodes = payloadNode.getChildren('weight');
+    }

    foreach (var node; weightNodes) {
        var nodeName = node.getValue('name');