template version

Author: GDBobby

Diff for: CMakeLists.txt

@@ -12,7 +12,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
   set(is_project_root ON)
 endif()
 
-option(NOIZ_BUILD_TESTS "Build noiz tests" ${is_project_root})
+#option(NOIZ_BUILD_TESTS "Build noiz tests" FALSE)#${is_project_root})
 option(NOIZ_BUILD_EXAMPLES "Build noiz examples" ${is_project_root})
 
 add_library(noiz-compile-options INTERFACE)
@@ -34,7 +34,7 @@ if(NOIZ_BUILD_EXAMPLES)
   add_subdirectory(examples)
 endif()
 
-if(NOIZ_BUILD_TESTS)
-  enable_testing()
-  add_subdirectory(tests)
-endif()
+#if(NOIZ_BUILD_TESTS)
+  #enable_testing()
+  #add_subdirectory(tests)
+#endif()

Diff for: examples/common/argument_parsing.hpp

@@ -1,6 +1,7 @@
 #include <charconv>
 #include <format>
 #include <iostream>
+#include <span>
 
 namespace {
 template <typename Type>

Diff for: examples/histogram/histogram.cpp

@@ -1,4 +1,4 @@
-#include <noiz/noise2.hpp>
+#include <noiz/noiseTemplate.hpp>
 #include <charconv>
 #include <filesystem>
 #include <format>
@@ -82,7 +82,7 @@ auto main(int argc, char** argv) -> int {
 	auto histogram = Histogram{};
 	for (int i = 0; i < config.count; ++i) {
 		// build point on line (y = 0)
-		auto const point = noiz::Vec2f{.x = static_cast<float>(i) * config.step};
+		const auto point = noiz::ConstructVector(static_cast<float>(i) * config.step, 0.0f);
 		// add noise at point
 		histogram.add(noise.at(point));
 	}

Diff for: examples/point-cloud/pointcloud.cpp

@@ -1,4 +1,4 @@
-#include <noiz/noise3.hpp>
+#include <noiz/noiseTemplate.hpp>
 #include <noiz/processing.hpp>
 
 #include <argument_parsing.hpp>
@@ -31,9 +31,10 @@ struct Config {
 		if (!args.args.empty()) {
 			return false;
 		}
-		grid_extent.x *= image_size_factor;
-		grid_extent.y *= image_size_factor;
-		grid_extent.z *= image_size_factor;
+
+		grid_extent.component[0] *= image_size_factor;
+		grid_extent.component[1] *= image_size_factor;
+		grid_extent.component[2] *= image_size_factor;
 		return true;
 	}
 };
@@ -69,7 +70,7 @@ class Point_Cloud {
                         } 
 #else //hybrid multi fractal noise
                         const float noise_value = noise_processor.hybrid_multi_fractal_processing(
-                                noiz::Vec3f{.x = static_cast<float>(x) * step, .y = static_cast<float>(y) * step, .z = static_cast<float>(z) * step}
+                                noiz::ConstructVector(static_cast<float>(x) * step, static_cast<float>(y) * step, static_cast<float>(z) * step)
                         );
                         if(noise_value > 2.0f){ //this should render a half of the points with hmf noise
 

Diff for: examples/texture2d/texture2d.cpp

@@ -1,4 +1,4 @@
-#include <noiz/noise2.hpp>
+#include <noiz/noiseTemplate.hpp>
 
 #include <argument_parsing.hpp>
 
@@ -36,8 +36,8 @@ struct Config {
 		if (!args.args.empty()) {
 			return false;
 		}
-		grid_extent.x = constant_base_resolution * image_size_factor;
-		grid_extent.y = constant_base_resolution * image_size_factor;
+		grid_extent.component[0] = constant_base_resolution * image_size_factor;
+		grid_extent.component[1] = constant_base_resolution * image_size_factor;
 		return true;
 	}
 };
@@ -55,7 +55,7 @@ class Texture_2D {
 			for (int y = 0; y < image_size; y++) {
 				for(int x = 0; x < image_size; x++) {
 				// add noise at point
-					float adjusted_noise = noise.at(noiz::Vec2f{.x = static_cast<float>(x) * step, .y = static_cast<float>(y) * step});
+					float adjusted_noise = noise.at(noiz::ConstructVector(static_cast<float>(x) * step, static_cast<float>(y) * step));
 					adjusted_noise = (adjusted_noise + 1.f) * 0.5f;
 					grayscale_color = static_cast<uint8_t>((adjusted_noise) * 255.f);
 					for(int i = 0; i < 3; i++) {

Diff for: noiz/CMakeLists.txt

@@ -4,33 +4,15 @@ add_library(${PROJECT_NAME} INTERFACE)
 add_library(noiz::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 target_sources(${PROJECT_NAME} PUBLIC FILE_SET HEADERS BASE_DIRS include FILES
-  include/noiz/detail/data2.hpp
-  include/noiz/detail/generator.hpp
-  include/noiz/detail/grid2.hpp
-
-  include/noiz/cell2.hpp
-  include/noiz/index2.hpp
-  include/noiz/noise2.hpp
-  include/noiz/seed.hpp
-  include/noiz/vec2.hpp
-
-
-  include/noiz/detail/data3.hpp
-  include/noiz/detail/grid3.hpp
-
-  include/noiz/cell3.hpp
-  include/noiz/index3.hpp
-  include/noiz/noise3.hpp
-  include/noiz/vec3.hpp
-
-
-  include/noiz/detail/data4.hpp
-  include/noiz/detail/grid4.hpp
-
-  include/noiz/cell4.hpp
-  include/noiz/index4.hpp
-  include/noiz/noise4.hpp
-  include/noiz/vec4.hpp
+    include/noiz/detail/dataTemplate.hpp
+    include/noiz/detail/generator.hpp
+    include/noiz/detail/gridTemplate.hpp
+
+    include/noiz/cellTemplate.hpp
+    include/noiz/indexTemplate.hpp
+    include/noiz/noiseTemplate.hpp
+    include/noiz/seed.hpp
+    include/noiz/vecTemplate.hpp
   )
 
 target_include_directories(${PROJECT_NAME} INTERFACE

Diff for: noiz/include/noiz/cell2.hpp

@@ -0,0 +1,29 @@
+#pragma once
+#include <array>
+#include "indexTemplate.hpp"
+#include "vecTemplate.hpp"
+
+namespace noiz {
+template <std::floating_point Type, std::size_t N>
+struct CornerData {
+	Vec<Type, N> location{};
+	Vec<Type, N> gradient{};
+};
+
+template <typename Type, std::size_t N>
+struct TCell {
+	std::array<Type, (1 << N)> corners{};
+};
+
+template <std::floating_point Type>
+using Cell2 = TCell<Vec<Type, 2>, 2>;
+template <std::floating_point Type>
+using Cell3 = TCell<Vec<Type, 3>, 3>;
+template <std::floating_point Type>
+using Cell4 = TCell<Vec<Type, 4>, 4>;
+template <std::floating_point Type, std::size_t N>
+using Cell = TCell<Vec<Type, N>, N>;
+
+template <std::floating_point Type, std::size_t N>
+using CornerCell = TCell<CornerData<Type, N>, N>;
+} // namespace noiz