diff --git a/src/definitions/materials/specular.cpp b/src/definitions/materials/specular.cpp index a36cf57..f8a131a 100644 --- a/src/definitions/materials/specular.cpp +++ b/src/definitions/materials/specular.cpp @@ -30,7 +30,7 @@ glm::vec3 ConeBounce(glm::vec3 reflectDir, float theta) { return glm::normalize(d); } -float FresnelReflect (Material* mat, glm::vec3 normal, glm::vec3 incident) { +float FresnelReflect(Material* mat, glm::vec3 normal, glm::vec3 incident) { float n1 = 1.0f; float n2 = mat->Index; diff --git a/test/lucy_cornell.cpp b/test/lucy_cornell.cpp index 182ba13..2880fc4 100644 --- a/test/lucy_cornell.cpp +++ b/test/lucy_cornell.cpp @@ -2,8 +2,8 @@ #include "../src/inferno.hpp" -static const int width = 600; -static const int height = 600; +static const int width = 2000; +static const int height = 2000; int main(int argc, char** argv) { InfernoEngine inferno; @@ -19,16 +19,16 @@ int main(int argc, char** argv) { scene->sky = sky; Material* mat = new GlossyMaterial({ 1.0f, 1.0f, 1.0f }, 0.2f, fastDegreetoRadian(30.0f)); - //std::vector tris = LoadTrianglesBasic("E://Projects//Inferno//resources//models//dragon-cornell-size.obj", "E://Projects//Inferno//resources//models", mat); - std::vector tris = LoadTrianglesBasic("/home/ben/programming/inferno/resources/models/lucy.obj", "/home/ben/programming/inferno/resources/models/", mat); + std::vector tris = LoadTrianglesBasic("E://Projects//Inferno//resources//models//lucy.obj", "E://Projects//Inferno//resources//models//", mat); + //std::vector tris = LoadTrianglesBasic("/home/ben/programming/inferno/resources/models/lucy.obj", "/home/ben/programming/inferno/resources/models/", mat); Mesh* mesh = new Mesh(tris); mesh->Translate({ -0.05f, -1.01, -3.8f }); mesh->Optimise(); scene->meshs.push_back(mesh); - // std::vector tris1 = LoadTrianglesBasic("E://Projects//Inferno//resources//models//cornell-box.obj", "E://Projects//Inferno//resources//models//"); - std::vector tris1 = LoadTrianglesBasic("/home/ben/programming/inferno/resources/models/cornell-box.obj", "/home/ben/programming/inferno/resources/models/"); + std::vector tris1 = LoadTrianglesBasic("E://Projects//Inferno//resources//models//cornell-box.obj", "E://Projects//Inferno//resources//models//"); + //std::vector tris1 = LoadTrianglesBasic("/home/ben/programming/inferno/resources/models/cornell-box.obj", "/home/ben/programming/inferno/resources/models/"); Mesh* mesh1 = new Mesh(tris1); mesh1->Translate({ 0.01f, -1.0, -3.6f });