Automatic merge of T1.6-rc7-38-ge57a7a113 and 15 pull requests

- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at 2e06f85: Automatic speed control
- Pull request #1104 at 87cdd9f: 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 03c6f8f: Fix for bug https://bugs.launchpad.net/or/+bug/2117357. 
- Pull request #1143 at 71e57d2: Status in Work Orders popup set too fast
- Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content
- Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger
- 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 278d8ff: Particle Emitter Overhaul

Author: openrails-bot

Source/Documentation/Manual/physics.rst

@@ -2639,7 +2639,8 @@ be included to further customize effect emitters:
   particles from this emitter. The default texture is "smokemain.ace" for steam-type emitters and
   "dieselsmoke.ace" for diesel-type emitters. If the texture cannot be found from the engine's/wagon's
   folder, then the ``GLOBAL\TEXTURES`` folder is checked, and if the texture is not there the ``Content``
-  folder included with OR is checked. Allowed texture formats are ``.png, .jpg, .bmp, .gif, .ace, or .dds``.
+  folder included with OR is checked. OR will search for any ``.ace`` or ``.dds`` textures with the name
+  specified, though .dds is preferred over .ace.
   A path to a texture can also be used, such as ``ORTSGraphic ( "..\\SmokeTextures\\steam.dds" )``, to search
   for textures not in the same folder as the engine or wagon.
 - ``ORTSGraphicAtlasLayout ( w h )`` -- Particle textures generally include multiple sprites in a single file

Source/RunActivity/Viewer3D/Materials.cs

@@ -65,14 +65,12 @@ public Texture2D Get(string path, Texture2D defaultTexture, bool required = fals
                 return defaultTexture;
 
             path = path.ToLowerInvariant();
-            var ext = Path.GetExtension(path);
-
             if (!Textures.ContainsKey(path))
             {
                 try
                 {
                     Texture2D texture;
-                    if (ext == ".dds")
+                    if (Path.GetExtension(path) == ".dds")
                     {
                         if (File.Exists(path))
                         {
@@ -91,10 +89,10 @@ public Texture2D Get(string path, Texture2D defaultTexture, bool required = fals
                             else return defaultTexture;
                         }
                     }
-                    else if (ext == ".ace")
+                    else if (Path.GetExtension(path) == ".ace")
                     {
                         var alternativeTexture = Path.ChangeExtension(path, ".dds");
-
+                        
                         if (File.Exists(alternativeTexture))
                         {
                             DDSLib.DDSFromFile(alternativeTexture, GraphicsDevice, true, out texture);
@@ -147,30 +145,7 @@ Texture2D invalid()
                         }
                     }
                     else
-                    {
-                        using (var stream = File.OpenRead(path))
-                        {
-                            if (ext == ".gif" || ext == ".jpg" || ext == ".png")
-                                texture = Texture2D.FromStream(GraphicsDevice, stream);
-                            else if (ext == ".bmp")
-                            {
-                                using (var image = System.Drawing.Image.FromStream(stream))
-                                {
-                                    using (var memoryStream = new MemoryStream())
-                                    {
-                                        image.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Png);
-                                        memoryStream.Seek(0, SeekOrigin.Begin);
-                                        texture = Texture2D.FromStream(GraphicsDevice, memoryStream);
-                                    }
-                                }
-                            }
-                            else
-                            {
-                                Trace.TraceWarning("Unsupported texture format: {0}", path);
-                                return defaultTexture;
-                            }
-                        }
-                    }
+                        return defaultTexture;
 
                     Textures.Add(path, texture);
                     return texture;

Source/RunActivity/Viewer3D/ParticleEmitter.cs

@@ -87,13 +87,21 @@ public void Initialize(string defaultTextureName)
             else
                 TexturePath = defaultTextureName;
 
+            string noExtension = Path.ChangeExtension(TexturePath, null);
+
+            string wagPath = Path.Combine(Path.GetDirectoryName(Emitter.CarViewer.Car.WagFilePath), noExtension);
+            string globalPath = Path.Combine(Viewer.Simulator.BasePath + @"\GLOBAL\TEXTURES\", noExtension);
+            string contentPath = Path.Combine(Viewer.ContentPath, noExtension);
+
             // Texture location preference is eng/wag folder -> MSTS GLOBAL\TEXTURES folder -> OR CONTENT folder
-            if (File.Exists(Path.Combine(Path.GetDirectoryName(Emitter.CarViewer.Car.WagFilePath), TexturePath)))
-                TexturePath = Path.Combine(Path.GetDirectoryName(Emitter.CarViewer.Car.WagFilePath), TexturePath);
-            else if (File.Exists(Path.Combine(Viewer.Simulator.BasePath + @"\GLOBAL\TEXTURES\", TexturePath)))
-                TexturePath = Path.Combine(Viewer.Simulator.BasePath + @"\GLOBAL\TEXTURES\", TexturePath);
-            else if (customTexture && File.Exists(Path.Combine(Viewer.ContentPath, TexturePath)))
-                TexturePath = Path.Combine(Viewer.ContentPath, TexturePath);
+            // File type agnostic: We should detect a match if a .ace OR .dds is present, regardless of the specific file type requested
+            // We give the material manager the path to the .dds file, but it will automatically load the .ace file if the .dds is missing
+            if (File.Exists(wagPath + ".dds") || File.Exists(wagPath + ".ace"))
+                TexturePath = wagPath + ".dds";
+            else if (File.Exists(globalPath + ".dds") || File.Exists(globalPath + ".ace"))
+                TexturePath = globalPath + ".dds";
+            else if (File.Exists(contentPath + ".dds") || File.Exists(contentPath + ".ace"))
+                TexturePath = contentPath + ".dds";
             else // Fall back to default texture in CONTENT folder
             {
                 TexturePath = Path.Combine(Viewer.ContentPath, defaultTextureName);