4 files changed, 45 insertions, 27 deletions

diff --git a/src/object.cpp b/src/object.cpp
index 179785a..6c61d07 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -4,12 +4,27 @@
 #include <iostream>
 #include "common.hpp"
 
-Sphere::Sphere(Vec3d center, double radius) {
+void Color::clamp() {
+    if (m_x > 1) { m_x = 1; }
+    if (m_y > 1) { m_y = 1; }
+    if (m_z > 1) { m_z = 1; }
+}
+
+Material::Material(Color color, double defuse) {
+    m_color = color;
+    m_defuse = defuse;
+}
+
+Color Material::reflect(const Vec3d &normal, const Vec3d &in, const Vec3d &out) const {
+    return Vec3d(m_color) * (out.dot(normal) * m_defuse);
+}
+
+Sphere::Sphere(const Material &mat, Vec3d center, double radius) : Shape(mat) {
     m_center = center;
     m_radius = radius;
 }
 
-Plane::Plane(Vec3d start, Vec3d norm) {
+Plane::Plane(const Material &mat, Vec3d start, Vec3d norm) : Shape(mat) {
     m_start = start;
     m_norm = norm;
 
diff --git a/src/object.hpp b/src/object.hpp
index ac5122f..2957acb 100644
--- a/src/object.hpp
+++ b/src/object.hpp
@@ -5,20 +5,44 @@
 #include "vector.hpp"
 #include "ray.hpp"
 
+class Color : public Vec3d {
+    public:
+        Color() {}
+        Color(const Vec3d &v) : Vec3d(v) {}
+        Color(double r, double g, double b) : Vec3d(r, g, b) {}
+
+        uint8_t r() { return m_x * 255; }
+        uint8_t g() { return m_y * 255; }
+        uint8_t b() { return m_z * 255; }
+
+        void clamp();
+
+};
+
+// Implements phong BRDF 
 class Material {
+    public:
+        Material(Color color, double defuse);
+
+        Color reflect(const Vec3d &normal, const Vec3d &in, const Vec3d &out) const;
+    private:
+        Color m_color;
+        double m_defuse;
 };
 
 class Shape {
     public:
-        void setMaterial(std::shared_ptr<Material> m);
+        Shape(const Material &mat) : m_mat(mat) { }
 
         virtual Vec3d norm_at(const Vec3d &point, const Vec3d &indir) const = 0;
         virtual double intersect(const Ray &ray, bool skip_dist) const = 0;
+
+        const Material &m_mat;
 };
 
 class Sphere : public Shape {
     public:
-        Sphere(Vec3d center, double radius);
+        Sphere(const Material &mat, Vec3d center, double radius);
         Vec3d norm_at(const Vec3d &point, const Vec3d &indir) const;
         double intersect(const Ray &ray, bool skip_dist) const;
 
@@ -29,7 +53,7 @@ class Sphere : public Shape {
 
 class Plane : public Shape {
     public:
-        Plane(Vec3d start, Vec3d norm);
+        Plane(const Material &mat, Vec3d start, Vec3d norm);
         Vec3d norm_at(const Vec3d &point, const Vec3d &indir) const;
         double intersect(const Ray &ray, bool skip_dist) const;
 
diff --git a/src/render.cpp b/src/render.cpp
index 5601863..197226e 100644
--- a/src/render.cpp
+++ b/src/render.cpp
@@ -9,12 +9,6 @@
 
 const Vec3d up = Vec3d(0, 1, 0);
 
-void Color::clamp() {
-    if (m_x > 1) { m_x = 1; }
-    if (m_y > 1) { m_y = 1; }
-    if (m_z > 1) { m_z = 1; }
-}
-
 Renderer::Renderer(const Scene &scn, Vec3d eye, Vec3d target, unsigned width, unsigned height) : 
     m_scn(scn)
 {
@@ -84,8 +78,7 @@ Color Renderer::pathtrace_sample(const Ray &r, unsigned hop) {
         return Color(0, 0, 0);
     }
 
-    auto green = Color(0, 1, 0);
-    return Color(green * norm.dot(tolight));
+    return res->m_mat.reflect(norm, r.m_direction, tolight);
 }
 
 const Shape* Renderer::cast_ray(const Ray &r, double chk_dist, double *dist_ret) {
diff --git a/src/render.hpp b/src/render.hpp
index 3fd84b1..bb4e9c5 100644
--- a/src/render.hpp
+++ b/src/render.hpp
@@ -5,20 +5,6 @@
 #include "ray.hpp"
 #include "scene.hpp"
 
-class Color : public Vec3d {
-    public:
-        Color() {}
-        Color(const Vec3d &v) : Vec3d(v) {}
-        Color(double r, double g, double b) : Vec3d(r, g, b) {}
-
-        uint8_t r() { return m_x * 255; }
-        uint8_t g() { return m_y * 255; }
-        uint8_t b() { return m_z * 255; }
-
-        void clamp();
-
-};
-
 class Renderer {
     public:
     Renderer(const Scene &scn, Vec3d eye, Vec3d target, unsigned width, unsigned height);