From dd8c58214bc2dc0dc4faa719adb8296d803b7e23 Mon Sep 17 00:00:00 2001
From: stg05 <stg05@outlook.com>
Date: Sun, 17 Nov 2024 23:15:19 +0300
Subject: [PATCH 1/4] grid mistakes?

---
 week06/main.cpp | 227 ++++++++++++++++++++++++++----------------------
 1 file changed, 121 insertions(+), 106 deletions(-)

diff --git a/week06/main.cpp b/week06/main.cpp
index eae8dbe..e8b36f7 100644
--- a/week06/main.cpp
+++ b/week06/main.cpp
@@ -1,188 +1,203 @@
 #include <iostream>
 #include <cassert>
+#include <type_traits>
 
 template <typename T, unsigned Dimension>
 class Grid;
 
-/* Specialization for 1-dim array */
-template <typename T>
-class Grid<T, 1>
+template <typename T, unsigned Dimension>
+class Grid
 {
 public:
+    static_assert(Dimension > 0, "Zero-dimensional array");
     using value_type = T;
     using size_type = unsigned;
 
 private:
-    T *data;
+    Grid<T, Dimension - 1> *m_subgrids;
     size_type dim_size;
+    // todo allocate
+    void mem_allocate(size_type size)
+    {
+        m_subgrids = static_cast<Grid<T, Dimension - 1> *>(::operator new(sizeof(Grid<T, Dimension - 1>) * size));
+    }
 
-public:
-    Grid<T, 1>(T &&value)
+    void mem_free()
     {
-        data = new T[1];
-        dim_size = 1;
-        data[0] = value;
+        delete m_subgrids;
     }
 
-    Grid(size_type size, T const &fill_value) : dim_size{size}
+public:
+    template <typename First, typename... Rest, std::enable_if_t<(sizeof...(Rest) > 0), bool> = true>
+    Grid(const First first, const Rest... rest) : dim_size{(size_type)first}
     {
-        data = new T[size];
-        for (size_type i = 0; i < size; i++)
+        mem_allocate(dim_size);
+
+        for (size_type i = 0; i < first; i++)
         {
-            data[i] = fill_value;
+            new (m_subgrids + i) Grid<T, Dimension - 1>(rest...);
         }
     }
 
     // Copy constructor
-    Grid(Grid<T, 1> const &other)
+    Grid(Grid<T, Dimension> const &other)
     {
-        size_type other_size = other.dim_size;
-        data = new T[other_size];
-        dim_size = other_size;
-        for (size_type i = 0; i < other_size; i++)
+        dim_size = other.dim_size;
+        mem_allocate(dim_size);
+
+        for (size_type i = 0; i < dim_size; i++)
         {
-            data[i] = other.data[i];
+            m_subgrids[i] = Grid<T, Dimension - 1>(other.m_subgrids[i]);
+        }
+    }
+
+    // Move constructor
+    Grid(Grid<T, Dimension> &&other)
+    {
+        dim_size = other.dim_size;
+        mem_allocate(dim_size);
+
+        for (size_type i = 0; i < dim_size; i++)
+        {
+            std::swap(m_subgrids[i], other.m_subgrids[i]);
         }
     }
 
-    const T &operator[](size_type rhs)
+    Grid<T, Dimension> &operator=(const Grid<T, Dimension> &rhs)
+    {
+        if (this == &rhs)
+            return *this;
+        // copy and swap
+
+        if (this->dim_size != rhs.dim_size)
+        {
+            this->mem_free();
+            this->dim_size = rhs.dim_size;
+            this->mem_allocate(this->dim_size);
+        }
+        std::copy(rhs.m_subgrids, rhs.m_subgrids + rhs.dim_size, this->m_subgrids);
+        return *this;
+    }
+
+    Grid<T, Dimension> &operator=(Grid<T, Dimension> &&rhs)
+    {
+        if (this == &rhs)
+            return *this;
+        if (this->dim_size != rhs.dim_size)
+        {
+            this->mem_free();
+            this->dim_size = rhs.dim_size;
+            this->mem_allocate(this->dim_size);
+        }
+        std::swap(this->m_subgrids, rhs.m_subgrids);
+        return *this;
+    }
+
+    // Copying operator
+    // non const version
+    const Grid<T, Dimension - 1> &operator[](size_type rhs) const
     {
         if ((rhs < 0) || (rhs >= dim_size))
             throw std::out_of_range("Out of bounds");
-        return data[rhs];
+        return m_subgrids[rhs];
+    }
+
+    Grid<T, Dimension - 1> &operator[](size_type rhs)
+    {
+        if ((rhs < 0) || (rhs >= dim_size))
+            throw std::out_of_range("Out of bounds");
+        return m_subgrids[rhs];
     }
 
     ~Grid()
     {
-        // std::cout << "trying" << std::endl;
-        delete[] data;
-        // std::cout << "del data (Dim=1), size = " << dim_size << std::endl;
+        mem_free(); // #TODO почему не delete[]? (тогда в valgrind будет mismatch)
     }
 };
 
