Subversion Repositories gelsvn

Rev

Rev 79 | Rev 421 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 79 Rev 178
Line 151... Line 151...
151
						break;
151
						break;
152
					}
152
					}
153
				break;
153
				break;
154
			case 'm': // Map ... all maps are treated equally.
154
			case 'm': // Map ... all maps are treated equally.
155
				{
155
				{
156
					//fgets(buf, sizeof(buf), file);
-
 
157
					fscanf(file,"%s",buf);
156
					fscanf(file,"%s",buf);
158
					string texname = pathname + string(buf);
-
 
159
					int tm_idx = mesh->find_texmap(texname);
157
					mesh->materials[nummaterials].tex_path = pathname;
160
					if(tm_idx == -1)
-
 
161
						{
-
 
162
							Texmap tm;
-
 
163
							if(tm.load(texname))
-
 
164
								{
-
 
165
									tm_idx = mesh->texmaps.size();
-
 
166
									mesh->texmaps.push_back(tm);
-
 
167
								}
-
 
168
						}
-
 
169
					mesh->materials[nummaterials].tex_id = tm_idx;
158
					mesh->materials[nummaterials].tex_name = string(buf);
170
				}
159
				}
171
				break;
160
				break;
172
			default:
161
			default:
173
				/* eat up rest of line */
162
				/* eat up rest of line */
174
				fgets(buf, sizeof(buf), file);
163
				fgets(buf, sizeof(buf), file);