Merge pull request #5 from TakanoTaiga/code_refactoring

Code refactoring

Author: takanotaiga

.github/workflows/c-cpp.yml

@@ -14,4 +14,4 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: build
-      run: g++ -std=c++11 -O2 ./*.cpp
+      run: g++ -std=c++17 -O2 ./*.cpp

.vscode/settings.json

@@ -1,5 +1,81 @@
 {
     "files.associations": {
-        "chrono": "cpp"
+        "chrono": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "strstream": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
+        "bitset": "cpp",
+        "cfenv": "cpp",
+        "cinttypes": "cpp",
+        "compare": "cpp",
+        "complex": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "cstdint": "cpp",
+        "deque": "cpp",
+        "forward_list": "cpp",
+        "list": "cpp",
+        "map": "cpp",
+        "set": "cpp",
+        "string": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "hash_map": "cpp",
+        "hash_set": "cpp",
+        "slist": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "numbers": "cpp",
+        "ostream": "cpp",
+        "semaphore": "cpp",
+        "shared_mutex": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "thread": "cpp",
+        "typeindex": "cpp",
+        "typeinfo": "cpp",
+        "variant": "cpp",
+        "csignal": "cpp",
+        "any": "cpp",
+        "codecvt": "cpp",
+        "future": "cpp"
     }
 }

matrixutil.hpp

@@ -0,0 +1,70 @@
+// Copyright 2024 Taiga Takano
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef NDTCPP_MATRIX_UTIL_HPP_
+#define NDTCPP_MATRIX_UTIL_HPP_
+
+#include "type.hpp"
+
+namespace ndtcpp
+{
+    auto operator*(const mat3x3& mat1, const mat3x3& mat2)
+    {
+        mat3x3 result;
+        result.a = mat1.a * mat2.a + mat1.b * mat2.d + mat1.c * mat2.g;
+        result.b = mat1.a * mat2.b + mat1.b * mat2.e + mat1.c * mat2.h;
+        result.c = mat1.a * mat2.c + mat1.b * mat2.f + mat1.c * mat2.i;
+
+        result.d = mat1.d * mat2.a + mat1.e * mat2.d + mat1.f * mat2.g;
+        result.e = mat1.d * mat2.b + mat1.e * mat2.e + mat1.f * mat2.h;
+        result.f = mat1.d * mat2.c + mat1.e * mat2.f + mat1.f * mat2.i;
+
+        result.g = mat1.g * mat2.a + mat1.h * mat2.d + mat1.i * mat2.g;
+        result.h = mat1.g * mat2.b + mat1.h * mat2.e + mat1.i * mat2.h;
+        result.i = mat1.g * mat2.c + mat1.h * mat2.f + mat1.i * mat2.i;
+        return result;
+    }
+
+    auto operator*(const mat3x3& mat, const point3& vec)
+    {
+        point3 result;
+        result.x = mat.a * vec.x + mat.b * vec.y + mat.c * vec.z;
+        result.y = mat.d * vec.x + mat.e * vec.y + mat.f * vec.z;
+        result.z = mat.g * vec.x + mat.h * vec.y + mat.i * vec.z;
+        return result;
+    }
+
+    auto operator+=(mat3x3& mat1, const mat3x3& mat2)
+    {
+        mat1.a += mat2.a;
+        mat1.b += mat2.b;
+        mat1.c += mat2.c;
+
+        mat1.d += mat2.d;
+        mat1.e += mat2.e;
+        mat1.f += mat2.f;
+
+        mat1.g += mat2.g;
+        mat1.h += mat2.h;
+        mat1.i += mat2.i;
+    }
+
+    auto operator+=(ndtcpp::point3& point1, const ndtcpp::point3& point2){
+        point1.x += point2.x;
+        point1.y += point2.y;
+        point1.z += point2.z;
+    }
+} // namespace ndtcpp
+
+#endif // NDTCPP_MATRIX_UTIL_HPP_