-template <typename T, unsigned Dimension>
-class Grid
+/* Specialization for 1-dim array */
+template <typename T>
+class Grid<T, 1>
 {
 public:
-    static_assert(Dimension > 0, "Zero-dimensional array");
     using value_type = T;
     using size_type = unsigned;
 
 private:
-    Grid<T, Dimension - 1> **m_subgrids;
+    T *data;
     size_type dim_size;
+    void mem_allocate(size_type size)
+    {
+        data = new T[size];
+    }
 
-public:
-    template <typename First, typename... Rest>
-    Grid(const First first, const Rest... rest) : dim_size{(size_type)first}
+    void mem_free()
     {
-        m_subgrids = static_cast<Grid<T, Dimension - 1> **>(::operator new(sizeof(Grid<T, Dimension - 1>) * first));
-        for (size_type i = 0; i < first; i++)
-        {
-            m_subgrids[i] = new Grid<T, Dimension - 1>(rest...);
-        }
+        delete[] data;
     }
 
-    // Copy constructor
-    Grid(Grid<T, Dimension> const &other)
+public:
+    Grid(const T value)
     {
-        size_type other_size = other.dim_size;
-        dim_size = other_size;
-        m_subgrids = static_cast<Grid<T, Dimension - 1> **>(::operator new(sizeof(Grid<T, Dimension - 1>) * other_size));
+        data = new T[1];
+        dim_size = 1;
+        data[0] = value;
+    }
 
-        for (size_type i = 0; i < other_size; i++)
+    Grid(size_type size, T const &fill_value) : dim_size{size}
+    {
+        mem_allocate(size);
+        for (size_type i = 0; i < size; i++)
         {
-            m_subgrids[i] = new Grid<T, Dimension - 1>(*(other.m_subgrids[i]));
+            data[i] = fill_value;
         }
     }
 
-    // Move constructor
-    Grid(Grid<T, Dimension> &&other)
+    // Copy constructor
+    Grid(Grid<T, 1> const &other)
     {
-        size_type other_size = other.dim_size;
-        dim_size = other_size;
-        m_subgrids = static_cast<Grid<T, Dimension - 1> **>(::operator new(sizeof(Grid<T, Dimension - 1>) * other_size));
+        dim_size = other.dim_size;
+        mem_allocate(dim_size);
 
-        for (size_type i = 0; i < other_size; i++)
+        for (size_type i = 0; i < dim_size; i++)
         {
-            m_subgrids[i] = new Grid<T, Dimension - 1>(*(other.m_subgrids[i]));
+            data[i] = other.data[i];
         }
     }
 
-    Grid<T, Dimension> &operator=(Grid<T, Dimension> &rhs)
+    const T &operator[](size_type rhs) const
     {
-        return rhs;
-    }
-    Grid<T, Dimension> &operator=(Grid<T, Dimension> &&rhs)
-    {
-        return rhs;
+        if ((rhs < 0) || (rhs >= dim_size))
+            throw std::out_of_range("Out of bounds");
+        return data[rhs];
     }
 
-    // Copying operator
-
-    Grid<T, Dimension - 1> &operator[] (size_type rhs) const
+    T &operator[](size_type rhs)
     {
         if ((rhs < 0) || (rhs >= dim_size))
             throw std::out_of_range("Out of bounds");
-        return *m_subgrids[rhs];
+        return data[rhs];
     }
 
     ~Grid()
     {
-        for (size_type i = 0; i < dim_size; i++)
-        {
-            delete m_subgrids[i];
-        }
-        // std::cout << "Subgrids of dim " << Dimension - 1 << " del'd, proceeding to this of dim "
-        //           << Dimension << " with " << dim_size << " subgrids." << std::endl;
-
-        delete m_subgrids; // #TODO почему не delete[]? (тогда в valgrind будет mismatch)
+        // std::cout << "trying" << std::endl;
+        mem_free();
+        // std::cout << "del data (Dim=1), size = " << dim_size << std::endl;
     }
 };
 
-// template <typename T>
-// class Grid final
-// {
-// public:
-//     using value_type = T;
-//     using size_type = unsigned;
-
-// private:
-//     T *data;
-//     size_type const m_y_size, m_x_size;
-
-// public:
-//     Grid<T>(size_type y_size, size_type x_size) : m_y_size(y_size), m_x_size(x_size), data(new T[x_size * y_size])
-//     {
-//     }
-
-//     Grid(T const &t)
-//     {
-//         data = new T[1];
-//         data[0] = t;
-//     }
-
-//     // Copy constructor
-//     Grid(Grid<T> const &) = delete;
-
-//     // Move constructor
-//     Grid(Grid<T> &&) = delete;
-
-//     // Copy assginment
-//     Grid<T> &operator=(Grid<T> &) = delete;
-
-//     // Move assignment
-//     Grid<T> &operator=(Grid<T> &&) = delete;
-
 int main()
 {
-    Grid<float, 3> const g3(2, 3, 4, 1.00f);
-    assert(1.0f == g3[1][1][1]);
+    // Grid<float, 3> const g3(10, 10, 10, 1.00f);
+    // assert(1.0f == g3[1][1][1]);
 
     Grid<float, 2> g2(2, 5, 2.0f);
     assert(2.0f == g2[1][1]);
 
-    g2 = g3[1];
-    assert(2.0f == g2[1][1]);
+    // g2 = g3[1];
+    // assert(1.0f == g2[1][1]);
+
+    // auto g1 = Grid<unsigned, 1>(1u);
     return 0;
 }
\ No newline at end of file

