Eyden-hw2-checiu

README.md

@@ -2,7 +2,7 @@
 **Dealine**: 15.10.2020
 
 Please put your name here:  
-**Name**: .......
+**Name**: Checiu Eliza
 ## Problem 1
 ### Encapsulate camera and primitives from main application logic (Points 5)
 1. Fork the current repository

src/CameraPerspective.h

@@ -33,6 +33,8 @@ class CCameraPerspective : public ICamera
         m_xAxis = normalize(m_xAxis);
         m_yAxis = normalize(m_yAxis);
         m_zAxis = normalize(m_zAxis);
+
+
     }
     virtual ~CCameraPerspective(void) = default;
 

src/LightOmni.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ILight.h"
+#include "Ray.h"
 
 /**
  * @brief Point light source class
@@ -24,7 +25,13 @@ class CLightOmni : public ILight
 	virtual std::optional<Vec3f> illuminate(Ray& ray) override
 	{
 		// --- PUT YOUR CODE HERE ---
-		return std::nullopt;
+		//return std::nullopt;
+		ray.dir = m_org - ray.org;
+		ray.t = norm(ray.dir);
+		ray.dir = normalize(ray.dir);
+		ray.hit = nullptr;
+
+		return m_intensity / (ray.t * ray.t);
 	}
 
 

src/PrimPlane.h

@@ -32,13 +32,15 @@ class CPrimPlane : public IPrim
 		if (dist < Epsilon || isinf(dist) || dist > ray.t) return false;
 
 		ray.t = dist;
+		ray.hit = shared_from_this();
 		return true;
 	}
 
 	virtual Vec3f getNormal(const Ray& ray) const override
 	{
 		// --- PUT YOUR CODE HERE ---
-		return Vec3f();
+		//return Vec3f();
+		return m_normal;
 	}
 
 private:

src/PrimSphere.h

@@ -52,13 +52,16 @@ class CPrimSphere : public IPrim
 		}
 
 		ray.t = dist;
+		ray.hit = shared_from_this(); 
 		return true;
 	}
 
 	virtual Vec3f getNormal(const Ray& ray) const override
 	{
 		// --- PUT YOUR CODE HERE ---
-		return Vec3f();
+		//return Vec3f();
+		Vec3f v_hit = ray.org + ray.t * ray.dir;
+		return normalize(v_hit - m_origin);
 	}
 
 private:

src/PrimTriangle.h

@@ -57,14 +57,15 @@ class CPrimTriangle : public IPrim
 		if (ray.t <= f || f <  Epsilon  ) return false;
 
 		ray.t = f;
-
+		ray.hit = shared_from_this();
 		return true;
 	}
 
 	virtual Vec3f getNormal(const Ray& ray) const override
 	{
 		// --- PUT YOUR CODE HERE ---
-		return Vec3f();
+		//return Vec3f();
+		return normalize(m_edge1.cross(m_edge2));
 	}
 
 private:

src/Scene.h

@@ -5,6 +5,7 @@
 #include "ILight.h"
 #include "IPrim.h"
 #include "CameraPerspective.h"
+#include "ICamera.h"
 
 // ================================ Scene Class ================================
 /**
@@ -30,6 +31,7 @@ class CScene
 	void add(const ptr_prim_t pPrim)
 	{
 		// --- PUT YOUR CODE HERE ---
+		m_vpPrims.push_back(pPrim);
 	}
 	/**
 	 * @brief Adds a new light to the scene
@@ -38,6 +40,8 @@ class CScene
 	void add(const ptr_light_t pLight)
 	{
 		// --- PUT YOUR CODE HERE ---
+		m_vpLights.push_back(pLight);
+
 	}
 	/**
 	 * @brief Adds a new camera to the scene and makes it to ba active
@@ -46,6 +50,8 @@ class CScene
 	void add(const ptr_camera_t pCamera)
 	{
 		// --- PUT YOUR CODE HERE ---
+		m_vpCameras.push_back(pCamera);
+		m_activeCamera = m_vpCameras.size() - 1;
 	}
 	/**
 	 * @brief Returns the container with all scene light source objects
@@ -68,7 +74,11 @@ class CScene
 	bool intersect(Ray& ray) const
 	{
 		// --- PUT YOUR CODE HERE ---
-		return false;
+		//return false;
+		bool hit = false;
+		for (auto& pPrim : m_vpPrims)
+			hit |= pPrim->intersect(ray);
+		return hit;
 	}
 
 	/**
@@ -77,6 +87,10 @@ class CScene
 	bool occluded(Ray& ray)
 	{
 		// --- PUT YOUR CODE HERE ---
+		//return false;
+		for (auto& pPrim : m_vpPrims)
+			if (pPrim->occluded(ray)) 
+				return true;
 		return false;
 	}
 
@@ -87,7 +101,8 @@ class CScene
 	Vec3f RayTrace(Ray& ray) const
 	{
 		// --- PUT YOUR CODE HERE ---
-		return Vec3f();
+		//return Vec3f();
+		return intersect(ray) ? ray.hit->getShader()->shade(ray) : m_bgColor;
 	}
 
 

src/ShaderEyelight.h

@@ -22,7 +22,8 @@ class CShaderEyelight : public CShaderFlat
 	virtual Vec3f shade(const Ray& ray) const override
 	{
 		// --- PUT YOUR CODE HERE ---
-		return RGB(0, 0, 0);
+		//return RGB(0, 0, 0);
+		return CShaderFlat::shade(ray) * abs(ray.dir.dot(ray.hit->getNormal(ray)));
 	}
 };
 

src/ShaderFlat.h

@@ -18,7 +18,8 @@ class CShaderFlat : public IShader
 	virtual Vec3f shade(const Ray& ray = Ray()) const override
 	{
 		// --- PUT YOUR CODE HERE ---
-		return RGB(0, 0, 0);
+		//return RGB(0, 0, 0);
+		return m_color;
 	}
 
 private:

src/ShaderMirror.h

@@ -17,7 +17,20 @@ class CShaderMirror : public IShader
 	virtual Vec3f shade(const Ray& ray) const override
 	{
 		// --- PUT YOUR CODE HERE ---
-		return Vec3f(0,0,0);
+		//return Vec3f(0,0,0);
+
+		Vec3f normal = ray.hit->getNormal(ray);
+
+		if (ray.dir.dot(normal) > 0)
+			normal *= -1;
+
+		Vec3f r_dir = ray.dir - 2 * (ray.dir.dot(normal)) * normal;
+
+		Ray r;
+		r.dir = normalize(r_dir);
+		r.t = std::numeric_limits<double>::infinity();
+		r.org = ray.t * ray.dir + ray.org;
+		return m_scene.RayTrace(r);
 	}
 
 

src/ShaderPhong.h

@@ -24,10 +24,54 @@ class CShaderPhong : public CShaderFlat
 	{}
 	virtual ~CShaderPhong(void) = default;
 
+	//we will apply the formula given
+
 	virtual Vec3f shade(const Ray& ray) const override
 	{
 		// --- PUT YOUR CODE HERE ---
-		return RGB(0, 0, 0);
+		//return RGB(0, 0, 0);
+
+		Vec3f normal = ray.hit->getNormal(ray);
+
+		if (normal.dot(ray.dir) > 0)
+			normal = -normal;
+
+		Vec3f reflect = normalize(ray.dir - 2 * normal.dot(ray.dir) * normal);
+
+		Vec3f a_Intensity(1, 1, 1);
+
+		Vec3f color = CShaderFlat::shade();
+
+		Vec3f a_Color = m_ka * color;
+		Vec3f r_final = a_Color.mul(a_Intensity);
+
+		Ray shadow;
+		shadow.org = ray.org + ray.t * ray.dir;
+
+		for (auto pLight : m_scene.getLights()) {
+			std::optional<Vec3f> l_Intensity = pLight->illuminate(shadow);
+			if (l_Intensity) {
+				float cos_l_Normal = shadow.dir.dot(normal);
+				if (cos_l_Normal > 0) {
+					if (m_scene.occluded(shadow))
+						continue;
+
+					Vec3f d_Color = m_kd * color;
+					r_final += (d_Color * cos_l_Normal).mul(l_Intensity.value());
+				}
+
+				float cos_l_Reflect = shadow.dir.dot(reflect);
+				if (cos_l_Reflect > 0) {
+					Vec3f s_Color = m_ks * RGB(1, 1, 1); 
+					r_final += (s_Color * powf(cos_l_Reflect, m_ke)).mul(l_Intensity.value());
+				}
+			}
+		}
+
+		for (int i = 0; i < 3; i++)
+			if (r_final.val[i] > 1) r_final.val[i] = 1;
+
+		return r_final;
 	}