3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix admesh's STL parser in order to make it more tolerant for broken STL files having multiple 'solid' definitions. Still not the ideal STL parser, but handles the cases that were reported so far. #2471 #2842

Browse Source
This commit is contained in:
Alessandro Ranellucci 2015-06-01 19:49:52 +02:00
parent f14c0e2183
commit 6095427926
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
xs/src/admesh/stlinit.c
View File

@ -152,16 +152,17 @@ stl_count_facets(stl_file *stl, char *file) {
} }
/* Find the number of facets */ /* Find the number of facets */
j = 0; char linebuf[100];
for(i = 0; i < file_size ; i++) { while (fgets(linebuf, 100, stl->fp) != NULL) {
j++; /* don't count short lines */
if(getc(stl->fp) == '\n') { if (strlen(linebuf) <= 4) continue;
if(j > 4) { /* don't count short lines */
num_lines++; /* skip solid/endsolid lines as broken STL file generators may put several of them */
} if (strncmp(linebuf, "solid", 5) == 0 || strncmp(linebuf, "endsolid", 8) == 0) continue;
j = 0;
} ++num_lines;
} }
rewind(stl->fp); rewind(stl->fp);
/* Get the header */ /* Get the header */
@ -269,8 +270,6 @@ stl_read(stl_file *stl, int first_facet, int first) {
fseek(stl->fp, HEADER_SIZE, SEEK_SET); fseek(stl->fp, HEADER_SIZE, SEEK_SET);
} else { } else {
rewind(stl->fp); rewind(stl->fp);
/* Skip the first line of the file */
while(getc(stl->fp) != '\n');
} }
for(i = first_facet; i < stl->stats.number_of_facets; i++) { for(i = first_facet; i < stl->stats.number_of_facets; i++) {
@ -288,13 +287,18 @@ stl_read(stl_file *stl, int first_facet, int first) {
} else } else
/* Read a single facet from an ASCII .STL file */ /* Read a single facet from an ASCII .STL file */
{ {
if((fscanf(stl->fp, "%*s %*s %f %f %f\n", &facet.normal.x, &facet.normal.y, &facet.normal.z) + \ // skip solid/endsolid
fscanf(stl->fp, "%*s %*s") + \ // (in this order, otherwise it won't work when they are paired in the middle of a file)
fscanf(stl->fp, "%*s %f %f %f\n", &facet.vertex[0].x, &facet.vertex[0].y, &facet.vertex[0].z) + \ fscanf(stl->fp, "endsolid\n");
fscanf(stl->fp, "%*s %f %f %f\n", &facet.vertex[1].x, &facet.vertex[1].y, &facet.vertex[1].z) + \ fscanf(stl->fp, "solid %*s\n");
fscanf(stl->fp, "%*s %f %f %f\n", &facet.vertex[2].x, &facet.vertex[2].y, &facet.vertex[2].z) + \
fscanf(stl->fp, "%*s") + \ if((fscanf(stl->fp, " facet normal %f %f %f\n", &facet.normal.x, &facet.normal.y, &facet.normal.z) + \
fscanf(stl->fp, "%*s")) != 12) { fscanf(stl->fp, " outer loop\n") + \
fscanf(stl->fp, " vertex %f %f %f\n", &facet.vertex[0].x, &facet.vertex[0].y, &facet.vertex[0].z) + \
fscanf(stl->fp, " vertex %f %f %f\n", &facet.vertex[1].x, &facet.vertex[1].y, &facet.vertex[1].z) + \
fscanf(stl->fp, " vertex %f %f %f\n", &facet.vertex[2].x, &facet.vertex[2].y, &facet.vertex[2].z) + \
fscanf(stl->fp, " endloop\n") + \
fscanf(stl->fp, " endfacet\n")) != 12) {
perror("Something is syntactically very wrong with this ASCII STL!"); perror("Something is syntactically very wrong with this ASCII STL!");
stl->error = 1; stl->error = 1;
return; return;