From f5b80ccd53aa82ffc4bfedd277c804ed8a167aab Mon Sep 17 00:00:00 2001
From: stg05 <stg05@outlook.com>
Date: Tue, 19 Nov 2024 21:13:42 +0300
Subject: [PATCH 2/4] grid (done?): mem errors fixed, operator skobochka added

---
 week06/main     | Bin 36872 -> 0 bytes
 week06/main.cpp | 118 +++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 102 insertions(+), 16 deletions(-)
 delete mode 100755 week06/main

diff --git a/week06/main b/week06/main
deleted file mode 100755
index 0be4fb1f39273d47317de147e71f97c4511ee479..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36872
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
TA1ZzCWs+R+-zdCS9;*HqsCC&(

diff --git a/week06/main.cpp b/week06/main.cpp
index e8b36f7..cd84904 100644
--- a/week06/main.cpp
+++ b/week06/main.cpp
@@ -5,7 +5,7 @@
 template <typename T, unsigned Dimension>
 class Grid;
 
-template <typename T, unsigned Dimension>
+template <typename T, unsigned Dimension> // Todo operator skobochki
 class Grid
 {
 public:
@@ -16,15 +16,23 @@ class Grid
 private:
     Grid<T, Dimension - 1> *m_subgrids;
     size_type dim_size;
-    // todo allocate
+
+    /** Allocating a buffer of a specific size for subgrids of inferior dimensions */
     void mem_allocate(size_type size)
     {
         m_subgrids = static_cast<Grid<T, Dimension - 1> *>(::operator new(sizeof(Grid<T, Dimension - 1>) * size));
     }
 
+    /** Deleting the buffer: firstly recursively remove objects placed into the buffer via
+     * placement news (by manually calling destructors), then freeing the buffer itself. */
     void mem_free()
     {
-        delete m_subgrids;
+        for (size_type i = 0; i < dim_size; i++)
+        {
+            (m_subgrids + i)->~Grid<T, Dimension - 1>();
+        }
+
+        ::operator delete(m_subgrids);
     }
 
 public:
@@ -39,7 +47,7 @@ class Grid
         }
     }
 
-    // Copy constructor
+    /** Copy constructor (does not mutate the argument as may be seen from the signature) */
     Grid(Grid<T, Dimension> const &other)
     {
         dim_size = other.dim_size;
@@ -51,7 +59,7 @@ class Grid
         }
     }
 
-    // Move constructor
+    /** Move constructor (possibly takes rvalue as an argument) */
     Grid(Grid<T, Dimension> &&other)
     {
         dim_size = other.dim_size;
@@ -63,38 +71,47 @@ class Grid
         }
     }
 
+    /** Copy assignment */
     Grid<T, Dimension> &operator=(const Grid<T, Dimension> &rhs)
     {
+        // Self-assignment check
         if (this == &rhs)
+        {
             return *this;
-        // copy and swap
-
+        }
+        // Reallocating the buffer if only dim-sizes do not correspond
         if (this->dim_size != rhs.dim_size)
         {
             this->mem_free();
             this->dim_size = rhs.dim_size;
             this->mem_allocate(this->dim_size);
         }
-        std::copy(rhs.m_subgrids, rhs.m_subgrids + rhs.dim_size, this->m_subgrids);
+        // Utilizing copy-construction [recursively]
+        for (size_type i = 0; i < this->dim_size; i++)
+        {
+            new (m_subgrids + i) Grid<T, Dimension - 1>(rhs.m_subgrids[i]);
+        }
         return *this;
     }
 
+    /** Move assignment */
     Grid<T, Dimension> &operator=(Grid<T, Dimension> &&rhs)
     {
+        // Self-assignment check
         if (this == &rhs)
             return *this;
+        // Reallocating the buffer if only dim-sizes do not correspond
         if (this->dim_size != rhs.dim_size)
         {
             this->mem_free();
             this->dim_size = rhs.dim_size;
             this->mem_allocate(this->dim_size);
         }
+        // Merely swapping the contents
         std::swap(this->m_subgrids, rhs.m_subgrids);
         return *this;
     }
 
-    // Copying operator
-    // non const version
     const Grid<T, Dimension - 1> &operator[](size_type rhs) const
     {
         if ((rhs < 0) || (rhs >= dim_size))
@@ -109,13 +126,61 @@ class Grid
         return m_subgrids[rhs];
     }
 
