Update
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Inferno is a CPU Only, progressive unidirectional pathtracing engine written in C++.
|
Inferno is a CPU Only, progressive unidirectional pathtracing engine written in C++.
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
@@ -77,7 +77,7 @@ While programming this I found a few resources especially useful. Below is some
|
|||||||
|
|
||||||
### Samples
|
### Samples
|
||||||
|
|
||||||

|

|
||||||

|

|
||||||

|

|
||||||

|

|
||||||
|
|||||||
@@ -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
|
|
||||||
BIN
progress/26 dragon cornell.png
Normal file
BIN
progress/26 dragon cornell.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.2 MiB |
Reference in New Issue
Block a user