From e7724c13ccecb7d82d482e8ee5b112d252c9d4d1 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Wed, 17 Jun 2015 15:48:22 -0700 Subject: [PATCH] Fixed Wavefront Object Importer reading files with integer values. Closes #1651, #1654 --- .../client/model/obj/WavefrontObject.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java b/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java index 530fdfd9e..ff9dd2f90 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java +++ b/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java @@ -26,9 +26,9 @@ import cpw.mods.fml.relauncher.SideOnly; */ public class WavefrontObject implements IModelCustom { - private static Pattern vertexPattern = Pattern.compile("(v( (\\-){0,1}\\d+\\.\\d+){3,4} *\\n)|(v( (\\-){0,1}\\d+\\.\\d+){3,4} *$)"); - private static Pattern vertexNormalPattern = Pattern.compile("(vn( (\\-){0,1}\\d+\\.\\d+){3,4} *\\n)|(vn( (\\-){0,1}\\d+\\.\\d+){3,4} *$)"); - private static Pattern textureCoordinatePattern = Pattern.compile("(vt( (\\-){0,1}\\d+\\.\\d+){2,3} *\\n)|(vt( (\\-){0,1}\\d+\\.\\d+){2,3} *$)"); + private static Pattern vertexPattern = Pattern.compile("(v( (\\-){0,1}\\d+(\\.\\d+)?){3,4} *\\n)|(v( (\\-){0,1}\\d+(\\.\\d+)?){3,4} *$)"); + private static Pattern vertexNormalPattern = Pattern.compile("(vn( (\\-){0,1}\\d+(\\.\\d+)?){3,4} *\\n)|(vn( (\\-){0,1}\\d+(\\.\\d+)?){3,4} *$)"); + private static Pattern textureCoordinatePattern = Pattern.compile("(vt( (\\-){0,1}\\d+\\.\\d+){2,3} *\\n)|(vt( (\\-){0,1}\\d+(\\.\\d+)?){2,3} *$)"); private static Pattern face_V_VT_VN_Pattern = Pattern.compile("(f( \\d+/\\d+/\\d+){3,4} *\\n)|(f( \\d+/\\d+/\\d+){3,4} *$)"); private static Pattern face_V_VT_Pattern = Pattern.compile("(f( \\d+/\\d+){3,4} *\\n)|(f( \\d+/\\d+){3,4} *$)"); private static Pattern face_V_VN_Pattern = Pattern.compile("(f( \\d+//\\d+){3,4} *\\n)|(f( \\d+//\\d+){3,4} *$)"); @@ -49,7 +49,7 @@ public class WavefrontObject implements IModelCustom public WavefrontObject(ResourceLocation resource) throws ModelFormatException { this.fileName = resource.toString(); - + try { IResource res = Minecraft.getMinecraft().getResourceManager().getResource(resource); @@ -60,7 +60,7 @@ public class WavefrontObject implements IModelCustom throw new ModelFormatException("IO Exception reading model format", e); } } - + public WavefrontObject(String filename, InputStream inputStream) throws ModelFormatException { this.fileName = filename;