From b67c52fb5d8ea4ec8ac9ca8490619898feaaf3f0 Mon Sep 17 00:00:00 2001 From: rodri Date: Sat, 21 Sep 2024 11:05:13 +0000 Subject: allow '-' in object and material names. --- obj.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/obj.c b/obj.c index 8640776..345d5fb 100644 --- a/obj.c +++ b/obj.c @@ -629,7 +629,7 @@ objparse(char *file) } do{ *p++ = c; - }while(c = Bgetc(bin), (isalnum(c) || c == '.' || c == '_') && p-buf < sizeof(buf)-1); + }while(c = Bgetc(bin), (isalnum(c) || c == '.' || c == '_' || c == '-') && p-buf < sizeof(buf)-1); *p = 0; o = geto(obj, buf); if(o == nil){ @@ -850,7 +850,7 @@ Line2: p = buf; do{ *p++ = c; - }while(c = Bgetc(bin), (isalnum(c) || c == '.' || c == '_') && p-buf < sizeof(buf)-1); + }while(c = Bgetc(bin), (isalnum(c) || c == '.' || c == '_' || c == '-') && p-buf < sizeof(buf)-1); *p = 0; if((obj->materials = objmtlparse(buf)) == nil){ error("objmtlparse: %r"); @@ -862,7 +862,7 @@ Line2: p = buf; do{ *p++ = c; - }while(c = Bgetc(bin), (isalnum(c) || c == '.' || c == '_') && p-buf < sizeof(buf)-1); + }while(c = Bgetc(bin), (isalnum(c) || c == '.' || c == '_' || c == '-') && p-buf < sizeof(buf)-1); *p = 0; if(obj->materials != nil && (m = getmtl(obj->materials, buf)) == nil){ error("no material '%s' found", buf); -- cgit v1.2.3