kotovalexarian/matabstrix
Archived
1
0
Fork 0
Code Activity

Sync array sizes

Browse source
This commit is contained in:
Meoweg 2015-11-06 21:23:17 +00:00
parent e754e334d5
commit afa9b47d3c
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
main.cpp
View file

@ -204,8 +204,11 @@ Model::Model(const char *const filename)
{ {
std::ifstream file(filename, std::ios::in); std::ifstream file(filename, std::ios::in);
std::vector<glm::vec3> tmp_positions;
std::vector<glm::vec3> tmp_normals; std::vector<glm::vec3> tmp_normals;
size_t index = 0;
std::string line; std::string line;
while (std::getline(file, line)) while (std::getline(file, line))
{ {
@ -213,8 +216,7 @@ Model::Model(const char *const filename)
{ {
glm::vec3 v; glm::vec3 v;
sscanf(line.data(), "v %f %f %f", &v.x, &v.y, &v.z); sscanf(line.data(), "v %f %f %f", &v.x, &v.y, &v.z);
positions.push_back(v); tmp_positions.push_back(v);
normals.resize(positions.size());
} }
else else
if (line.substr(0, 3) == "vn ") if (line.substr(0, 3) == "vn ")
@ -226,14 +228,16 @@ Model::Model(const char *const filename)
else else
if (line.substr(0, 2) == "f ") if (line.substr(0, 2) == "f ")
{ {
GLushort a_v, a_n, b_v, b_n, c_v, c_n; GLushort v[3];
sscanf(line.data(), "f %hu//%hu %hu//%hu %hu//%hu", &a_v, &a_n, &b_v, &b_n, &c_v, &c_n); GLushort vn[3];
normals[a_v - 1] = tmp_normals[a_n - 1]; sscanf(line.data(), "f %hu//%hu %hu//%hu %hu//%hu", &v[0], &vn[0], &v[1], &vn[1], &v[2], &vn[2]);
normals[b_v - 1] = tmp_normals[b_n - 1];
normals[c_v - 1] = tmp_normals[c_n - 1]; for (int i = 0; i < 3; ++i)
elements.push_back(a_v - 1); {
elements.push_back(b_v - 1); elements.push_back(index++);
elements.push_back(c_v - 1); positions.push_back(tmp_positions[v[i] - 1]);
normals.push_back(tmp_normals[vn[i] - 1]);
}
} }
} }