clray
diff src/mesh.cc @ 8:deaf85acf6af
interactive spheres
author | John Tsiombikas <nuclear@member.fsf.org> |
---|---|
date | Fri, 23 Jul 2010 19:48:43 +0100 |
parents | b06518bb16e9 |
children | d9a1bab1c3f5 |
line diff
1.1 --- a/src/mesh.cc Fri Jul 23 01:22:03 2010 +0100 1.2 +++ b/src/mesh.cc Fri Jul 23 19:48:43 2010 +0100 1.3 @@ -2,6 +2,7 @@ 1.4 #include <stdlib.h> 1.5 #include <string.h> 1.6 #include <errno.h> 1.7 +#include <limits.h> 1.8 #include <string> 1.9 #include <vector> 1.10 #include <map> 1.11 @@ -9,7 +10,7 @@ 1.12 1.13 using namespace std; 1.14 1.15 -#define COMMANDS \ 1.16 +#define COMMANDS \ 1.17 CMD(V), \ 1.18 CMD(VN), \ 1.19 CMD(VT), \ 1.20 @@ -136,7 +137,7 @@ 1.21 char cur_name[16]; 1.22 1.23 obj_file obj; 1.24 - 1.25 + 1.26 sprintf(cur_name, "default%02d.obj", seq++); 1.27 obj.cur_obj = cur_name; 1.28 1.29 @@ -144,7 +145,7 @@ 1.30 for(;;) { 1.31 Vector3 vec; 1.32 obj_face face; 1.33 - 1.34 + 1.35 char line[BUF_SZ]; 1.36 fgets(line, sizeof line, fp); 1.37 if(feof(fp)) { 1.38 @@ -246,7 +247,7 @@ 1.39 mat.kt = 1.0 - vmtl[i].alpha; 1.40 mat.kr = 0.0; // TODO 1.41 mat.spow = vmtl[i].shininess; 1.42 - 1.43 + 1.44 matnames[vmtl[i].name] = i; 1.45 } 1.46 } 1.47 @@ -356,7 +357,7 @@ 1.48 if(added_tc) { 1.49 obj->vt.pop_back(); 1.50 } 1.51 - 1.52 + 1.53 return mesh; 1.54 } 1.55 1.56 @@ -445,7 +446,7 @@ 1.57 static int get_cmd(char *str) 1.58 { 1.59 char *s = str; 1.60 - while((*s = toupper(*s))) s++; 1.61 + while((*s = toupper(*s))) s++; 1.62 1.63 for(int i=0; cmd_names[i]; i++) { 1.64 if(strcmp(str, cmd_names[i]) == 0) {