projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor performance improvements, optional mouse, mouse cursor now drawn
[dosdemo]
/
src
/
meshload.c
diff --git
a/src/meshload.c
b/src/meshload.c
index
7e3bd29
..
5abd96e
100644
(file)
--- a/
src/meshload.c
+++ b/
src/meshload.c
@@
-81,7
+81,7
@@
int load_mesh(struct g3d_mesh *mesh, const char *fname)
struct vertex_pos_color v;
int num;
struct vertex_pos_color v;
int num;
- num = sscanf(line + 2, "%f %f %f %f %f %f %f", &v.x, &v.y, &v.z, &v.x, &v.y, &v.z, &v.a);
+ num = sscanf(line + 2, "%f %f %f %f %f %f %f", &v.x, &v.y, &v.z, &v.r, &v.g, &v.b, &v.a);
if(num < 3) {
fprintf(stderr, "%s:%d: invalid vertex definition: \"%s\"\n", fname, line_num, line);
goto err;
if(num < 3) {
fprintf(stderr, "%s:%d: invalid vertex definition: \"%s\"\n", fname, line_num, line);
goto err;
@@
-200,7
+200,7
@@
int load_mesh(struct g3d_mesh *mesh, const char *fname)
}
}
}
}
}
}
- if(i >= 3) found_quad = 1;
+ if(i > 3) found_quad = 1;
}
break;
}
break;