Assignment #6

README.md

@@ -2,8 +2,7 @@
 **Dealine**: 6.12.2020
 
 Please put your name here:  
-**Name:** .......
-
+*SHROROUK G. AWWAD*
 ## Problem 1
 ### Shearing Transform (Points 10 + 10)
 Now the framework includes the **Tranform.h** file which contains the ```CTransform``` class. This class implements most of the affine transormations discussed at the lectures (when studying the class please pay extra attention to the rotation transoform). The main goal of this class is to deliver the transformation matrix with ```CTransform::get()```. Within this problem we will implement shear transform. Proceed as follows:

src/CameraPerspective.h

@@ -37,7 +37,18 @@ class CCameraPerspective : public ICamera
     virtual ~CCameraPerspective(void) = default;
 
 	// --- PUT YOUR CODE HERE ---
-
+   virtual void setPosition(const Vec3f& NewPos) { m_pos = NewPos; }
+
+    Vec3f getPosition(void) const { return m_pos; }
+
+    virtual void setDirection(const Vec3f& NewDir) { m_dir = NewDir; }
+
+    Vec3f getDirection(void) const { return m_dir; }
+
+    virtual void setAngle(float NewAngle) { m_focus = 1.0f / tanf(NewAngle * Pif / 360); }
+
+    float getAngle(void) const { return (360 / Pif) * atan(1 / m_focus); }
+
     virtual void InitRay(Ray& ray, int x, int y, const Vec2f& sample = Vec2f::all(0.5f)) override
     {
         float dx = sample[0];	// x-shift to the center of the pixel

src/CameraTarget.h

@@ -5,8 +5,16 @@
 class CCameraTarget : public CCameraPerspective {
 public:
 	// --- PUT YOUR CODE HERE ---
-	//CCameraTarget(Size resolution, const Vec3f& pos, const Vec3f& target, const Vec3f& up, float angle) ...
-
+	CCameraTarget(Size resolution, const Vec3f& pos, const Vec3f& target, const Vec3f& up, float angle) : CCameraPerspective(resolution, pos, normalize(target - pos), up, angle)
+	{
+		m_target = target;
+	}
+
+	// virtual void setPosition(const Vec3f& pos) override { pos = m_target; }
+
+	virtual void setTarget(const Vec3f& target) { m_target = target; }
+
+	Vec3f getTarget(void) const { return m_target; }
 private:
 	Vec3f m_target;		///< Camera target point in WCS
 }

src/Transform.h

@@ -101,6 +101,23 @@ class CTransform {
 	}
 
 	// --- PUT YOUR CODE HERE ---
+	//inspired from the class tutoial 
+	CTransform shear(float h_xy, float h_xz, float h_yx, float h_yz, float h_zx, float h_zy) const {
+		Mat t = Mat::eye(4, 4, CV_32FC1);
+		t.at<float>(0, 0) = 1;
+		t.at<float>(0, 1) = h_xy;
+		t.at<float>(0, 2) = h_xz;
+
+		t.at<float>(1, 0) = h_yx;
+		t.at<float>(1, 1) = 1;
+		t.at<float>(1, 2) = h_yz;
+
+		t.at<float>(2, 0) = h_zx;
+		t.at<float>(2, 1) = h_zy;
+		t.at<float>(2, 2) = 1;
+
+		return CTransform(t * m_t);
+	}
 
 	/**
 	* @brief Adds rotation around axis \b v by angle \b theta

src/main.cpp

@@ -48,11 +48,8 @@ Mat RenderFrame(void)
 	scene.add(cam1);				
 	scene.add(cam2);
 
-#ifdef WIN32
 	const std::string dataPath = "../data/";
-#else
-	const std::string dataPath = "../../../data/";
-#endif
+
 
 	// Textures
 	Mat imgEarth = imread(dataPath + "earth_8k.jpg");
@@ -99,8 +96,10 @@ Mat RenderFrame(void)
 
 	// --- PUT YOUR CODE HERE ---
 	// derive the transormation matrices here
-	Mat earthTransform = Mat::eye(4, 4, CV_32FC1);
-	Mat moonTransform = Mat::eye(4, 4, CV_32FC1);
+
+	CTransform T;
+	Mat earthTransform = transform.rotate(Vec3f(0.399f, 0.917, 0), 360.0f / nFrames).get();
+	Mat moonTransform = transform.rotate(Vec3f(0, 1, 0), 13.2f / nFrames).get();
 
 	for (size_t frame = 0; frame < nFrames; frame++) {
 		// Build BSPTree
@@ -127,8 +126,10 @@ Mat RenderFrame(void)
 
 		// --- PUT YOUR CODE HERE ---
 		// Apply transforms here 
-		Mat rotationAroundTheSun = Mat::eye(4, 4, CV_32FC1);
+		Vec3f earthPivot = earth.getPivot();
+		Mat rotationAroundTheSun = transform.translate(earthPivot).rotate(Vec3f(0, 1, 0), 1.0f / nFrames).translate(-earthPivot).get();
 		earth.transform(rotationAroundTheSun * earthTransform);
+		moon.setPivot(earth.getPivot());
 		moon.transform(rotationAroundTheSun * moonTransform);
 
 		// --- PUT YOUR CODE HERE ---