Browse Source

more bugs

master
tonton th 2 years ago
parent
commit
166dc651b4
  1. 2
      .gitignore
  2. 36
      importobj.c
  3. 6
      tools/read_obj.c

2
.gitignore vendored

@ -6,7 +6,7 @@ tbb @@ -6,7 +6,7 @@ tbb
gmon.out
dummy-file
tools/covid-19.obj
tools/*.obj
tools/read_obj
tools/xyz

36
importobj.c

@ -21,7 +21,9 @@ int try_to_read_an_OBJ_file(char *fname, int notused) @@ -21,7 +21,9 @@ int try_to_read_an_OBJ_file(char *fname, int notused)
FILE *fpin;
char line[LINE_SZ+1], *cptr;
float x, y, z;
int foo;
int foo, nbre;
BBList *bublist;
Bubulle bubulle;
#if DEBUG_LEVEL
fprintf(stderr, ">>> %s ( '%s' %d )\n", __func__, fname, notused);
@ -32,6 +34,14 @@ if (NULL==(fpin=fopen(fname, "r"))) { @@ -32,6 +34,14 @@ if (NULL==(fpin=fopen(fname, "r"))) {
exit(1);
}
bublist = alloc_bubulles(fname, 1000, 0);
if (NULL==bublist) {
fprintf(stderr, "err in %s, aborting...\n", __func__);
abort();
}
print_bublist_desc(bublist, 0);
nbre = 0;
while(cptr=fgets(line, LINE_SZ, fpin)) {
if (verbosity>1) fputs(line, stderr);
@ -46,16 +56,28 @@ while(cptr=fgets(line, LINE_SZ, fpin)) { @@ -46,16 +56,28 @@ while(cptr=fgets(line, LINE_SZ, fpin)) {
cptr = strtok(NULL, " ");
foo = sscanf(cptr, "%f", &z);
fprintf(stdout, "%16g %16g %16g\n", x, y, z);
}
memset(&bubulle, 0, sizeof(Bubulle));
niceprint_bubulle(&bubulle, 0);
bubulle.p.x = x;
bubulle.p.y = y;
bubulle.p.z = z;
niceprint_bubulle(&bubulle, 0);
foo = push_bubulle(bublist, &bubulle);
if (foo) {
fprintf(stderr, "err %d on push\n", foo);
break;
}
nbre++;
}
fclose(fpin);
return -7800;
if(verbosity) {
fprintf(stderr, "%s : %d vertices loaded\n", __func__, nbre);
}
return 0;
}
/* --------------------------------------------------------------------- */

6
tools/read_obj.c

@ -18,12 +18,10 @@ if (2 != argc) { @@ -18,12 +18,10 @@ if (2 != argc) {
exit(0);
}
verbosity = 0;
verbosity = 1;
foo = try_to_read_an_OBJ_file(argv[1], 0);
fprintf(stderr, "try to read -> %d\n", foo);
return 0;
}

Loading…
Cancel
Save