m.giller/cloudy-raytracer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed botched merge

Browse source
This commit is contained in:
arvid schröder 2022-11-25 15:09:05 +01:00
parent d077b8981c
commit d00599ced6
1 changed files with 165 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scene/scene.cpp
View file

@ -204,20 +204,6 @@ std::vector<std::shared_ptr<Primitive>> Scene::loadObj(char const *fileName, Vec
std::cout << " -> " << vtData.size() << " uv-positions parsed" << std::endl;
std::cout << " -> " << faces.size() << " primitives parsed" << std::endl;
faces.push_back(std::make_shared<Triangle>(vertices[x - 1] * scale + translation,
vertices[y - 1] * scale + translation,
vertices[z - 1] * scale + translation,
vertex_normals[xn - 1], vertex_normals[yn - 1],
vertex_normals[zn - 1],
shader));
} else if (key == "#") {
file.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
} else {
file.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
}
}
file.close();
}
return faces;
}