Merge pull request #756 from Csantucci/fix-night-dds-not-loaded

Csantucci · web-flow · commit 6cf0e64619bf · 2022-12-22T10:14:22.000+01:00
Bug fix for https://bugs.launchpad.net/or/+bug/1999253 Night .dds textures not loaded
diff --git a/Source/RunActivity/Viewer3D/Common/Helpers.cs b/Source/RunActivity/Viewer3D/Common/Helpers.cs
@@ -51,7 +51,8 @@ public static string GetNightTextureFile(Simulator simulator, string textureFile
         {
             var texturePath = Path.GetDirectoryName(textureFilePath);
             var textureName = Path.GetFileName(textureFilePath);
-            var nightTexturePath = !File.Exists(texturePath + @"\Night\" + textureName) ? Path.GetDirectoryName(texturePath) + @"\Night\" : texturePath + @"\Night\";
+            var nightTexturePath = !File.Exists(texturePath + @"\Night\" + textureName) &&
+                !File.Exists(texturePath + @"\Night\" + Path.ChangeExtension(textureName, ".dds")) ? Path.GetDirectoryName(texturePath) + @"\Night\" : texturePath + @"\Night\";
 
             if (!String.IsNullOrEmpty(nightTexturePath + textureName) && Path.GetExtension(nightTexturePath + textureName) == ".dds" && File.Exists(nightTexturePath + textureName))
             {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ public static string GetNightTextureFile(Simulator simulator, string textureFile`
`51`	`51`	`{`
`52`	`52`	`var texturePath = Path.GetDirectoryName(textureFilePath);`
`53`	`53`	`var textureName = Path.GetFileName(textureFilePath);`
`54`		`- var nightTexturePath = !File.Exists(texturePath + @"\Night\" + textureName) ? Path.GetDirectoryName(texturePath) + @"\Night\" : texturePath + @"\Night\";`
	`54`	`+ var nightTexturePath = !File.Exists(texturePath + @"\Night\" + textureName) &&`
	`55`	`+ !File.Exists(texturePath + @"\Night\" + Path.ChangeExtension(textureName, ".dds")) ? Path.GetDirectoryName(texturePath) + @"\Night\" : texturePath + @"\Night\";`
`55`	`56`
`56`	`57`	`if (!String.IsNullOrEmpty(nightTexturePath + textureName) && Path.GetExtension(nightTexturePath + textureName) == ".dds" && File.Exists(nightTexturePath + textureName))`
`57`	`58`	`{`