Assignment2

README.md

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

src/LightOmni.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ILight.h"
-#include "Ray.h"
+#include "ray.h"
 
 /**
  * @brief Point light source class
@@ -30,6 +30,8 @@ class CLightOmni : public ILight
 
 
 private:
+
 	Vec3f m_intensity;	///< The emission (red, green, blue)
 	Vec3f m_org;		///< The light source origin
+
 };

src/PrimPlane.h

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

src/PrimSphere.h

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

src/PrimTriangle.h

@@ -58,13 +58,17 @@ class CPrimTriangle : public IPrim
 
 		ray.t = f;
 		// --- PUT YOUR CODE HERE ---
+
+		ray.hit = shared_from_this();
+
 		return true;
 	}
 
 	virtual Vec3f getNormal(const Ray& ray) const override
 	{
 		// --- PUT YOUR CODE HERE ---
-		return Vec3f();
+		Vec3f normal = m_edge1.cross(m_edge2);
+		return normalize(normal);
 	}
 
 private:

src/Scene.h

@@ -30,6 +30,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 +39,7 @@ 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 +48,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,6 +72,21 @@ class CScene
 	bool intersect(Ray& ray) const
 	{
 		// --- PUT YOUR CODE HERE ---
+
+		/*std::vector<ptr_prim_t>::iterator it;
+
+		for(it = m_vpPrims.begin(); it != m_vpPrims.end(); it++)
+		{
+
+		}*/
+
+		int i = 0;
+		for(int i = 0; i < m_vpPrims.size(); i++)
+		{
+			if(m_vpPrims[i]->intersect(ray))
+				return true;
+		}
+
 		return false;
 	}
 
@@ -87,7 +106,14 @@ class CScene
 	Vec3f RayTrace(Ray& ray) const
 	{
 		// --- PUT YOUR CODE HERE ---
-		return Vec3f();
+		Vec3f col = RGB(0, 0 ,0); //black
+
+		if(intersect(ray))
+		{
+			col = ray.hit->getShader()->shade(ray);
+		}
+
+		return col;
 	}
 
 

src/ShaderEyelight.h

@@ -22,7 +22,19 @@ class CShaderEyelight : public CShaderFlat
 	virtual Vec3f shade(const Ray& ray) const override
 	{
 		// --- PUT YOUR CODE HERE ---
-		return RGB(0, 0, 0);
+
+		Vec3f normal = ray.hit->getNormal(ray);
+
+
+		//theta is the angle between the primitive surface normal and the ray direction
+
+		float theta;
+		float dot = normal.dot(ray.dir);
+
+
+
+
+		return CShaderFlat::shade(ray) * fabs(dot);
 	}
 };
 

src/ShaderFlat.h

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