Automatic merge of T1.6-rc2-41-gacd714487 and 9 pull requests

- Pull request #570 at 362e4e7: glTF 2.0 support with PBR lighting
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at 35f0051: Automatic speed control
- Pull request #1107 at f5eb3dc: Fix DPMode when last remote is moved to front.
- Pull request #1108 at cd5c185: Fix Horn, Bell, and MU light conditions on AI trains
- Pull request #1109 at 0190043: Fix Erroneous Detection of Departure Before Passenger Boarding Completed
- Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1081 at 689494b: Brake cuts power unification

Author: openrails-bot

Source/3rdPartyLibs/glTFLoader/Build_Instructions.txt

@@ -0,0 +1,10 @@
+1. git clone the glTF schema repository to any directory: https://github.com/KhronosGroup/glTF
+2. Replace the glTF\specification\2.0\schema\extras.schema.json file with the one provided here by the OpenRails project.
+3. Replace the glTF\specification\2.0\schema\animation.channel.target.schema.json file with the one provided here by the OpenRails project.
+4. Copy the glTF\extensions\2.0\Khronos\KHR_animation_pointer\schema\animation.channel.target.KHR_animation_pointer.schema.json file in to the glTF\specification\2.0\schema\ folder.
+5. git clone the gltfLoader repository to the same base directory: https://github.com/KhronosGroup/glTF-CSharp-Loader
+6. Open the glTF-CSharp-Loader\CSharp.sln
+7. Bump the version of Newtonsoft.Json in the gltfLoader project to match with that one used in OpenRails (11.0.2 as of writing this).
+8. Build the Generator project.
+9. Build the gltfLoader project.
+10. Copy the resulting glTF-CSharp-Loader\glTFLoader\bin\Debug\netstandard1.3\glTFLoader.dll to this directory.

Source/3rdPartyLibs/glTFLoader/animation.channel.target.schema.json

@@ -0,0 +1,40 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "animation.channel.target.schema.json",
+    "title": "Animation Channel Target",
+    "type": "object",
+    "description": "The descriptor of the animated property.",
+    "allOf": [ { "$ref": "glTFProperty.schema.json" } ],
+    "properties": {
+        "node": {
+            "allOf": [ { "$ref": "glTFid.schema.json" } ],
+            "description": "The index of the node to animate. When undefined, the animated object **MAY** be defined by an extension."
+        },
+        "path": {
+            "description": "The name of the node's TRS property to animate, or the `\"weights\"` of the Morph Targets it instantiates. For the `\"translation\"` property, the values that are provided by the sampler are the translation along the X, Y, and Z axes. For the `\"rotation\"` property, the values are a quaternion in the order (x, y, z, w), where w is the scalar. For the `\"scale\"` property, the values are the scaling factors along the X, Y, and Z axes.",
+            "anyOf": [
+                {
+                    "const": "pointer"
+                },
+                {
+                    "const": "translation"
+                },
+                {
+                    "const": "rotation"
+                },
+                {
+                    "const": "scale"
+                },
+                {
+                    "const": "weights"
+                },
+                {
+                    "type": "string"
+                }
+            ]
+        },
+        "extensions": { },
+        "extras": { }
+    },
+    "required": [ "path" ]
+}

Source/3rdPartyLibs/glTFLoader/extras.schema.json

@@ -0,0 +1,13 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "extras.schema.json",
+    "title": "Extras",
+    "type": "object",
+    "description": "Application-specific data.",
+    "gltf_sectionDescription": "Although `extras` **MAY** have any type, it is common for applications to store and access custom data as key/value pairs. Therefore, `extras` **SHOULD** be a JSON object rather than a primitive value for best portability.",
+    "properties": {
+    },
+    "additionalProperties": {
+        "type": "object"
+    }
+}

Source/3rdPartyLibs/glTFLoader/glTFLoader.dll

@@ -1222,53 +1222,6 @@ in the .cvf header, that is the right side viewpoint.
 
 Note that in Open Rails you may have more than three cabviewpoints defined for 2D cabs.
 
