Automatic merge of T1.6-rc6-37-g6dd094783 and 12 pull requests

- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1104 at 86d38a2: Handle simple adhesion within the axle module
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID.
- Pull request #1139 at b47224d: Fix for bug https://bugs.launchpad.net/or/+bug/2117357. 
- Pull request #1142 at a24747c: Fix light position calculation for deeper hierarchy levels
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1081 at 689494b: Brake cuts power unification
- Pull request #1124 at fab5457: Built-in PBL2 brake controller
- Pull request #1128 at 58de4c3: Particle Emitter Overhaul

Author: openrails-bot

Source/RunActivity/Viewer3D/Lights.cs

@@ -226,8 +226,29 @@ public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
 
             // Calculate XNA matrix for shape file objects by offsetting from car's location
             // The new List<int> is intentional, this allows the dictionary to be changed while iterating
+            int maxDepth = trainCarShape.Hierarchy.Max();
             foreach (int index in new List<int>(ShapeXNATranslations.Keys))
-                ShapeXNATranslations[index] = trainCarShape.XNAMatrices[index] * xnaDTileTranslation;
+            {
+                Matrix res = trainCarShape.XNAMatrices[index];
+                int hIndex = trainCarShape.Hierarchy[index];
+
+                int i = 0;
+
+                // Transform the matrix repeatedly for all of its parents
+                while (hIndex > -1 && hIndex < trainCarShape.Hierarchy.Length && i < maxDepth)
+                {
+                    res = res * trainCarShape.XNAMatrices[hIndex];
+                    // Prevent potential infinite loop due to faulty hierarchy definition
+                    if (hIndex != trainCarShape.Hierarchy[hIndex])
+                        hIndex = trainCarShape.Hierarchy[hIndex];
+                    else
+                        break;
+
+                    i++;
+                }
+
+                ShapeXNATranslations[index] = res * xnaDTileTranslation;
+            }
 
             float objectRadius = 20; // Even more arbitrary.
             float objectViewingDistance = Viewer.Settings.ViewingDistance; // Arbitrary.