+    /** Template for functor op.: returning one of recursively obtained subgrids */
+    template <typename First, typename... Rest>
+    typename std::enable_if<(Dimension == sizeof...(Rest) + 1), T &>::type
+    operator()(First first, Rest... rest)
+    {
+        return this->m_subgrids[(size_type)first](rest...);
+    }
+
+    /** Template for functor op.: returning value of the lowest-level subgrid */
+    template <typename First, typename... Rest>
+    typename std::enable_if<(Dimension > sizeof...(Rest) + 1), Grid<T, Dimension - sizeof...(Rest) - 1> &>::type
+    operator()(First first, Rest... rest)
+    {
+        return this->m_subgrids[(size_type)first](rest...);
+    }
+
+    /** Template for functor op.: finalizing the recursion for subgrid returning */
+    template <typename First>
+    typename std::enable_if<(Dimension > 1), Grid<T, Dimension - 1> &>::type
+    operator()(First first)
+    {
+        return this->m_subgrids[(size_type)first];
+    }
+
+    /** Template for functor op.: returning one of recursively obtained subgrids */
+    template <typename First, typename... Rest>
+    typename std::enable_if<(Dimension == sizeof...(Rest) + 1), const T &>::type
+    operator()(First first, Rest... rest) const
+    {
+        return this->m_subgrids[(size_type)first](rest...);
+    }
+
+    /** Template for functor op.: returning value of the lowest-level subgrid */
+    template <typename First, typename... Rest>
+    typename std::enable_if<(Dimension > sizeof...(Rest) + 1), const Grid<T, Dimension - sizeof...(Rest) - 1> &>::type
+    operator()(First first, Rest... rest) const
+    {
+        return this->m_subgrids[(size_type)first](rest...);
+    }
+
+    /** Template for functor op.: finalizing the recursion for subgrid returning */
+    template <typename First>
+    typename std::enable_if<(Dimension > 1), const Grid<T, Dimension - 1> &>::type
+    operator()(First first) const
+    {
+        return this->m_subgrids[(size_type)first];
+    }
+
     ~Grid()
     {
         mem_free(); // #TODO почему не delete[]? (тогда в valgrind будет mismatch)
     }
 };
 
-/* Specialization for 1-dim array */
+/** Specialization for 1-dim array */
 template <typename T>
 class Grid<T, 1>
 {
@@ -179,6 +244,20 @@ class Grid<T, 1>
         return data[rhs];
     }
 
+    /** Template for functor op.: finalizing the recursion for value returning */
+    template <typename First>
+    const T &operator()(First first) const
+    {
+        return this->data[(size_type)first];
+    }
+
+    /** Template for functor op.: finalizing the recursion for value returning */
+    template <typename First>
+    T &operator()(First first)
+    {
+        return this->data[(size_type)first];
+    }
+
     ~Grid()
     {
         // std::cout << "trying" << std::endl;
@@ -189,15 +268,22 @@ class Grid<T, 1>
 
 int main()
 {
-    // Grid<float, 3> const g3(10, 10, 10, 1.00f);
-    // assert(1.0f == g3[1][1][1]);
+    Grid<float, 3> const g3(10, 10, 10, 1.00f);
+    assert(1.0f == g3[1][1][1]);
 
     Grid<float, 2> g2(2, 5, 2.0f);
     assert(2.0f == g2[1][1]);
 
-    // g2 = g3[1];
-    // assert(1.0f == g2[1][1]);
+    std::cout << g3(1, 1, 1) << std::endl;
+
+    g2(1, 1) = 2.5;
+    assert(g2(1, 1) == g2[1][1]);   // Operator skokbochka (_, _, ... _) working same as [][] ... []
+    assert(g2(1, 1) != g2(1, 0));   // [g2(1,1)=__2.5f__] != [g2(1,0)=__2.0f__] 
+    g2 = g3[1];
+    assert(1.0f == g2[1][1]);       // g2(1,1) rewritten
+
+    assert(&g3[1] != &g2);          // g2 was copied properly
 
-    // auto g1 = Grid<unsigned, 1>(1u);
+    auto g1 = Grid<unsigned, 1>(1u);
     return 0;
 }
\ No newline at end of file

From 2b20ac0ee6a39f83f5e59771f387c5bdf2e7a5ed Mon Sep 17 00:00:00 2001
From: stg05 <stg05@outlook.com>
Date: Sat, 30 Nov 2024 05:19:02 +0300
Subject: [PATCH 3/4] raytracer updates

---
 .idea/.gitignore                         |  8 --------
 .idea/.name                              |  1 -
 .idea/labs3sem.iml                       |  8 --------
 .idea/misc.xml                           |  6 ------
 .idea/modules.xml                        |  8 --------
 .idea/vcs.xml                            |  6 ------
 week02/raytracer/CMakeLists.txt          |  4 ++--
 week02/raytracer/fun/video_render.py     | 12 ++++++++----
 week02/raytracer/include/object.h        |  6 +++---
 week02/raytracer/include/ray.h           | 25 +++++++++++++++++++++---
 week02/raytracer/main.cpp                |  3 +++
 week02/raytracer/src/object.cpp          | 14 ++++++++-----
 week02/raytracer/src/ray.cpp             | 18 ++++++++++++++---
 week02/raytracer/src/transformations.cpp |  2 +-
 week02/raytracer/src/utils.cpp           |  5 +++--
 15 files changed, 66 insertions(+), 60 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/labs3sem.iml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 73f69e0..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 88d050b..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-main
\ No newline at end of file
diff --git a/.idea/labs3sem.iml b/.idea/labs3sem.iml
deleted file mode 100644
index e86c114..0000000
--- a/.idea/labs3sem.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module classpath="CMake" type="CPP_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Python" name="Python facet">
-      <configuration sdkName="Python 3.10 (labs3sem)" />
-    </facet>
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 977d7ec..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$/week02/raytracer">
-    <contentRoot DIR="$PROJECT_DIR$" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index e315d18..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/labs3sem.iml" filepath="$PROJECT_DIR$/.idea/labs3sem.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/week02/raytracer/CMakeLists.txt b/week02/raytracer/CMakeLists.txt
index 52ef39c..d27763c 100644
--- a/week02/raytracer/CMakeLists.txt
+++ b/week02/raytracer/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.20)
 
