From d3d4221e11b479a01d255cd77934525a6535a69b Mon Sep 17 00:00:00 2001
From: mahesh0537 <mail2mahesh0537@gmail.com>
Date: Wed, 27 Jul 2022 23:04:38 +0530
Subject: [PATCH 1/6] scene update

---
 Rendera/include/scene.hpp | 70 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/Rendera/include/scene.hpp b/Rendera/include/scene.hpp
index ebe29b7..ee7f15a 100644
--- a/Rendera/include/scene.hpp
+++ b/Rendera/include/scene.hpp
@@ -4,6 +4,10 @@
 #include "sphere.hpp"
 #include "intersection.hpp"
 #include "camera.hpp"
+<<<<<<< HEAD
+#include "cube.hpp"
+=======
+>>>>>>> 2a88c48dbc58908ab2cc021a59776e175f690e2f
 
 class Hitinfo{
     public:
@@ -20,6 +24,11 @@ class Hitinfo{
 
 color lighting(Material mat, ray cam_ray, ray normal, vec3 point, vec3 light_src, color intensity){
 
+<<<<<<< HEAD
+    // std::cout<<mat.shiny();
+
+=======
+>>>>>>> 2a88c48dbc58908ab2cc021a59776e175f690e2f
     ray incident_ray = {point, point - light_src};
     ray reflect_ray = reflect(incident_ray, normal);
 
@@ -54,11 +63,22 @@ color lighting(Material mat, ray cam_ray, ray normal, vec3 point, vec3 light_src
 
 class Scene{
     public:
+<<<<<<< HEAD
+        int n_sphere = 1;
+        int n_cube = 0;
+        uint16_t img_width;
+        uint16_t img_height;
+        Hitinfo *hitinfo = new Hitinfo[img_height*img_width];
+        // sphere *hitable_sphere = new sphere[n_sphere];
+        std::vector<Sphere> hitable_sphere;
+        std::vector<Cube> hitable_cube;
+=======
         int n_sphere;
         uint16_t img_width;
         uint16_t img_height;
         Hitinfo *hitinfo = new Hitinfo[img_height*img_width];
         sphere *hitable_sphere = new sphere[n_sphere];
+>>>>>>> 2a88c48dbc58908ab2cc021a59776e175f690e2f
 
 
         vec3 light_src = {-5,3,5};
@@ -85,6 +105,17 @@ class Scene{
 
         }
         ~Scene(){
+<<<<<<< HEAD
+            delete hitinfo;
+        }
+        void add_sphere(vec3 center, float radius, Material mat){
+            n_sphere++;
+            hitable_sphere.push_back(Sphere(center, radius, mat));
+        }
+        void add_cube(vec3 position, vec3 a, vec3 b, vec3 c, Material mat){
+            n_cube++;
+            hitable_cube.push_back(Cube(position, a, b, c, mat));
+=======
             delete hitable_sphere;
             delete hitinfo;
         }
@@ -93,21 +124,36 @@ class Scene{
                 hitable_sphere[index] = sphere(center, radius, mat);
             else
                 std::cout<<"accessing wrong index"<<std::endl;
+>>>>>>> 2a88c48dbc58908ab2cc021a59776e175f690e2f
         }
 
 
 
         void hit_object(int x, int y){
+<<<<<<< HEAD
+            std::vector<Sphere>::iterator sp;
+            std::vector<Cube>::iterator cb;
+            hitinfo[y*img_width + x].ray_ = ray(cam.get_ray(x, y));
+            for(sp = hitable_sphere.begin(); sp != hitable_sphere.end(); ++sp){
+                Intersection i_;
+                bool hits = i_.hit(*sp, hitinfo[y*img_width + x].ray_);
+=======
             hitinfo[y*img_width + x].ray_ = ray(cam.get_ray(x, y));
             for(int i = 0; i < n_sphere; i++){
                 Intersection i_;
                 bool hits = i_.hit(hitable_sphere[i], hitinfo[y*img_width + x].ray_);
+>>>>>>> 2a88c48dbc58908ab2cc021a59776e175f690e2f
                 if (hitinfo[y*img_width + x].ishitting && hits){
                     if (hitinfo[y*img_width + x].dist > i_.dist_1()){
                         hitinfo[y*img_width + x].dist = i_.dist_1();
                         hitinfo[y*img_width + x].intersection_pt = hitinfo[y*img_width + x].ray_.fetch(hitinfo[y*img_width + x].dist); 
+<<<<<<< HEAD
+                        hitinfo[y*img_width + x].normal = (*sp).normal(hitinfo[y*img_width + x].intersection_pt);
+                        hitinfo[y*img_width + x].shade = lighting((*sp).mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+=======
                         hitinfo[y*img_width + x].normal = hitable_sphere[i].normal(hitinfo[y*img_width + x].intersection_pt);
                         hitinfo[y*img_width + x].shade = lighting(hitable_sphere[i].mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+>>>>>>> 2a88c48dbc58908ab2cc021a59776e175f690e2f
                         hitinfo[y*img_width + x].rgb = hitinfo[y*img_width + x].shade.get_int();
                         hitinfo[y*img_width + x].ref_ray = reflect(hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal);
                         }
@@ -116,8 +162,13 @@ class Scene{
                     hitinfo[y*img_width + x].ishitting = true;
                     hitinfo[y*img_width + x].dist = i_.dist_1();
                     hitinfo[y*img_width + x].intersection_pt = hitinfo[y*img_width + x].ray_.fetch(hitinfo[y*img_width + x].dist); 
+<<<<<<< HEAD
+                    hitinfo[y*img_width + x].normal = (*sp).normal(hitinfo[y*img_width + x].intersection_pt);
+                    hitinfo[y*img_width + x].shade = lighting((*sp).mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+=======
                     hitinfo[y*img_width + x].normal = hitable_sphere[i].normal(hitinfo[y*img_width + x].intersection_pt);
                     hitinfo[y*img_width + x].shade = lighting(hitable_sphere[i].mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+>>>>>>> 2a88c48dbc58908ab2cc021a59776e175f690e2f
                     hitinfo[y*img_width + x].rgb = hitinfo[y*img_width + x].shade.get_int();
                     hitinfo[y*img_width + x].ref_ray = reflect(hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal);
 
@@ -126,16 +177,29 @@ class Scene{
         }
 
         void next_depth(int x, int y){
+<<<<<<< HEAD
+            std::vector<Sphere>::iterator sp;
+            for(sp = hitable_sphere.begin(); sp != hitable_sphere.end(); ++sp){
+                if(hitinfo[y*img_width + x].ishitting){
+                Intersection i_;
+                bool hits = i_.hit(*sp, hitinfo[y*img_width + x].ref_ray);
+=======
             for(int i = 0; i < n_sphere; i++){
                 if(hitinfo[y*img_width + x].ishitting){
                 Intersection i_;
                 bool hits = i_.hit(hitable_sphere[i], hitinfo[y*img_width + x].ref_ray);
+>>>>>>> 2a88c48dbc58908ab2cc021a59776e175f690e2f
                 if (hitinfo[y*img_width + x].ishitting && hits){
                     if (hitinfo[y*img_width + x].dist > i_.dist_1()){
                         hitinfo[y*img_width + x].dist = i_.dist_1();
                         hitinfo[y*img_width + x].intersection_pt = hitinfo[y*img_width + x].ref_ray.fetch(hitinfo[y*img_width + x].dist); 
+<<<<<<< HEAD
+                        hitinfo[y*img_width + x].normal = (*sp).normal(hitinfo[y*img_width + x].intersection_pt);
+                        hitinfo[y*img_width + x].shade_new = lighting((*sp).mat(), hitinfo[y*img_width + x].ref_ray, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+=======
                         hitinfo[y*img_width + x].normal = hitable_sphere[i].normal(hitinfo[y*img_width + x].intersection_pt);
                         hitinfo[y*img_width + x].shade_new = lighting(hitable_sphere[i].mat(), hitinfo[y*img_width + x].ref_ray, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+>>>>>>> 2a88c48dbc58908ab2cc021a59776e175f690e2f
                         hitinfo[y*img_width + x].ref_ray = reflect(hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal);
                         }
                 }
@@ -147,12 +211,18 @@ class Scene{
             for(int x=0; x<img_width; x++){
                 for(int y=0; y<img_height; y++){
                     hit_object(x,y);
+<<<<<<< HEAD
+=======
                     // hitinfo[y*img_width + x].ishitting = false;
+>>>>>>> 2a88c48dbc58908ab2cc021a59776e175f690e2f
                     next_depth(x,y);
                     hitinfo[y*img_width + x].shade += hitinfo[y*img_width + x].shade_new;
                     hitinfo[y*img_width + x].shade_new = {0,0,0};
                     hitinfo[y*img_width + x].rgb = hitinfo[y*img_width + x].shade.get_int();
+<<<<<<< HEAD
+=======
                     // next_depth(x,y);
+>>>>>>> 2a88c48dbc58908ab2cc021a59776e175f690e2f
                     next_depth(x,y);
                     hitinfo[y*img_width + x].shade += hitinfo[y*img_width + x].shade_new;
                     hitinfo[y*img_width + x].shade_new = {0,0,0};

From 8aa70dc947ac3493a68cbabbfbf78f3fdb51cc7d Mon Sep 17 00:00:00 2001
From: Mahesh Bhupati <67902842+mahesh0537@users.noreply.github.com>
Date: Wed, 27 Jul 2022 23:53:39 +0530
Subject: [PATCH 2/6] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 3e3be25..02f3d7c 100644
--- a/README.md
+++ b/README.md
@@ -20,3 +20,7 @@ To build the project and run locally,
     cmake --build build
     ./build/Rendera/Rendera
 ```
+
+```bash
+-DCMAKE_CXX_COMPILER=gcc-11  //use this flag if gcc is not default
+```bash

From 4a7831277802c175814d8c4bf8cd93b1c8c09ba9 Mon Sep 17 00:00:00 2001
From: Mahesh Bhupati <67902842+mahesh0537@users.noreply.github.com>
Date: Wed, 27 Jul 2022 23:53:55 +0530
Subject: [PATCH 3/6] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 02f3d7c..5d02cdc 100644
--- a/README.md
+++ b/README.md
@@ -23,4 +23,4 @@ To build the project and run locally,
 
 ```bash
 -DCMAKE_CXX_COMPILER=gcc-11  //use this flag if gcc is not default
-```bash
+```

From 1f39274c813894e4df86229faa1b8a0c818565a1 Mon Sep 17 00:00:00 2001
From: mahesh0537 <mail2mahesh0537@gmail.com>
Date: Thu, 28 Jul 2022 01:44:07 +0530
Subject: [PATCH 4/6] debug done

---
 Rendera/include/cube.hpp           | 19 ++++++++++-
 Rendera/include/scene.hpp          | 50 +++++++++++++++------------
 Rendera/include/sphere.hpp         |  6 ++--
 Rendera/src/main.cpp               | 54 +++++-------------------------
 utilities/include/intersection.hpp |  3 +-
 utilities/include/vec3.hpp         |  2 ++
 utilities/include/vec4.hpp         |  8 ++---
 7 files changed, 64 insertions(+), 78 deletions(-)

diff --git a/Rendera/include/cube.hpp b/Rendera/include/cube.hpp
index bde78b8..206d281 100644
--- a/Rendera/include/cube.hpp
+++ b/Rendera/include/cube.hpp
@@ -7,6 +7,23 @@
 #include "ray.hpp"
 #include "material.hpp"
 
+
+//debug
+class HitInfo{
+    bool if_hit;
+    vec3 dist_v;
+    Material mat;
+    ray r;
+    int depth;
+
+    public:
+        HitInfo(bool if_hit, vec3 v, Material m, ray r, int d):if_hit{if_hit}, dist_v{v}, mat{m}, r{r}, depth{d}{};
+
+};
+
+
+//
+
 // checks which point is farther going along the ray 
 vec3 max(vec3 a, vec3 b, ray r)
 {
@@ -41,7 +58,7 @@ class Cube
     vec3 m_position;
     vec3 m_a, m_b, m_c;
     Material m_material;
-    static const double m_epsilon = 1e-5;
+    const double m_epsilon = 1e-5;
 
 public:
     Cube(vec3 position, vec3 a, vec3 b, vec3 c, Material mat) : m_position{position}, m_a{a}, m_b{b}, m_c{c}, m_material{mat} {};
diff --git a/Rendera/include/scene.hpp b/Rendera/include/scene.hpp
index ebe29b7..b0eae82 100644
--- a/Rendera/include/scene.hpp
+++ b/Rendera/include/scene.hpp
@@ -4,7 +4,7 @@
 #include "sphere.hpp"
 #include "intersection.hpp"
 #include "camera.hpp"
-
+#include "cube.hpp"
 class Hitinfo{
     public:
         bool ishitting = false;
@@ -16,6 +16,7 @@ class Hitinfo{
         color shade_new = {0,0,0};
         color rgb;
         ray ref_ray;
+    Hitinfo() = default;
 };
 
 color lighting(Material mat, ray cam_ray, ray normal, vec3 point, vec3 light_src, color intensity){
@@ -54,11 +55,13 @@ color lighting(Material mat, ray cam_ray, ray normal, vec3 point, vec3 light_src
 
 class Scene{
     public:
-        int n_sphere;
+        int n_sphere = 1;
+        int n_cube = 0;
         uint16_t img_width;
         uint16_t img_height;
         Hitinfo *hitinfo = new Hitinfo[img_height*img_width];
-        sphere *hitable_sphere = new sphere[n_sphere];
+        std::vector<Sphere> hitable_sphere;
+        std::vector<Cube> hitable_cube;
 
 
         vec3 light_src = {-5,3,5};
@@ -85,29 +88,33 @@ class Scene{
 
         }
         ~Scene(){
-            delete hitable_sphere;
             delete hitinfo;
         }
-        void set_sphere(int index, vec3 center, float radius, Material mat){
-            if (index < n_sphere)
-                hitable_sphere[index] = sphere(center, radius, mat);
-            else
-                std::cout<<"accessing wrong index"<<std::endl;
+        void add_sphere(vec3 center, float radius, Material mat){
+            n_sphere++;
+            hitable_sphere.push_back(Sphere(center, radius, mat));
+        }
+        void add_cube(vec3 position, vec3 a, vec3 b, vec3 c, Material mat){
+            n_cube++;
+            hitable_cube.push_back(Cube(position, a, b, c, mat));
         }
 
 
 
         void hit_object(int x, int y){
-            hitinfo[y*img_width + x].ray_ = ray(cam.get_ray(x, y));
-            for(int i = 0; i < n_sphere; i++){
+            std::vector<Sphere>::iterator sp;
+            std::vector<Cube>::iterator cb;
+            hitinfo[y*img_width + x].ray_ = cam.get_ray(x, y);
+            // std::cout<<cam.get_ray(x, y).get_direction();
+            for(sp = hitable_sphere.begin(); sp != hitable_sphere.end(); ++sp){
                 Intersection i_;
-                bool hits = i_.hit(hitable_sphere[i], hitinfo[y*img_width + x].ray_);
+                bool hits = i_.hit(*sp, hitinfo[y*img_width + x].ray_);
                 if (hitinfo[y*img_width + x].ishitting && hits){
                     if (hitinfo[y*img_width + x].dist > i_.dist_1()){
                         hitinfo[y*img_width + x].dist = i_.dist_1();
                         hitinfo[y*img_width + x].intersection_pt = hitinfo[y*img_width + x].ray_.fetch(hitinfo[y*img_width + x].dist); 
-                        hitinfo[y*img_width + x].normal = hitable_sphere[i].normal(hitinfo[y*img_width + x].intersection_pt);
-                        hitinfo[y*img_width + x].shade = lighting(hitable_sphere[i].mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+                        hitinfo[y*img_width + x].normal = (*sp).normal(hitinfo[y*img_width + x].intersection_pt);
+                        hitinfo[y*img_width + x].shade = lighting((*sp).mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
                         hitinfo[y*img_width + x].rgb = hitinfo[y*img_width + x].shade.get_int();
                         hitinfo[y*img_width + x].ref_ray = reflect(hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal);
                         }
@@ -116,8 +123,8 @@ class Scene{
                     hitinfo[y*img_width + x].ishitting = true;
                     hitinfo[y*img_width + x].dist = i_.dist_1();
                     hitinfo[y*img_width + x].intersection_pt = hitinfo[y*img_width + x].ray_.fetch(hitinfo[y*img_width + x].dist); 
-                    hitinfo[y*img_width + x].normal = hitable_sphere[i].normal(hitinfo[y*img_width + x].intersection_pt);
-                    hitinfo[y*img_width + x].shade = lighting(hitable_sphere[i].mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+                    hitinfo[y*img_width + x].normal = (*sp).normal(hitinfo[y*img_width + x].intersection_pt);
+                    hitinfo[y*img_width + x].shade = lighting((*sp).mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
                     hitinfo[y*img_width + x].rgb = hitinfo[y*img_width + x].shade.get_int();
                     hitinfo[y*img_width + x].ref_ray = reflect(hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal);
 
@@ -126,16 +133,17 @@ class Scene{
         }
 
         void next_depth(int x, int y){
-            for(int i = 0; i < n_sphere; i++){
+            std::vector<Sphere>::iterator sp;
+            for(sp = hitable_sphere.begin(); sp != hitable_sphere.end(); ++sp){
                 if(hitinfo[y*img_width + x].ishitting){
                 Intersection i_;
-                bool hits = i_.hit(hitable_sphere[i], hitinfo[y*img_width + x].ref_ray);
+                bool hits = i_.hit(*sp, hitinfo[y*img_width + x].ref_ray);
                 if (hitinfo[y*img_width + x].ishitting && hits){
                     if (hitinfo[y*img_width + x].dist > i_.dist_1()){
                         hitinfo[y*img_width + x].dist = i_.dist_1();
                         hitinfo[y*img_width + x].intersection_pt = hitinfo[y*img_width + x].ref_ray.fetch(hitinfo[y*img_width + x].dist); 
-                        hitinfo[y*img_width + x].normal = hitable_sphere[i].normal(hitinfo[y*img_width + x].intersection_pt);
-                        hitinfo[y*img_width + x].shade_new = lighting(hitable_sphere[i].mat(), hitinfo[y*img_width + x].ref_ray, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+                        hitinfo[y*img_width + x].normal = (*sp).normal(hitinfo[y*img_width + x].intersection_pt);
+                        hitinfo[y*img_width + x].shade_new = lighting((*sp).mat(), hitinfo[y*img_width + x].ref_ray, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
                         hitinfo[y*img_width + x].ref_ray = reflect(hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal);
                         }
                 }
@@ -147,12 +155,10 @@ class Scene{
             for(int x=0; x<img_width; x++){
                 for(int y=0; y<img_height; y++){
                     hit_object(x,y);
-                    // hitinfo[y*img_width + x].ishitting = false;
                     next_depth(x,y);
                     hitinfo[y*img_width + x].shade += hitinfo[y*img_width + x].shade_new;
                     hitinfo[y*img_width + x].shade_new = {0,0,0};
                     hitinfo[y*img_width + x].rgb = hitinfo[y*img_width + x].shade.get_int();
-                    // next_depth(x,y);
                     next_depth(x,y);
                     hitinfo[y*img_width + x].shade += hitinfo[y*img_width + x].shade_new;
                     hitinfo[y*img_width + x].shade_new = {0,0,0};
diff --git a/Rendera/include/sphere.hpp b/Rendera/include/sphere.hpp
index f110f05..c54c263 100644
--- a/Rendera/include/sphere.hpp
+++ b/Rendera/include/sphere.hpp
@@ -6,14 +6,14 @@
 #include "color.hpp"
 #include "material.hpp"
 
-class sphere{
+class Sphere{
     vec3 center;
     float radius;
     Material material;
 
     public:
-        sphere(){}
-        sphere(vec3 Center, float Radius, Material mat): center {Center}, radius {Radius}, material {mat} {}
+        Sphere(){}
+        Sphere(vec3 Center, float Radius, Material mat): center {Center}, radius {Radius}, material {mat} {}
 
         //surface normal function, returns ray along outward normal
         ray normal(vec3 point){
diff --git a/Rendera/src/main.cpp b/Rendera/src/main.cpp
index aaf21c7..36bc1ee 100644
--- a/Rendera/src/main.cpp
+++ b/Rendera/src/main.cpp
@@ -4,13 +4,15 @@
 #include "camera.hpp"
 #include "sphere.hpp"
 #include "intersection.hpp"
-
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
 #include "scene.hpp"
 #include <fstream>
 #include <cmath>
 #include <random>
+#include<iostream>
+
+
+
+
 
 int main(){
     int n_sphere = 3;
@@ -21,8 +23,6 @@ int main(){
     vec3 center1 = {3, 1, 0};
     vec3 center2 = {5, 0, 5};
 
-    float specular_cosine = dot(-cam_ray.get_direction(), reflect_ray.get_direction());
-    float spec_factor = 0;
     color b = {0,0, 1};
     color g = {0,1,0};
     color r = {1, 0,0};
@@ -31,51 +31,22 @@ int main(){
     Material mat_3 = {0.5*r + 0.2*b, 0.1, 1, 0.9, 200};
 
     Scene sc(n_sphere, img_height, img_width);
-    sc.set_sphere(0, center, 1, mat_1);
-    sc.set_sphere(1, center1, 1, mat_2);
-    sc.set_sphere(2, center2, 1, mat_3);
+    sc.add_sphere(center, 1, mat_1);
+    sc.add_sphere(center1, 1, mat_2);
+    sc.add_sphere(center2, 1, mat_3);
 
     sc.render();
 
-    int max_col = 255;
-    Camera cam(cam_origin, port_width, port_height, img_width, img_height, focal_length);
 
-    // Jpeg and png
-    // Making an array of such size as there are width*height pixels and each pixel has 3 RGB values.
-    std::uint8_t* pixels = new std::uint8_t[img_width * img_height * 3]; 
-    int index = 0;  //Index of the array containing RGB values of image for the current pixel
 
-    vec3 center = {3,-2,0};
-    vec3 center1 = {3, 1, 0};
-    vec3 center2 = {5, 0, 5};
 
-    color b = {0,0, 1};
-    color g = {0,1,0};
-    color r = {1, 0,0};
-    Material mat_1 ={b, 0.1, 1, 0.9, 200};
-    Material mat_2 = {g, 0.1, 1, 0.9, 200};
-    Material mat_3 = {0.5*r + 0.2*b, 0.1, 1, 0.9, 200};
 
-    Scene sc(n_sphere, img_height, img_width);
-    sc.set_sphere(0, center, 1, mat_1);
-    sc.set_sphere(1, center1, 1, mat_2);
-    sc.set_sphere(2, center2, 1, mat_3);
-
-    sc.render();
-  
     int max_col = 255;
     std::ofstream image("sphere.ppm");
     image << "P3\n";
     image << img_width << " " << img_height << "\n";
     image << max_col << "\n";
 
-    for(int i = 0; i < img_height*img_width ; i++){
-        if(sc.hitinfo[i].ishitting){
-            image << sc.hitinfo[i].rgb.get_R() << " " << sc.hitinfo[i].rgb.get_G() << " " << sc.hitinfo[i].rgb.get_B()<<" " ;
-            pixels[index++] = sc.hitinfo[i].rgb.get_R();
-            pixels[index++] = sc.hitinfo[i].rgb.get_G();
-            pixels[index++] = sc.hitinfo[i].rgb.get_B();
-
     for(int i = 0; i < img_height*img_width ; i++){
         if(sc.hitinfo[i].ishitting){
             image << sc.hitinfo[i].rgb.get_R() << " " << sc.hitinfo[i].rgb.get_G() << " " << sc.hitinfo[i].rgb.get_B()<<" " ;
@@ -83,12 +54,5 @@ int main(){
         else
             image << "0 0 0 ";
     }
-
-    stbi_write_png("Sphere.png", img_width, img_height, 3, pixels, img_width * 3);
-    std::cout<<"PNG image generated\n";
-    stbi_write_jpg("Sphere.jpg", img_width, img_height, 3, pixels, 100);
-    std::cout<<"JPG image generated\n";
-    delete[] pixels;
-    image.close()
-    return 0;
+    image.close();
 }
diff --git a/utilities/include/intersection.hpp b/utilities/include/intersection.hpp
index f547fb3..e6cde79 100644
--- a/utilities/include/intersection.hpp
+++ b/utilities/include/intersection.hpp
@@ -10,13 +10,12 @@ class Intersection{
     float t_2;
 
     public:
-        bool hit(const sphere &s, const ray &ray_1){
+        bool hit(const Sphere &s, const ray &ray_1){
             //make a quadratic equation in t
             vec3 a = ray_1.get_direction();
             vec3 b = ray_1.get_origin();
             vec3 c = s.c();
             float radius = s.r();
-
             float alpha = a.norm()*a.norm(); //tsquare coeff
             float beta = 2*dot(a,b-c); //t coeff
             float gamma = (b-c).norm()*(b-c).norm() - radius*radius; //constant
diff --git a/utilities/include/vec3.hpp b/utilities/include/vec3.hpp
index e7cd116..f831d9a 100644
--- a/utilities/include/vec3.hpp
+++ b/utilities/include/vec3.hpp
@@ -35,6 +35,8 @@ class alignas(ALIGN_WIDTH) vec3 : public vec4{
         constexpr explicit vec3(Utype x) : vec4{x,x,x,0} {}
         constexpr vec3(Utype x,Utype y,Utype z) : vec4{x,y,z,0} {}
         explicit vec3(xsimd::batch<Utype,UArch> x) : vec4{x} {}
+        constexpr vec3(vec4 a): vec4{a.x(), a.y(), a.z(), a.w()}{}
+        vec3() = default;
         
         // cross-product
         friend constexpr vec3 cross(const vec3& v1,const vec3& v2){
diff --git a/utilities/include/vec4.hpp b/utilities/include/vec4.hpp
index 398fec0..5e5a167 100644
--- a/utilities/include/vec4.hpp
+++ b/utilities/include/vec4.hpp
@@ -7,7 +7,6 @@
 #include <type_traits> // for std::is_constant_evaluated
 
 #include <xsimd/xsimd.hpp>
-
 #include "config.hpp"
 /*  *Macros provided by config.hpp
     - ALIGN_WIDTH: Alignment width for class, since it is dependent on Arch.
@@ -59,15 +58,14 @@ class alignas(ALIGN_WIDTH) vec4{
                 return sum(temp);
             }
         }
-        
-        CONSTEXPR_CMATH Utype norm() const{
+        constexpr Utype norm() const{
             return std::sqrt(dot(*this,*this));
         }
 
-        CONSTEXPR_CMATH Utype angle(const vec4& v1,const vec4& v2){
+        constexpr Utype angle(const vec4& v1,const vec4& v2){
             return std::acos(dot(v1,v2)/(v1.norm()*v2.norm()));
         }
-        CONSTEXPR_CMATH vec4 unit() const{
+        constexpr vec4 unit() const{
             return *this/this->norm();
         }
 

From 9a675af39235660078cf2fcec0f6a729b187d718 Mon Sep 17 00:00:00 2001
From: mahesh0537 <mail2mahesh0537@gmail.com>
Date: Thu, 28 Jul 2022 02:54:59 +0530
Subject: [PATCH 5/6] cude added in scene

---
 Rendera/include/cube.hpp  | 24 +++++++++++----
 Rendera/include/scene.hpp | 63 +++++++++++++++++++++++++++++++++++----
 Rendera/src/main.cpp      | 11 +++++--
 3 files changed, 85 insertions(+), 13 deletions(-)

diff --git a/Rendera/include/cube.hpp b/Rendera/include/cube.hpp
index 206d281..1e81445 100644
--- a/Rendera/include/cube.hpp
+++ b/Rendera/include/cube.hpp
@@ -58,6 +58,7 @@ class Cube
     vec3 m_position;
     vec3 m_a, m_b, m_c;
     Material m_material;
+    vec3 int_pt;
     const double m_epsilon = 1e-5;
 
 public:
@@ -180,7 +181,7 @@ class Cube
         (all occurences are referenced when traversing along the ray direction)
     */
 
-    HitInfo hit(const ray &r, int recursion_depth)
+    bool hit(const ray &r)
     {
         vec3 temp_a = plane_intersect(cross(m_b, m_c), m_position, r);
         vec3 temp_b = plane_intersect(cross(m_b, m_c), m_position + m_a, r);
@@ -200,20 +201,33 @@ class Cube
         // if the ray is outside the cube amin comes after amax when going along the ray
         if(dot((amin-r.get_origin()),r.get_direction())>dot((amax-r.get_origin()),r.get_direction()))
         {
-            return {false, vec3(0,0,0), m_material, r, recursion_depth};
+            // return {false, vec3(0,0,0), m_material, r, recursion_depth};
+            return false;
+
         }
         else if(dot(r.get_direction(),amax - r.get_origin())<0 )    // checks if both intersection are behind the r.origin
         {
-            return {false, vec3(0,0,0), m_material, r, recursion_depth};
+            // return {false, vec3(0,0,0), m_material, r, recursion_depth};
+            return false;
         }
         else if(dot(r.get_direction(),amin - r.get_origin())<0)     // checks if r.origin is inside the cube
         {
-            return {true, amax, m_material, r, recursion_depth-1};
+            // return {true, amax, m_material, r, recursion_depth-1};
+            int_pt = amax;
+            return true;
         }
         
-        return {true, amin, m_material, r, recursion_depth-1};     // if two intersections, returns the closest one
+        // return {true, amin, m_material, r, recursion_depth-1};     // if two intersections, returns the closest one
+        int_pt = amin;
+        return true;
         
     }
+    vec3 get_int_pt(){
+        return int_pt;
+    }
+    Material mat(){
+        return m_material;
+    }
 };
 
 #endif // CUBE_HPP
diff --git a/Rendera/include/scene.hpp b/Rendera/include/scene.hpp
index b0eae82..61ce035 100644
--- a/Rendera/include/scene.hpp
+++ b/Rendera/include/scene.hpp
@@ -66,12 +66,14 @@ class Scene{
 
         vec3 light_src = {-5,3,5};
         color light_col = {1,1,1};
+        vec3 light_src2 = {0, 10, 0};
 
 
-        vec3 cam_origin = {0,0,0};
-        float port_width = 8;
-        float port_height = 8;
-        float focal_length = 2;
+
+        vec3 cam_origin = {0,0,1};
+        float port_width = 10;
+        float port_height = 10;
+        float focal_length = 4;
         int max_col = 255;
         Camera cam;
 
@@ -115,6 +117,7 @@ class Scene{
                         hitinfo[y*img_width + x].intersection_pt = hitinfo[y*img_width + x].ray_.fetch(hitinfo[y*img_width + x].dist); 
                         hitinfo[y*img_width + x].normal = (*sp).normal(hitinfo[y*img_width + x].intersection_pt);
                         hitinfo[y*img_width + x].shade = lighting((*sp).mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+                        hitinfo[y*img_width + x].shade += lighting((*sp).mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src2, light_col);
                         hitinfo[y*img_width + x].rgb = hitinfo[y*img_width + x].shade.get_int();
                         hitinfo[y*img_width + x].ref_ray = reflect(hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal);
                         }
@@ -125,30 +128,80 @@ class Scene{
                     hitinfo[y*img_width + x].intersection_pt = hitinfo[y*img_width + x].ray_.fetch(hitinfo[y*img_width + x].dist); 
                     hitinfo[y*img_width + x].normal = (*sp).normal(hitinfo[y*img_width + x].intersection_pt);
                     hitinfo[y*img_width + x].shade = lighting((*sp).mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+                    hitinfo[y*img_width + x].shade += lighting((*sp).mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src2, light_col);
                     hitinfo[y*img_width + x].rgb = hitinfo[y*img_width + x].shade.get_int();
                     hitinfo[y*img_width + x].ref_ray = reflect(hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal);
 
                 }
             }
+
+            for(cb = hitable_cube.begin(); cb != hitable_cube.end(); ++cb){
+                bool hits = (*cb).hit(hitinfo[y*img_width + x].ray_);
+                if(hitinfo[y*img_width + x].ishitting && hits){
+                    float d = (*cb).get_int_pt().norm();
+                    if (hitinfo[y*img_width + x].dist>d){
+                        hitinfo[y*img_width + x].ishitting = true;
+                        hitinfo[y*img_width + x].intersection_pt = (*cb).get_int_pt();
+                        hitinfo[y*img_width + x].dist = d;
+                        hitinfo[y*img_width + x].normal = (*cb).normal(hitinfo[y*img_width + x].intersection_pt);
+                        hitinfo[y*img_width + x].shade = lighting((*cb).mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+                        hitinfo[y*img_width + x].shade += lighting((*cb).mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src2, light_col);
+                        hitinfo[y*img_width + x].rgb = hitinfo[y*img_width + x].shade.get_int();
+                        hitinfo[y*img_width + x].ref_ray = reflect(hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal);
+                    }
+
+                }
+                else if(hits){
+                    hitinfo[y*img_width + x].ishitting = true;
+                    hitinfo[y*img_width + x].intersection_pt = (*cb).get_int_pt();
+                    hitinfo[y*img_width + x].dist = hitinfo[y*img_width + x].intersection_pt.norm();
+                    hitinfo[y*img_width + x].normal = (*cb).normal(hitinfo[y*img_width + x].intersection_pt);
+                    hitinfo[y*img_width + x].shade = lighting((*cb).mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+                    hitinfo[y*img_width + x].shade += lighting((*cb).mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src2, light_col);
+                    hitinfo[y*img_width + x].rgb = hitinfo[y*img_width + x].shade.get_int();
+                    hitinfo[y*img_width + x].ref_ray = reflect(hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal);
+
+
+                }
+            }
         }
 
         void next_depth(int x, int y){
             std::vector<Sphere>::iterator sp;
+            std::vector<Cube>::iterator cb;
             for(sp = hitable_sphere.begin(); sp != hitable_sphere.end(); ++sp){
                 if(hitinfo[y*img_width + x].ishitting){
                 Intersection i_;
                 bool hits = i_.hit(*sp, hitinfo[y*img_width + x].ref_ray);
-                if (hitinfo[y*img_width + x].ishitting && hits){
+                if (hits){
                     if (hitinfo[y*img_width + x].dist > i_.dist_1()){
                         hitinfo[y*img_width + x].dist = i_.dist_1();
                         hitinfo[y*img_width + x].intersection_pt = hitinfo[y*img_width + x].ref_ray.fetch(hitinfo[y*img_width + x].dist); 
                         hitinfo[y*img_width + x].normal = (*sp).normal(hitinfo[y*img_width + x].intersection_pt);
                         hitinfo[y*img_width + x].shade_new = lighting((*sp).mat(), hitinfo[y*img_width + x].ref_ray, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+                        hitinfo[y*img_width + x].shade_new = lighting((*sp).mat(), hitinfo[y*img_width + x].ref_ray, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src2, light_col);
                         hitinfo[y*img_width + x].ref_ray = reflect(hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal);
                         }
                 }
                 }
             }
+
+            for(cb = hitable_cube.begin(); cb != hitable_cube.end(); ++cb){
+                if(hitinfo[y*img_width + x].ishitting){
+                bool hits = (*cb).hit(hitinfo[y*img_width + x].ray_);
+                    if (hits){
+                        float d = (*cb).get_int_pt().norm();
+                        if (hitinfo[y*img_width + x].dist>d){
+                            hitinfo[y*img_width + x].intersection_pt = (*cb).get_int_pt();
+                            hitinfo[y*img_width + x].dist = d;
+                            hitinfo[y*img_width + x].normal = (*cb).normal(hitinfo[y*img_width + x].intersection_pt);
+                            hitinfo[y*img_width + x].shade_new = lighting((*cb).mat(), hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal, hitinfo[y*img_width + x].intersection_pt, light_src, light_col);
+                            hitinfo[y*img_width + x].ref_ray = reflect(hitinfo[y*img_width + x].ray_, hitinfo[y*img_width + x].normal);
+                        }
+                    }
+
+                }
+            }
         }
 
         void render(){
diff --git a/Rendera/src/main.cpp b/Rendera/src/main.cpp
index 36bc1ee..14beb31 100644
--- a/Rendera/src/main.cpp
+++ b/Rendera/src/main.cpp
@@ -16,24 +16,29 @@
 
 int main(){
     int n_sphere = 3;
-    int img_width = 5000;
-    int img_height = 5000;
+    int img_width = 500;
+    int img_height = 500;
 
     vec3 center = {3,-2,0};
     vec3 center1 = {3, 1, 0};
     vec3 center2 = {5, 0, 5};
+    vec3 pos = {1,1,1};
+    vec3 a_ = {1,0,0};
+    vec3 b_ = {0, 1, 0};
+    vec3 c_ = {0, 0, 1};
 
     color b = {0,0, 1};
     color g = {0,1,0};
     color r = {1, 0,0};
     Material mat_1 ={b, 0.1, 1, 0.9, 200};
     Material mat_2 = {g, 0.1, 1, 0.9, 200};
-    Material mat_3 = {0.5*r + 0.2*b, 0.1, 1, 0.9, 200};
+    Material mat_3 = {0.5*r + 0.2*b, 0.5, 1, 0.9, 200};
 
     Scene sc(n_sphere, img_height, img_width);
     sc.add_sphere(center, 1, mat_1);
     sc.add_sphere(center1, 1, mat_2);
     sc.add_sphere(center2, 1, mat_3);
+    sc.add_cube(pos, (a_+ b_)/4, (b_+c_)/2, (c_+a_)/2, mat_3);
 
     sc.render();
 

From c47f76e7e2ae0f2a72566b4a906008e90c98194a Mon Sep 17 00:00:00 2001
From: Mahesh Bhupati <67902842+mahesh0537@users.noreply.github.com>
Date: Sat, 30 Jul 2022 20:02:00 +0530
Subject: [PATCH 6/6] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5d02cdc..379f7fa 100644
--- a/README.md
+++ b/README.md
@@ -22,5 +22,5 @@ To build the project and run locally,
 ```
 
 ```bash
--DCMAKE_CXX_COMPILER=gcc-11  //use this flag if gcc is not default
+cmake -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 -S. -Bbuild -DCMAKE_BUILD_TYPE=Release
 ```