From aa02ff3faa4b17dcdd3051091958b85fde351de8 Mon Sep 17 00:00:00 2001
From: Karl-Wilfried Zimmer <zimmerk4@students.uni-marburg.de>
Date: Sun, 7 Jul 2024 20:42:39 +0200
Subject: [PATCH] added vector3 to project

---
 .idea/vcs.xml            |  7 +++++
 CMakeLists.txt           | 10 +++----
 apps/CMakeLists.txt      |  2 +-
 apps/main.cpp            | 21 ++-----------
 include/Block/block.h    | 10 +++++--
 include/Vector/vector3.h | 65 ++++++++++++++++++++++++++++++++++++++++
 src/CMakeLists.txt       |  7 +++--
 src/block.cpp            |  2 +-
 src/vector3.cpp          | 45 ++++++++++++++++++++++++++++
 9 files changed, 138 insertions(+), 31 deletions(-)
 create mode 100644 .idea/vcs.xml
 create mode 100644 include/Vector/vector3.h
 create mode 100644 src/vector3.cpp

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..e014f95
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/cmake-build-debug/_deps/vector-src" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31a8c80..666fc8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,11 +21,11 @@ include(FetchContent)
 
 # Formatting library, adds fmt::fmt Always use the full git hash, not the tag,
 # safer and faster to recompile
-FetchContent_Declare(
-  vector
-  GIT_REPOSITORY https://concreteserver.ddns.net/gitea/CarboHydra/Vector.git
-  GIT_TAG main)
-FetchContent_MakeAvailable(vector)
+#FetchContent_Declare(
+#  vector
+#  GIT_REPOSITORY https://concreteserver.ddns.net/gitea/CarboHydra/Vector.git
+#  GIT_TAG main)
+#FetchContent_MakeAvailable(vector)
 
 add_subdirectory(${PROJECT_SOURCE_DIR}/src)
 
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 5945e25..e277ec2 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_executable(app main.cpp)
 
-target_link_libraries(app PRIVATE vector)
+target_link_libraries(app PRIVATE block vector)
diff --git a/apps/main.cpp b/apps/main.cpp
index 4512149..90111fa 100644
--- a/apps/main.cpp
+++ b/apps/main.cpp
@@ -1,25 +1,8 @@
 #include <iostream>
-#include "Vector/vector3.h"
+#include "Block/block.h"
 
 int main(int argc, char **argv) {
     std::cout << "Hello, world!" << std::endl;
-    Vector::Vector3 vec(1,2,3);
-    Vector::Vector3 vec2(2,1,3);
-    std::cout<<vec<<std::endl;
-    std::cout<<vec.len()<<std::endl;
-    vec*=2;
-    std::cout<<vec<<std::endl;
-    std::cout<<vec.len()<<std::endl;
-    vec/=2;
-    std::cout<<vec<<std::endl;
-    std::cout<<vec.len()<<std::endl;
-    std::cout<<vec.dot(vec)<<std::endl;
-    std::cout<<vec.cross(vec2)<<std::endl;
-    vec.norm();
-    std::cout<<vec<<std::endl;
-    std::cout<<vec.len()<<std::endl;
-    vec-=vec;
-    std::cout<<vec<<std::endl;
-    std::cout<<vec.len()<<std::endl;
+    Volumes::Block block;
     return 0;
 }
diff --git a/include/Block/block.h b/include/Block/block.h
index aaa185f..ef33142 100644
--- a/include/Block/block.h
+++ b/include/Block/block.h
@@ -5,9 +5,15 @@
 #ifndef BLOCK_BLOCK_H
 #define BLOCK_BLOCK_H
 
