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

fixed fresnel and added lucy

Browse Source
This commit is contained in:
Ben Kyd
2019-10-02 15:53:59 +01:00
parent 9a4ea4db16
commit 249c52068e
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -9,7 +9,7 @@ set(CMAKE_CXX_FLAGS "-Ofast")
set(executable output) set(executable output)
set(SrcDIR ./src) set(SrcDIR ./src)
set(TestDIR ./test) set(TestDIR ./test)
set(CurrentTest main.cpp) set(CurrentTest lucy_cornell.cpp)
set(IncludeDIR ./include) set(IncludeDIR ./include)

4
src/engine/renderengine.cpp
View File

@@ -97,10 +97,10 @@ glm::vec3 RenderEngine::GetColour(Ray ray, int& depth) {
float S = 0.4f; float T = 0.4f; float S = 0.4f; float T = 0.4f;
float pattern = (modulo(s * S) < 0.5f) ^ (modulo(t * T) < 0.5f); float pattern = (modulo(s * S) < 0.5f) ^ (modulo(t * T) < 0.5f);
if (pattern == 1) { if (pattern == 1) {
mat->Specularity = 0.9f; mat->Specularity = 1.0f;
mat->Gloss = fastRadianToDegree(0.02f); mat->Gloss = fastRadianToDegree(0.02f);
} else { } else {
mat->Specularity = 0.9f; mat->Specularity = 1.0f;
mat->Gloss = fastRadianToDegree(0.0f); mat->Gloss = fastRadianToDegree(0.0f);
} }
} }

10
test/lucy_cornell.cpp
View File

@@ -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)); Material* mat = new GlossyMaterial({ 1.0f, 1.0f, 1.0f }, 0.2f, fastDegreetoRadian(30.0f));
//std::vector<Triangle*> tris = LoadTrianglesBasic("E://Projects//Inferno//resources//models//dragon-cornell-size.obj", "E://Projects//Inferno//resources//models", mat); //std::vector<Triangle*> tris = LoadTrianglesBasic("E://Projects//Inferno//resources//models//dragon-cornell-size.obj", "E://Projects//Inferno//resources//models", mat);
// std::vector<Triangle*> tris = LoadTrianglesBasic("/home/ben/programming/inferno/resources/models/dragon-cornell-size.obj", "/home/ben/programming/inferno/resources/models/", mat); std::vector<Triangle*> tris = LoadTrianglesBasic("/home/ben/programming/inferno/resources/models/lucy.obj", "/home/ben/programming/inferno/resources/models/", mat);
//Mesh* mesh = new Mesh(tris); Mesh* mesh = new Mesh(tris);
//mesh->Translate({ 0.01f, -1.0, -3.6f }); mesh->Translate({ -0.05f, -1.01, -3.8f });
//mesh->Optimise(); mesh->Optimise();
//scene->meshs.push_back(mesh); scene->meshs.push_back(mesh);
// std::vector<Triangle*> tris1 = LoadTrianglesBasic("E://Projects//Inferno//resources//models//cornell-box.obj", "E://Projects//Inferno//resources//models//"); // std::vector<Triangle*> tris1 = LoadTrianglesBasic("E://Projects//Inferno//resources//models//cornell-box.obj", "E://Projects//Inferno//resources//models//");
std::vector<Triangle*> tris1 = LoadTrianglesBasic("/home/ben/programming/inferno/resources/models/cornell-box.obj", "/home/ben/programming/inferno/resources/models/"); std::vector<Triangle*> tris1 = LoadTrianglesBasic("/home/ben/programming/inferno/resources/models/cornell-box.obj", "/home/ben/programming/inferno/resources/models/");