-Advanced cab viewport positioning
----------------------------------
-
-.. index::
-   single: ORTSShapeHierarchy
-
-In some unusual cases, it may be desired to have the cab view point move not with the main
-locomotive body, but with a sub object of the locomotive, such as a bogie. To do this, the
-parameter ``ORTSShapeHierarchy ( MATRIXNAME )`` can be added inside the .cvf file, once
-for each viewport. If this is used, the position of the viewport will no longer be measured
-relative to the locomotive itself, but relative to the sub object with the given name. As
-the sub object translates and rotates, the cab view will do the same in sync. Each viewport
-can be attached to a different sub object, though in many cases attaching all three to the
-same sub object will make the most sense::
-
-    Comment ( A hypothetical cab view where the cab is attached to the BOGIE1 sub object of the locomotive shape. )
-    Tr_CabViewFile (
-	    CabViewType ( 3 )
-	    CabViewFile ( Front.ace )
-	    CabViewWindow ( 0 0 640 400 )
-	    CabViewWindowFile ( "" )
-	    Position ( 1.265 3.44 6.24 )
-	    Direction ( 7 -20 1 )
-	    ORTSShapeHierarchy ( BOGIE1 )
-	    CabViewFile ( Rear.ace )
-	    CabViewWindow ( 0 0 640 480 )
-	    CabViewWindowFile ( "" )
-	    Position ( 1.26 3.44 6.24 )
-	    Direction ( 6 179 0 )
-	    ORTSShapeHierarchy ( BOGIE1 )
-	    CabViewFile ( Right.ace )
-	    CabViewWindow ( 0 0 640 480 )
-	    CabViewWindowFile ( "" )
-	    Position ( 1.26 3.44 6.24 )
-	    Direction ( 12 36 0 )
-	    ORTSShapeHierarchy ( BOGIE1 )
-
-Matrix names can be determined using shape viewing utilities. If the named matrix can't
-be found in the locomotive shape, a warning will be added to the log and the cab viewport
-will attach to the main shape object. ``ORTSShapeHierarchy`` is entirely optional, and if
-missing the cab viewport will be attached to the main shape object, same as in MSTS.
-
-Note that passenger views and 3D cabs also support ``ORTSShapeHierarchy`` but the
-:ref:`implementation is different<features-viewpoint-positioning>`, as it is not done
-inside the .cvf file.
-
-
 3D cabs
 =======
 
@@ -1318,48 +1271,40 @@ Development Rules
 - Within the Wagon section of the .eng file a block like the following one 
   has to be generated::
   
-    ORTS3DCab (
+    ORTS3DCab(
         ORTS3DCabFile ( Cab.s )
         ORTS3DCabHeadPos ( -0.9 2.4 5.2 )
         RotationLimit ( 40 60 0 )
         StartDirection ( 12 0 0 )
-        ORTSShapeOffset ( 0 0 0 )
-        ORTSShapeHierarchy ( MAIN )
     )
 
 - If also a rear cab is present, a second ``ORTS3DCab`` has to be added, 
   as follows::
 
-    ORTS3DCab (
+     ORTS3DCab(
         ORTS3DCabFile ( Cab.s )
         ORTS3DCabHeadPos ( 0.9 2.4 5.2 )
         RotationLimit ( 40 60 0 )
         StartDirection ( 12 180 0 )
-        ORTSShapeOffset ( 0 0 0 )
-        ORTSShapeHierarchy ( MAIN )
     )
 
-- Similarly to :ref:`passenger views<features-viewpoint-positioning>`,
-  ``ORTSShapeOffset`` and ``ORTSShapeHierarchy`` are optional and
-  give more control over the location of the cab shape and camera
-  location, but aren't needed for standard rolling stock.
-
 - Alternate 3D cab viewpoints may be added, as in the example here below::
 
-    ORTSAlternate3DCabViewPoints (
-        ORTSAlternate3DCabViewPoint (
-            ORTS3DCabFile ( Cab.s )
-            ORTS3DCabHeadPos ( 0.9 2.4 5.2 )
-            RotationLimit ( 40 60 0 )
-            StartDirection ( 12 0 0 )
-        )
-        ORTSAlternate3DCabViewPoint (
-            ORTS3DCabFile ( Cab.s )
-            ORTS3DCabHeadPos ( -0.8 2.4 5.2 )
-            RotationLimit ( 40 60 0 )
-            StartDirection ( 12 30 0 )
-        )
-    )
+      ORTSAlternate3DCabViewPoints
+                         (
+        ORTSAlternate3DCabViewPoint(
+           ORTS3DCabFile ( Cab.s )
+           ORTS3DCabHeadPos ( 0.9 2.4 5.2 )
+           RotationLimit ( 40 60 0 )
+           StartDirection ( 12 0 0 )
+                        )
+        ORTSAlternate3DCabViewPoint(
+          ORTS3DCabFile ( Cab.s )
+          ORTS3DCabHeadPos ( -0.8 2.4 5.2 )
+          RotationLimit ( 40 60 0 )
+          StartDirection ( 12 30 0 )
+                        )
+                        )
 
 
 -  To switch between alternate cab viewpoints ``Ctrl-Shift-1`` must be pressed.