-namespace Volumes{
-    class block{
+#include <Vector/vector3.h>
 
+namespace Volumes{
+    class Block{
+    public:
+        virtual ~Block() = default;
+
+    private:
+        Vector::Vector3 corners[8];
     };
 }
 
diff --git a/include/Vector/vector3.h b/include/Vector/vector3.h
new file mode 100644
index 0000000..4484d62
--- /dev/null
+++ b/include/Vector/vector3.h
@@ -0,0 +1,65 @@
+//
+// Created by nb on 07.07.24.
+//
+
+#ifndef VECTOR_VECTOR3_H
+#define VECTOR_VECTOR3_H
+
+#include "iostream"
+#include <cmath>
+
+namespace Vector{
+    class Vector3{
+    public:
+        Vector3(double x,double y, double z):x(x),y(y),z(z){};
+        Vector3(): Vector3(0,0,0){};
+
+        virtual ~Vector3() = default;
+
+        Vector3 operator+(const Vector3& v) const;
+
+        Vector3 operator-(const Vector3& v) const{
+            Vector3 tmp=v*-1;
+            return *this+tmp;
+        };
+
+        Vector3 operator*(double s) const;
+
+        Vector3 operator/(double s) const{
+            return *this*(1/s);
+        };
+
+        Vector3& operator*=(double s);
+
+        Vector3& operator/=(double s){
+            return *this*=(1/s);
+        };
+
+        Vector3& operator+=(const Vector3& v);
+
+        Vector3& operator-=(const Vector3& v);
+
+        Vector3& operator=(const Vector3& v);
+
+
+
+        Vector3& norm();
+
+        double dot(const Vector3& v) const;
+
+        double len() const;
+
+        Vector3 cross(const Vector3& v) const;
+
+        friend std::ostream& operator<<(std::ostream& os, const Vector3& v){
+            os<<"{"<<v.x<<", "<<v.y<<", "<<v.z<<"}";
+            return os;
+        }
+
+    private:
+        double x,y,z;
+    };
+
+}
+
+#endif //VECTOR_VECTOR3_H
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bde40e9..869c69e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,9 @@
-file(GLOB HEADER_LIST CONFIGURE_DEPENDS "${PROJECT_SOURCE_DIR}/include/Block/*.hpp")
+file(GLOB HEADER_LIST CONFIGURE_DEPENDS "${PROJECT_SOURCE_DIR}/include/Block/*")
 
-add_library(block block.cpp ${HEADER_LIST})
+add_library(block block.cpp vector3.cpp ${HEADER_LIST})
+add_library(block::block ALIAS block)
 
-target_link_libraries(block PRIVATE vector)
+target_link_libraries(block PUBLIC vector::vector)
 
 target_include_directories(block PUBLIC "${PROJECT_SOURCE_DIR}/include")
 
diff --git a/src/block.cpp b/src/block.cpp
index b3ccd26..be1327b 100644
--- a/src/block.cpp
+++ b/src/block.cpp
@@ -1,4 +1,4 @@
 //
 // Created by nb on 07.07.24.
 //
-#include "Block/block.h"
\ No newline at end of file
+#include "Block/block.h"
diff --git a/src/vector3.cpp b/src/vector3.cpp
new file mode 100644
index 0000000..7b7b7b1
--- /dev/null
+++ b/src/vector3.cpp
@@ -0,0 +1,45 @@
+#include "Vector/vector3.h"
+
+namespace Vector{
+    Vector3 Vector3::operator+(const Vector::Vector3 &v) const {
+        return {x+v.x,y+v.y,z+v.z};
+    }
+
+    Vector3& Vector3::operator=(const Vector::Vector3 &v) = default;
+
+    Vector3& Vector3::operator+=(const Vector::Vector3 &v) {
+        *this=*this+v;
+        return *this;
+    }
+
+    double Vector3::dot(const Vector::Vector3 &v) const {
+        return x*v.x+y*v.y+z*v.z;
+    }
+
+    Vector3 Vector3::cross(const Vector::Vector3& v) const {
+        return {y*v.z-v.y*z,z*v.x-v.z*x,x*v.y-v.x*y};
+    }
+
+    double Vector3::len() const {
+        return std::sqrt(x*x+y*y+z*z);
+    }
+
+    Vector3 Vector3::operator*(double s) const {
+        return {x*s, y*s, z*s};
+    }
+
+    Vector3& Vector3::operator*=(double s) {
+        *this=*this*s;
+        return *this;
+    }
+
+    Vector3 &Vector3::operator-=(const Vector::Vector3 &v) {
+        *this=*this-v;
+        return *this;
+    }
+
+    Vector3 &Vector3::norm() {
+        *this=*this/=this->len();
+        return *this;
+    }
+}
\ No newline at end of file