Merge pull request #947 from SteelFill/ace_fallback_fix

SteelFill · web-flow · commit 502cbbef07ea · 2024-06-02T10:36:38.000-05:00
Fix .ace Textures Not Being Used as Fallback for Missing .dds
diff --git a/Source/RunActivity/Viewer3D/Materials.cs b/Source/RunActivity/Viewer3D/Materials.cs
@@ -79,7 +79,7 @@ public Texture2D Get(string path, Texture2D defaultTexture, bool required = fals
                             if (File.Exists(aceTexture))
                             {
                                 texture = Orts.Formats.Msts.AceFile.Texture2DFromFile(GraphicsDevice, aceTexture);
-                                Trace.TraceWarning("Required texture {1} not existing; using existing texture {2}", path, aceTexture);
+                                Trace.TraceWarning("Required texture {0} not existing; using existing texture {1}", path, aceTexture);
                             }
                             else return defaultTexture;
                         }

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public Texture2D Get(string path, Texture2D defaultTexture, bool required = fals`
`79`	`79`	`if (File.Exists(aceTexture))`
`80`	`80`	`{`
`81`	`81`	`texture = Orts.Formats.Msts.AceFile.Texture2DFromFile(GraphicsDevice, aceTexture);`
`82`		`- Trace.TraceWarning("Required texture {1} not existing; using existing texture {2}", path, aceTexture);`
	`82`	`+ Trace.TraceWarning("Required texture {0} not existing; using existing texture {1}", path, aceTexture);`
`83`	`83`	`}`
`84`	`84`	`else return defaultTexture;`
`85`	`85`	`}`