From 771d3330f6cd4e15e358f7e422c09b3c18fcc182 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 4 Oct 2019 17:25:29 +0100 Subject: [PATCH 1/2] And awwwaaayyyyy we gooooo --- src/definitions/materials/specular.cpp | 2 +- test/lucy_cornell.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) 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 }); From 60733bb82150fb911837d5055d1bf2b59cbd9af1 Mon Sep 17 00:00:00 2001 From: Daniel Twitchett <40694103+Shreddan@users.noreply.github.com> Date: Mon, 7 Oct 2019 17:00:44 +0100 Subject: [PATCH 2/2] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c5f3b8c..acdad62 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Inferno Pathtracer [![Build Status](https://travis-ci.org/plane000/inferno.png?branch=master)](https://travis-ci.org/plane000/inferno) -Inferno is a CPU Only, progressive unidirectional pathtracing engine written in C++. +Inferno is a CPU Only, progressive, unidirectional pathtracing engine written in C++. ![Latest Render](https://imgur.com/WPs7jjr.jpg) @@ -10,10 +10,10 @@ Inferno is a CPU Only, progressive unidirectional pathtracing engine written in * Supports OBJ Files * Supports many material properties * Uses multiple types of acceleration structures -* Fully capable GUI adds much runtime customization to the scene and render settings +* Fully capable GUI adds many runtime customizations to the scene and render settings * Custom threadpool for best performance -### Installation +### Build Instructions ``` git clone https://github.com/plane000/inferno @@ -26,7 +26,7 @@ make ### Examples -There are many example scenes that I have made already. Just change the CurrentTest variable inside the CMakeList to the name of the file you wish to demo. +There are many example scenes that I have made already. Just modify the CurrentTest variable inside the CMakeLists.txt to the name of the file you wish to demo. ### Basic Scene @@ -71,7 +71,7 @@ int main(int argc, char** argv) { ### References -While programming this I found a few resources especially useful. Below is some listed. +While I have been working on this project, I have found a few resources to be especially useful. Below are a few I have listed. * [Scratch A Pixel - Global Illumination](https://www.scratchapixel.com)