diff --git a/src/util/assetloader.cpp b/src/util/assetloader.cpp index 7711390..99aad5f 100644 --- a/src/util/assetloader.cpp +++ b/src/util/assetloader.cpp @@ -59,29 +59,29 @@ std::vector LoadTrianglesBasic(std::string path) { avy[v] = attrib.vertices[3 * idx.vertex_index + 1]; avz[v] = attrib.vertices[3 * idx.vertex_index + 2]; - anx[v] = attrib.normals[3 * idx.normal_index + 0]; - any[v] = attrib.normals[3 * idx.normal_index + 1]; - anz[v] = attrib.normals[3 * idx.normal_index + 2]; + // anx[v] = attrib.normals[3 * idx.normal_index + 0]; + // any[v] = attrib.normals[3 * idx.normal_index + 1]; + // anz[v] = attrib.normals[3 * idx.normal_index + 2]; } // tinyobj::material_t material = materials[shapes[s].mesh.material_ids[f]]; - // glm::vec3 normal = getNormal( - // {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]} + ); 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 + normal, normal, normal - {anx[0], any[0], anz[0]}, - {anx[1], any[1], anz[1]}, - {anx[2], any[2], anz[2]}, + // {anx[0], any[0], anz[0]}, + // {anx[1], any[1], anz[1]}, + // {anx[2], any[2], anz[2]}, }; triangles.push_back(tmp); diff --git a/test/main.cpp b/test/main.cpp index f5b7d00..226a257 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -16,13 +16,17 @@ int main(int argc, char** argv) { Scene* scene = new Scene(width, height); scene->camera = new Camera(width, height); - scene->objects.push_back(new Sphere({0.0f, 0.0f, -4.0f}, 1.0f)); - std::vector tris = LoadTrianglesBasic("/home/ben/programming/inferno/resources/cornell.obj"); + + // scene->objects.push_back(new Sphere({0.0f, 0.0f, -4.0f}, 1.0f)); + + std::vector tris = LoadTrianglesBasic("/home/ben/programming/inferno/resources/dragon.obj"); for (const auto& object : tris) - object->Translate({ 0.0f, -1.0f, -3.0f }); + object->Translate({ 0.0f, -5.0f, -20.0f }); + std::cout << "loaded" << std::endl; Mesh* mesh = new Mesh(tris); mesh->Optimise(); + std::cout << "tree built" << std::endl; scene->meshs.push_back(mesh);