benkyd/inferno-cpu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frametimes

Browse Source
This commit is contained in:
Ben Kyd
2019-08-05 22:12:58 +01:00
parent f57d75199f
commit ca3cf28a31
5 changed files with 150067 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/util/assetloader.cpp
View File

@@ -14,7 +14,7 @@ glm::vec3 getNormal(glm::vec3 p0, glm::vec3 p1, glm::vec3 p2) {
glm::vec3 normal;
normal.x = u.y * v.z - u.z * v.y;
normal.y = u.z * v.x - u.x * v.z;
normal.z = u.x * v.y - u.y - v.x;
normal.z = u.x * v.y - u.y * v.x;
return normal;
}
@@ -66,14 +66,22 @@ std::vector<Primative*> LoadTrianglesBasic(std::string path) {
// tinyobj::material_t material = materials[shapes[s].mesh.material_ids[f]];
Triangle* tmp = new Triangle {
{avx[0], avy[0], avz[0]},
{avx[1], avy[1], avz[1]},
{avx[2], avy[2], avz[2]},
// glm::vec3 normal = getNormal(
// {avx[0], avy[0], avz[0]},
// {avx[1], avy[1], avz[1]},
// {avx[2], avy[2], avz[2]}
// );
{anx[0], any[0], anz[0]},
{anx[1], any[1], anz[1]},
{anx[2], any[2], anz[2]},
Triangle* tmp = new Triangle {
{avx[0], avy[0], avz[0]},
{avx[1], avy[1], avz[1]},
{avx[2], avy[2], avz[2]},
// normal, normal, normal
{anx[0], any[0], anz[0]},
{anx[1], any[1], anz[1]},
{anx[2], any[2], anz[2]},
};
triangles.push_back(tmp);