From 85f1867424b0d4cf92e2fb1fb829b08e0a2e6774 Mon Sep 17 00:00:00 2001 From: tTh Date: Fri, 28 Apr 2023 00:00:50 +0200 Subject: [PATCH] little tweak --- tools/importobj.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/importobj.c b/tools/importobj.c index 58def09..4f5e9d4 100644 --- a/tools/importobj.c +++ b/tools/importobj.c @@ -49,7 +49,7 @@ Tokens TokenList[] = { { "vn", T_vt }, // c'est quoi ce truc ? { "l", T_line }, { "o", T_object }, - { "s", T_smoothing }, + { "s", T_smoothing }, // mmmm.... { "usemtl", T_usemtl }, { "mtllib", T_mtllib }, /* and more to come... */ @@ -149,7 +149,8 @@ if ( pts[0]==pts[1] || pts[0]==pts[2] || pts[2]==pts[1] ) { for (ix=0; ix<3; ix++) { a = ix % 3; b = (ix+1) % 3; - foo = push_a_missing_edge(edges, pts[a], pts[b]); + // foo = push_a_missing_edge(edges, pts[a], pts[b]); + foo = push_an_edge(edges, pts[a], pts[b]); if (foo) { fprintf(stderr, "%s: disaster #%d line %d\n", __func__, foo, linenumber); @@ -162,7 +163,7 @@ if (dropped) { // exit(1); } -#if DEBUG_LEVEL +#if DEBUG_LEVEL > 1 fprintf(stderr, "<<< %s\n", __func__); #endif @@ -198,14 +199,14 @@ if (NULL==(fpin=fopen(infname, "r"))) { } linenumber = 0; -bublist = alloc_bubulles(infname, 600000, 0); +bublist = alloc_bubulles(infname, 800000, 0); if (NULL==bublist) { fprintf(stderr, "in %s, no mem for bubls, aborting...\n", __func__); abort(); } if (verbosity > 1) print_bublist_desc(bublist, 0); -edges = alloc_edgelist("krkrkr", 2200000, 0); +edges = alloc_edgelist("krkrkr", 3000000, 0); if (NULL==edges) { fprintf(stderr, "no mem for edges in %s, aborting...\n", __func__); abort(); @@ -268,7 +269,7 @@ while(NULL!=(cptr=fgets(line, LINE_SZ, fpin))) { /* experimental code here */ foo = parse_face(cptr); if (foo) { - fprintf(stderr, "line %d '%s' parse face -> %d\n", + fprintf(stderr, "line %d '%s' parseface -> %d\n", linenumber, cptr, foo); exit(1); } @@ -299,7 +300,7 @@ while(NULL!=(cptr=fgets(line, LINE_SZ, fpin))) { break; default: - fprintf(stderr, "token %s -> %d ?\n", token, tokenid); + fprintf(stderr, "W: token %s -> %d ?\n", token, tokenid); break; } }