-project(main)
+project(raytracer)
 
 set(SOURCES main.cpp src/utils.cpp src/vec3.cpp src/transformations.cpp src/ray.cpp src/viewport.cpp include/viewport.h src/scene.cpp include/scene.h include/color.h src/color.cpp src/object.cpp)
 set(CMAKE_CXX_STANDARD 20)
 
-add_executable(main ${SOURCES})
+add_executable(raytracer ${SOURCES})
diff --git a/week02/raytracer/fun/video_render.py b/week02/raytracer/fun/video_render.py
index 7a2ce73..623d366 100644
--- a/week02/raytracer/fun/video_render.py
+++ b/week02/raytracer/fun/video_render.py
@@ -1,14 +1,18 @@
 import os
-
+import time
 import cv2
 
-img1 = cv2.imread(r'C:/Users/stg05/CLionProjects/labs3sem/week02/raytracer/cmake-build-release/out/f1.ppm')
+img1 = cv2.imread(r'/home/tunaspb/vscode/cpp3sem/build/out/f1.ppm')
 height, width, layers = img1.shape
 
-video = cv2.VideoWriter(filename='video.mp4', fourcc=-1, frameSize=(width, height),
+path = '/home/tunaspb/vscode/cpp3sem/build/out/'
+path_vid = '/home/tunaspb/vscode/cpp3sem/build/vid/'
+
+cc4 = cv2.VideoWriter_fourcc(*'mp4v')
+video = cv2.VideoWriter(filename=path_vid+time.asctime(time.localtime())+'.mp4', fourcc=cc4, frameSize=(width, height),
                         fps=30)
 
-path = '../cmake-build-release/out/'
+
 filenames = []
 for i in range(1, 1+len(os.listdir(path))):
     filenames.append('f' + str(i) + '.ppm')
diff --git a/week02/raytracer/include/object.h b/week02/raytracer/include/object.h
index 198858d..fae06ed 100644
--- a/week02/raytracer/include/object.h
+++ b/week02/raytracer/include/object.h
@@ -6,7 +6,7 @@
 
 #include "ray.h"
 
-/** General passive object included in scene \n
+/** General passive object included in scene 
  * e.g: refractors, mat objects, mirrors */
 class object {
 public:
@@ -15,7 +15,7 @@ class object {
     virtual ~object() = default;
 
     [[nodiscard]] virtual bool
-    hit(const ray &r, double ray_tmin, double ray_tmax, hit_record &record) const = 0;
+    hit(const ray &r, interval scope, hit_record &record) const = 0;
 };
 
 class sphere : public object {
@@ -24,7 +24,7 @@ class sphere : public object {
 
     sphere(vec3, double);
 
-    [[nodiscard]] bool hit(const ray &r, double ray_tmin, double ray_tmax, hit_record &record) const override;
+    [[nodiscard]] bool hit(const ray &r, interval scope, hit_record &record) const override;
 
 private:
     vec3 m_center{0, 0, 0};
diff --git a/week02/raytracer/include/ray.h b/week02/raytracer/include/ray.h
index af96859..cbf424e 100644
--- a/week02/raytracer/include/ray.h
+++ b/week02/raytracer/include/ray.h
@@ -2,12 +2,16 @@
 // Created by stg05 on 28.09.2024.
 //
 
+#define COMP_PRECISION 0.00001
+
 #include "color.h"
+#include <limits>
 
 #ifndef MAIN_RAY_H
 #define MAIN_RAY_H
 
-class ray {
+class ray
+{
 public:
     ray() = default;
 
@@ -25,7 +29,8 @@ class ray {
     vec3 m_pivot{0, 0, 0}, m_dir{0, 0, 0};
 };
 
-class hit_record {
+class hit_record
+{
 public:
     hit_record() = default;
 
@@ -40,4 +45,18 @@ class hit_record {
     bool m_front_face = false;
 };
 
-#endif //MAIN_RAY_H
\ No newline at end of file
+class interval
+{
+public:
+    static const double inline INF = std::numeric_limits<double>::infinity();
+
+private:
+    double m_min, m_max;
+
+public:
+    interval() = default;
+    interval(double, double);
+    bool operator()(double);
+};
+
+#endif // MAIN_RAY_H
\ No newline at end of file
diff --git a/week02/raytracer/main.cpp b/week02/raytracer/main.cpp
index 938fe35..2bb2b15 100644
--- a/week02/raytracer/main.cpp
+++ b/week02/raytracer/main.cpp
@@ -8,8 +8,11 @@ int main()
     scene s;
     sphere sph{10, 0, 0, 2};
     sphere sph2{0, 0, -10, 2};
+    sphere sph3{0, -100, 0, 99};
     s.objects.push_front(&sph);
     s.objects.push_front(&sph2);
+    s.objects.push_front(&sph3);
+
     for (double i = 5.0; i > 0.5; i /= 1.05)
     {
         s.v = viewport{vec3{1, 0, 0} * i};
diff --git a/week02/raytracer/src/object.cpp b/week02/raytracer/src/object.cpp
index 119e82c..0fd3aa9 100644
--- a/week02/raytracer/src/object.cpp
+++ b/week02/raytracer/src/object.cpp
@@ -10,23 +10,27 @@ sphere::sphere(double x, double y, double z, double r) : object(), m_center{x, y
 
 sphere::sphere(vec3 center, double r) : object(), m_center{center}, m_r{r} {}
 
-bool sphere::hit(const ray &r, double ray_tmin, double ray_tmax, hit_record &record) const {
+bool sphere::hit(const ray &r, interval scope, hit_record &record) const
+{
     vec3 delta = m_center - r.get_pivot();
     vec3 dir = r.get_dir();
     vec3 proj = (delta * dir.e()) * (dir.e());
     vec3 delta_per = delta - proj;
     bool result = (double(delta_per) < m_r);
-    if (!result) {
+    if (!result)
+    {
         return false;
     }
     double offset_from_center = std::sqrt(m_r * m_r - delta_per.length_squared());
     vec3 intersection = proj - offset_from_center * dir.e();
-    if ((double(intersection) > ray_tmax) || (double(intersection) < ray_tmin)) {
+    if (!scope(double(intersection)) || (intersection * dir < 0))
+    {
         return false;
-    } else {
+    }
+    else
+    {
         vec3 normal_vec = (intersection - m_center).e();
         record.set_face_normal(r, normal_vec);
         return true;
     }
 }
-
diff --git a/week02/raytracer/src/ray.cpp b/week02/raytracer/src/ray.cpp
index a55094f..c739fb8 100644
--- a/week02/raytracer/src/ray.cpp
+++ b/week02/raytracer/src/ray.cpp
@@ -4,7 +4,6 @@
 
 #include "../include/ray.h"
 
-
 ray::ray(vec3 pivot, vec3 dir) : m_dir{dir}, m_pivot{pivot} {}
 
 vec3 ray::at(double t) { return vec3{m_pivot + m_dir * t}; }
@@ -15,11 +14,24 @@ vec3 ray::get_dir() const { return m_dir; }
 
 ray::ray(vec3 dir) : m_dir{dir} {}
 
-void hit_record::set_face_normal(const ray &r, const vec3 &outward_normal) {
+void hit_record::set_face_normal(const ray &r, const vec3 &outward_normal)
+{
     m_normal = outward_normal;
     m_front_face = r.get_dir() * outward_normal < 0;
 }
 
-vec3 hit_record::normal() const {
+vec3 hit_record::normal() const
+{
     return m_normal;
 }
+
+interval::interval(double min, double max)
+{
+    this->m_min = min;
+    this->m_max = max;
+}
+
+bool interval::operator()(double x)
+{
+    return (x > m_min - COMP_PRECISION) && (x < m_max + COMP_PRECISION);
+}
\ No newline at end of file
diff --git a/week02/raytracer/src/transformations.cpp b/week02/raytracer/src/transformations.cpp
index e39a9c7..170e9df 100644
--- a/week02/raytracer/src/transformations.cpp
+++ b/week02/raytracer/src/transformations.cpp
@@ -43,7 +43,7 @@ color color2bw(const color &param) {
 color ray_color(const ray &r, const scene &s) {
     hit_record hr{};
     for(const auto* iter : s.objects){
-        if (iter->hit(r, 0, 10000.0, hr)) {
+        if (iter->hit(r, interval{0, 10000}, hr)) {
             return color{.5, .5, .5} + 0.5*hr.normal();
         }
     }
diff --git a/week02/raytracer/src/utils.cpp b/week02/raytracer/src/utils.cpp
index ae7837a..502cfa1 100644
--- a/week02/raytracer/src/utils.cpp
+++ b/week02/raytracer/src/utils.cpp
@@ -25,12 +25,13 @@ void write_color(std::ostream &out, const color &pixel_color) {
 }
 
 sequence_renderer::sequence_renderer() {
-    std::string command = "cd " + path + "&& del *.* /q /s";
+    //std::string command = "cd " + path + "&& rm *.* /q /s";
+    std::string command = "find ./out/ -type f -name 'f*' -delete";
     system(command.c_str());
 }
 
 void sequence_renderer::render_frame(const scene &s) const {
-    std::string file_path(path + "\\f" + std::to_string(frame_counter) + ".ppm");
+    std::string file_path("./out/f" + std::to_string(frame_counter) + ".ppm");
     frame_counter++;
     std::ofstream os(file_path);
     write_image(os, s);

From 23fedee181022cad236cf288d448f26704ceac99 Mon Sep 17 00:00:00 2001
From: stg05 <stg05@outlook.com>
Date: Sat, 30 Nov 2024 05:24:09 +0300
Subject: [PATCH 4/4] Revert "raytracer updates"

This reverts commit 2b20ac0ee6a39f83f5e59771f387c5bdf2e7a5ed.
---
 .idea/.gitignore                         |  8 ++++++++
 .idea/.name                              |  1 +
 .idea/labs3sem.iml                       |  8 ++++++++
 .idea/misc.xml                           |  6 ++++++
 .idea/modules.xml                        |  8 ++++++++
 .idea/vcs.xml                            |  6 ++++++
 week02/raytracer/CMakeLists.txt          |  4 ++--
 week02/raytracer/fun/video_render.py     | 12 ++++--------
 week02/raytracer/include/object.h        |  6 +++---
 week02/raytracer/include/ray.h           | 25 +++---------------------
 week02/raytracer/main.cpp                |  3 ---
 week02/raytracer/src/object.cpp          | 14 +++++--------
 week02/raytracer/src/ray.cpp             | 18 +++--------------
 week02/raytracer/src/transformations.cpp |  2 +-
 week02/raytracer/src/utils.cpp           |  5 ++---
 15 files changed, 60 insertions(+), 66 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/.name
 create mode 100644 .idea/labs3sem.iml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..73f69e0
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..88d050b
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+main
\ No newline at end of file
diff --git a/.idea/labs3sem.iml b/.idea/labs3sem.iml
new file mode 100644
index 0000000..e86c114
--- /dev/null
+++ b/.idea/labs3sem.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="CMake" type="CPP_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Python" name="Python facet">
+      <configuration sdkName="Python 3.10 (labs3sem)" />
+    </facet>
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..977d7ec
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$/week02/raytracer">
+    <contentRoot DIR="$PROJECT_DIR$" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..e315d18
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/labs3sem.iml" filepath="$PROJECT_DIR$/.idea/labs3sem.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/week02/raytracer/CMakeLists.txt b/week02/raytracer/CMakeLists.txt
index d27763c..52ef39c 100644
--- a/week02/raytracer/CMakeLists.txt
+++ b/week02/raytracer/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.20)
 
-project(raytracer)
+project(main)
 
 set(SOURCES main.cpp src/utils.cpp src/vec3.cpp src/transformations.cpp src/ray.cpp src/viewport.cpp include/viewport.h src/scene.cpp include/scene.h include/color.h src/color.cpp src/object.cpp)
 set(CMAKE_CXX_STANDARD 20)
 
-add_executable(raytracer ${SOURCES})
+add_executable(main ${SOURCES})
diff --git a/week02/raytracer/fun/video_render.py b/week02/raytracer/fun/video_render.py
index 623d366..7a2ce73 100644
--- a/week02/raytracer/fun/video_render.py
+++ b/week02/raytracer/fun/video_render.py
@@ -1,18 +1,14 @@
 import os
-import time
+
 import cv2
 
-img1 = cv2.imread(r'/home/tunaspb/vscode/cpp3sem/build/out/f1.ppm')
+img1 = cv2.imread(r'C:/Users/stg05/CLionProjects/labs3sem/week02/raytracer/cmake-build-release/out/f1.ppm')
 height, width, layers = img1.shape
 
-path = '/home/tunaspb/vscode/cpp3sem/build/out/'
-path_vid = '/home/tunaspb/vscode/cpp3sem/build/vid/'
-
-cc4 = cv2.VideoWriter_fourcc(*'mp4v')
-video = cv2.VideoWriter(filename=path_vid+time.asctime(time.localtime())+'.mp4', fourcc=cc4, frameSize=(width, height),
+video = cv2.VideoWriter(filename='video.mp4', fourcc=-1, frameSize=(width, height),
                         fps=30)
 
-
+path = '../cmake-build-release/out/'
 filenames = []
 for i in range(1, 1+len(os.listdir(path))):
     filenames.append('f' + str(i) + '.ppm')
diff --git a/week02/raytracer/include/object.h b/week02/raytracer/include/object.h
index fae06ed..198858d 100644
--- a/week02/raytracer/include/object.h
+++ b/week02/raytracer/include/object.h
@@ -6,7 +6,7 @@
 
 #include "ray.h"
 
-/** General passive object included in scene 
+/** General passive object included in scene \n
  * e.g: refractors, mat objects, mirrors */
 class object {
 public:
@@ -15,7 +15,7 @@ class object {
     virtual ~object() = default;
 
     [[nodiscard]] virtual bool
-    hit(const ray &r, interval scope, hit_record &record) const = 0;
+    hit(const ray &r, double ray_tmin, double ray_tmax, hit_record &record) const = 0;
 };
 
 class sphere : public object {
@@ -24,7 +24,7 @@ class sphere : public object {
 
     sphere(vec3, double);
 
-    [[nodiscard]] bool hit(const ray &r, interval scope, hit_record &record) const override;
+    [[nodiscard]] bool hit(const ray &r, double ray_tmin, double ray_tmax, hit_record &record) const override;
 
 private:
     vec3 m_center{0, 0, 0};
diff --git a/week02/raytracer/include/ray.h b/week02/raytracer/include/ray.h
index cbf424e..af96859 100644
--- a/week02/raytracer/include/ray.h
+++ b/week02/raytracer/include/ray.h
@@ -2,16 +2,12 @@
 // Created by stg05 on 28.09.2024.
 //
 
-#define COMP_PRECISION 0.00001
-
 #include "color.h"
-#include <limits>
 
 #ifndef MAIN_RAY_H
 #define MAIN_RAY_H
 
-class ray
-{
+class ray {
 public:
     ray() = default;
 
@@ -29,8 +25,7 @@ class ray
     vec3 m_pivot{0, 0, 0}, m_dir{0, 0, 0};
 };
 
-class hit_record
-{
+class hit_record {
 public:
     hit_record() = default;
 
@@ -45,18 +40,4 @@ class hit_record
     bool m_front_face = false;
 };
 
-class interval
-{
-public:
-    static const double inline INF = std::numeric_limits<double>::infinity();
-
-private:
-    double m_min, m_max;
-
-public:
-    interval() = default;
-    interval(double, double);
-    bool operator()(double);
-};
-
-#endif // MAIN_RAY_H
\ No newline at end of file
+#endif //MAIN_RAY_H
\ No newline at end of file
diff --git a/week02/raytracer/main.cpp b/week02/raytracer/main.cpp
index 2bb2b15..938fe35 100644
--- a/week02/raytracer/main.cpp
+++ b/week02/raytracer/main.cpp
@@ -8,11 +8,8 @@ int main()
     scene s;
     sphere sph{10, 0, 0, 2};
     sphere sph2{0, 0, -10, 2};
-    sphere sph3{0, -100, 0, 99};
     s.objects.push_front(&sph);
     s.objects.push_front(&sph2);
-    s.objects.push_front(&sph3);
-
     for (double i = 5.0; i > 0.5; i /= 1.05)
     {
         s.v = viewport{vec3{1, 0, 0} * i};
diff --git a/week02/raytracer/src/object.cpp b/week02/raytracer/src/object.cpp
index 0fd3aa9..119e82c 100644
--- a/week02/raytracer/src/object.cpp
+++ b/week02/raytracer/src/object.cpp
@@ -10,27 +10,23 @@ sphere::sphere(double x, double y, double z, double r) : object(), m_center{x, y
 
 sphere::sphere(vec3 center, double r) : object(), m_center{center}, m_r{r} {}
 
-bool sphere::hit(const ray &r, interval scope, hit_record &record) const
-{
+bool sphere::hit(const ray &r, double ray_tmin, double ray_tmax, hit_record &record) const {
     vec3 delta = m_center - r.get_pivot();
     vec3 dir = r.get_dir();
     vec3 proj = (delta * dir.e()) * (dir.e());
     vec3 delta_per = delta - proj;
     bool result = (double(delta_per) < m_r);
-    if (!result)
-    {
+    if (!result) {
         return false;
     }
     double offset_from_center = std::sqrt(m_r * m_r - delta_per.length_squared());
     vec3 intersection = proj - offset_from_center * dir.e();
-    if (!scope(double(intersection)) || (intersection * dir < 0))
-    {
+    if ((double(intersection) > ray_tmax) || (double(intersection) < ray_tmin)) {
         return false;
-    }
-    else
-    {
+    } else {
         vec3 normal_vec = (intersection - m_center).e();
         record.set_face_normal(r, normal_vec);
         return true;
     }
 }
+
diff --git a/week02/raytracer/src/ray.cpp b/week02/raytracer/src/ray.cpp
index c739fb8..a55094f 100644
--- a/week02/raytracer/src/ray.cpp
+++ b/week02/raytracer/src/ray.cpp
@@ -4,6 +4,7 @@
 
 #include "../include/ray.h"
 
+
 ray::ray(vec3 pivot, vec3 dir) : m_dir{dir}, m_pivot{pivot} {}
 
 vec3 ray::at(double t) { return vec3{m_pivot + m_dir * t}; }
@@ -14,24 +15,11 @@ vec3 ray::get_dir() const { return m_dir; }
 
 ray::ray(vec3 dir) : m_dir{dir} {}
 
-void hit_record::set_face_normal(const ray &r, const vec3 &outward_normal)
-{
+void hit_record::set_face_normal(const ray &r, const vec3 &outward_normal) {
     m_normal = outward_normal;
     m_front_face = r.get_dir() * outward_normal < 0;
 }
 
-vec3 hit_record::normal() const
-{
+vec3 hit_record::normal() const {
     return m_normal;
 }
-
-interval::interval(double min, double max)
-{
-    this->m_min = min;
-    this->m_max = max;
-}
-
-bool interval::operator()(double x)
-{
-    return (x > m_min - COMP_PRECISION) && (x < m_max + COMP_PRECISION);
-}
\ No newline at end of file
diff --git a/week02/raytracer/src/transformations.cpp b/week02/raytracer/src/transformations.cpp
index 170e9df..e39a9c7 100644
--- a/week02/raytracer/src/transformations.cpp
+++ b/week02/raytracer/src/transformations.cpp
@@ -43,7 +43,7 @@ color color2bw(const color &param) {
 color ray_color(const ray &r, const scene &s) {
     hit_record hr{};
     for(const auto* iter : s.objects){
-        if (iter->hit(r, interval{0, 10000}, hr)) {
+        if (iter->hit(r, 0, 10000.0, hr)) {
             return color{.5, .5, .5} + 0.5*hr.normal();
         }
     }
diff --git a/week02/raytracer/src/utils.cpp b/week02/raytracer/src/utils.cpp
index 502cfa1..ae7837a 100644
--- a/week02/raytracer/src/utils.cpp
+++ b/week02/raytracer/src/utils.cpp
@@ -25,13 +25,12 @@ void write_color(std::ostream &out, const color &pixel_color) {
 }
 
 sequence_renderer::sequence_renderer() {
-    //std::string command = "cd " + path + "&& rm *.* /q /s";
-    std::string command = "find ./out/ -type f -name 'f*' -delete";
+    std::string command = "cd " + path + "&& del *.* /q /s";
     system(command.c_str());
 }
 
 void sequence_renderer::render_frame(const scene &s) const {
-    std::string file_path("./out/f" + std::to_string(frame_counter) + ".ppm");
+    std::string file_path(path + "\\f" + std::to_string(frame_counter) + ".ppm");
     frame_counter++;
     std::ofstream os(file_path);
     write_image(os, s);