Adding support for pattern.
Still a bit more work to be done there.
This commit is contained in:
@@ -11,8 +11,11 @@
|
||||
|
||||
#include <tuple.h>
|
||||
#include <colour.h>
|
||||
#include <pattern.h>
|
||||
#include <light.h>
|
||||
|
||||
class Shape;
|
||||
|
||||
class Material
|
||||
{
|
||||
public:
|
||||
@@ -22,10 +25,12 @@ public:
|
||||
double specular;
|
||||
double shininess;
|
||||
|
||||
public:
|
||||
Material() : colour(Colour(1, 1, 1)), ambient(0.1), diffuse(0.9), specular(0.9), shininess(200) {};
|
||||
Pattern *pattern;
|
||||
|
||||
Colour lighting(Light light, Tuple point, Tuple eyeVector, Tuple normalVector, bool inShadow = false);
|
||||
public:
|
||||
Material() : colour(Colour(1, 1, 1)), ambient(0.1), diffuse(0.9), specular(0.9), shininess(200), pattern(nullptr) {};
|
||||
|
||||
Colour lighting(Light light, Tuple point, Tuple eyeVector, Tuple normalVector, Shape *hitObject, bool inShadow = false);
|
||||
|
||||
bool operator==(const Material &b) const { return double_equal(this->ambient, b.ambient) &&
|
||||
double_equal(this->diffuse, b.diffuse) &&
|
||||
|
||||
Reference in New Issue
Block a user