|
@@ -26,13 +26,14 @@ public:
|
|
|
double shininess;
|
|
|
double reflective;
|
|
|
double transparency;
|
|
|
+ double emissive;
|
|
|
double refractiveIndex;
|
|
|
|
|
|
Pattern *pattern;
|
|
|
|
|
|
public:
|
|
|
Material() : colour(Colour(1, 1, 1)), ambient(0.1), diffuse(0.9), specular(0.9), shininess(200),
|
|
|
- reflective(0.0), transparency(0.0), refractiveIndex(1.0), pattern(nullptr) {};
|
|
|
+ reflective(0.0), transparency(0.0), emissive(0), refractiveIndex(1.0), pattern(nullptr) {};
|
|
|
|
|
|
Colour lighting(Light light, Tuple point, Tuple eyeVector, Tuple normalVector, Shape *hitObject, bool inShadow = false);
|
|
|
|
|
@@ -40,6 +41,10 @@ public:
|
|
|
double_equal(this->diffuse, b.diffuse) &&
|
|
|
double_equal(this->specular, b.specular) &&
|
|
|
double_equal(this->shininess, b.shininess) &&
|
|
|
+ double_equal(this->reflective, b.reflective) &&
|
|
|
+ double_equal(this->transparency, b.transparency) &&
|
|
|
+ double_equal(this->emissive, b.emissive) &&
|
|
|
+ double_equal(this->refractiveIndex, b.refractiveIndex) &&
|
|
|
(this->colour == b.colour); };
|
|
|
};
|
|
|
|