diff --git a/README.md b/README.md index a90ac54..ffcff3f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Inferno is a CPU Only, progressive unidirectional pathtracing engine written in C++. -![Latest Render](https://imgur.com/POj0JlL.png) +![Latest Render](https://i.imgur.com/WPs7jjr.jpg) ### Features @@ -77,7 +77,7 @@ While programming this I found a few resources especially useful. Below is some ### Samples -![Stanford Dragon](https://imgur.com/GizuPoI.png) +![Stanford Dragon](https://i.imgur.com/WPs7jjr.jpg) ![Cornell Box No Colours](https://imgur.com/u2sIKxK.png) ![Cornell Box](https://imgur.com/i4hLxra.png) ![Cornell Box Specular Materials](https://imgur.com/wfOieEk.png) diff --git a/enc_temp_folder/c9f4116a2f82234d49d6f64d789f833/material.hpp b/enc_temp_folder/c9f4116a2f82234d49d6f64d789f833/material.hpp deleted file mode 100644 index dcd5e3b..0000000 --- a/enc_temp_folder/c9f4116a2f82234d49d6f64d789f833/material.hpp +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef INFERNO_DEFINITIONS_MATERIALS_MATERIAL_H_ -#define INFERNO_DEFINITIONS_MATERIALS_MATERIAL_H_ - -#include "../../common.hpp" -#include "../../maths.hpp" - -class Texture; - -class Material { -public: - Material(); - Material(glm::vec3 col, float specularity = 0.0f, float emmitance = 0.0f); - Material(glm::vec3 colour, float emittance, float Specularity, float index, float gloss, bool transparent, bool emissive); - - glm::vec3 Bounce(glm::vec3 in, glm::vec3 normal); - - glm::vec3 Colour; - Texture* Tex = nullptr; - Texture* NormalTexture = nullptr; - Texture* GlossTexture = nullptr; - float Emittance; - float Specularity; // 1.0f = perfect reflective - float Index; // refractive index - float Gloss; // reflection cone angle in radians - // float Tint; // specular and refractive tinting - // float Reflectivity; // metallic reflection - bool Transparent; - bool Emissive; -}; - -class GlossyMaterial : public Material { -public: - GlossyMaterial(glm::vec3 colour, float shine, float gloss) - : Material(colour, 0.0f, shine, 1.0f, gloss, false, false) { }; -}; - -#endif diff --git a/progress/26 dragon cornell.png b/progress/26 dragon cornell.png new file mode 100644 index 0000000..ccef7de Binary files /dev/null and b/progress/26 dragon cornell.png differ