Fix: Invert Y texture co-ordinates for OBJ exported via Blender

#973
leezer3 · Dec 10, 2023 · a4ae983 · a4ae983
1 parent 22034a5
commit a4ae983
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/source/AssimpParser/Wavefront/ObjFileParser.cs b/source/AssimpParser/Wavefront/ObjFileParser.cs
@@ -148,6 +148,10 @@ protected void ParseFile(string[] lines)
 				{
 					Model.Exporter = ModelExporter.BlockBench;
 				}
+				if (buffer.IndexOf("Blender", StringComparison.InvariantCultureIgnoreCase) != -1)
+				{
+					Model.Exporter = ModelExporter.Blender;
+				}
 				if(hash != -1)
 				{
 					string afterHash = buffer.Substring(hash + 1).Trim();

diff --git a/source/OpenBveApi/Objects/Helpers/ModelExporter.cs b/source/OpenBveApi/Objects/Helpers/ModelExporter.cs
@@ -20,6 +20,8 @@ public enum ModelExporter
 		/// <summary>Google SketchUp</summary>
 		SketchUp,
 		/// <summary>BlockBench</summary>
-		BlockBench
+		BlockBench,
+		/// <summary>Blender</summary>
+		Blender
 	}
 }
diff --git a/source/Plugins/Object.Wavefront/Parsers/AssimpObjParser.cs b/source/Plugins/Object.Wavefront/Parsers/AssimpObjParser.cs
@@ -69,6 +69,7 @@ internal static StaticObject ReadObject(string FileName)
 							textureCoordinate.X *= -1.0;
 							textureCoordinate.Y *= -1.0;
 							break;
+						case ModelExporter.Blender:
 						case ModelExporter.BlockBench:
 							textureCoordinate.Y *= -1.0;
 							break;

diff --git a/source/Plugins/Object.Wavefront/Parsers/WavefrontObjParser.cs b/source/Plugins/Object.Wavefront/Parsers/WavefrontObjParser.cs
@@ -80,6 +80,11 @@ internal static StaticObject ReadObject(string FileName, System.Text.Encoding En
 					{
 						Exporter = ModelExporter.BlockBench;
 					}
+
+					if (Lines[i].IndexOf("Blender", StringComparison.InvariantCultureIgnoreCase) != -1)
+					{
+						Exporter = ModelExporter.Blender;
+					}
 					if(hash != -1 && eq != -1)
 					{
 						string afterHash = Lines[i].Substring(hash + 1).Trim();
@@ -255,6 +260,7 @@ internal static StaticObject ReadObject(string FileName, System.Text.Encoding En
 											newVertex.TextureCoordinates.X *= -1.0;
 											newVertex.TextureCoordinates.Y *= -1.0;
 											break;
+										case ModelExporter.Blender:
 										case ModelExporter.BlockBench:
 											newVertex.TextureCoordinates.Y *= -1.0;
 											break;