diff --git a/CMakeLists.txt b/CMakeLists.txt index 4692ab3..aa859e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_CXX_FLAGS "-Ofast") set(executable output) set(SrcDIR ./src) set(TestDIR ./test) -set(CurrentTest main.cpp) +set(CurrentTest lucy_cornell.cpp) set(IncludeDIR ./include) diff --git a/src/engine/renderengine.cpp b/src/engine/renderengine.cpp index 1704af4..89922b9 100644 --- a/src/engine/renderengine.cpp +++ b/src/engine/renderengine.cpp @@ -97,10 +97,10 @@ glm::vec3 RenderEngine::GetColour(Ray ray, int& depth) { float S = 0.4f; float T = 0.4f; float pattern = (modulo(s * S) < 0.5f) ^ (modulo(t * T) < 0.5f); if (pattern == 1) { - mat->Specularity = 0.9f; + mat->Specularity = 1.0f; mat->Gloss = fastRadianToDegree(0.02f); } else { - mat->Specularity = 0.9f; + mat->Specularity = 1.0f; mat->Gloss = fastRadianToDegree(0.0f); } } diff --git a/test/lucy_cornell.cpp b/test/lucy_cornell.cpp index 18a4768..182ba13 100644 --- a/test/lucy_cornell.cpp +++ b/test/lucy_cornell.cpp @@ -20,12 +20,12 @@ int main(int argc, char** argv) { 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/dragon-cornell-size.obj", "/home/ben/programming/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.01f, -1.0, -3.6f }); - //mesh->Optimise(); - //scene->meshs.push_back(mesh); + 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/");