Subversion Repositories gelsvn

Rev

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

Rev 601 Rev 605
Line 90... Line 90...
90 
                    case 'N':
 90 
                    case 'N':
91 
                        switch(buf[1])
 91 
                        switch(buf[1])
92 
                    {
 92 
                    {
93 
                        case 's':
 93 
                        case 's':
94 
                            material_file >> mesh->materials[nummaterials].shininess;
 94 
                            material_file >> mesh->materials[nummaterials].shininess;
95 
                            mesh->materials[nummaterials].shininess *= 128.0/1000.0;
 95 
                            mesh->materials[nummaterials].shininess *= 128.0f/1000.0f;
96 
                            break;
 96 
                            break;
97 
                        case 'i':
 97 
                        case 'i':
98 
                            material_file >> mesh->materials[nummaterials].ior_in;
 98 
                            material_file >> mesh->materials[nummaterials].ior_in;
99 
                            break;
 99 
                            break;
100 
                    }
 100 
                    }
Line 204... Line 204...
204 
                            else if(sscanf(pch, "%d", &v)==1)
 204 
                            else if(sscanf(pch, "%d", &v)==1)
205 
                                v_indices.push_back(get_vert(v));
 205 
                                v_indices.push_back(get_vert(v));
206 
                            pch = strtok(0, " \t");
 206 
                            pch = strtok(0, " \t");
207 
                        }
 207 
                        }
208 
                        if(v_indices.size()>=3)
 208 
                        if(v_indices.size()>=3)
209 
                            for(int i=0;i<=(v_indices.size()-3);++i)
 209 
                            for(size_t i=0;i<=(v_indices.size()-3);++i)
210 
                            {
 210 
                            {
211 
                                int idx = mesh->geometry.add_face(Vec3i(v_indices[0], v_indices[i+1], v_indices[i+2]));
 211 
                                int idx = mesh->geometry.add_face(Vec3i(v_indices[0], v_indices[i+1], v_indices[i+2]));
212 
                                if(t_indices.size())
 212 
                                if(t_indices.size())
213 
                                    mesh->texcoords.add_face(Vec3i(t_indices[0], t_indices[i+1], t_indices[i+2]), idx);
 213 
                                    mesh->texcoords.add_face(Vec3i(t_indices[0], t_indices[i+1], t_indices[i+2]), idx);
214 
                                if(n_indices.size())
 214 
                                if(n_indices.size())