Reformat file structure

drohmer · Dec 31, 2023 · 632ab50 · 632ab50
1 parent 1a8f18b
commit 632ab50
Show file tree

Hide file tree

Showing 247 changed files with 482 additions and 276 deletions.
diff --git a/examples/00_empty_3D_scene/CMakeLists.txt b/examples/00_empty_3D_scene/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/01_transparent_billboards/CMakeLists.txt b/examples/01_transparent_billboards/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/02_marching_cubes/01_marching_cube_simple/CMakeLists.txt b/examples/02_marching_cubes/01_marching_cube_simple/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/02_marching_cubes/02_marching_cube_dynamic/CMakeLists.txt b/examples/02_marching_cubes/02_marching_cube_dynamic/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/03_shaders/01_deformation/CMakeLists.txt b/examples/03_shaders/01_deformation/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/03_shaders/02_multi_texture/CMakeLists.txt b/examples/03_shaders/02_multi_texture/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/04_sketch/02_2d_curve/CMakeLists.txt b/examples/04_sketch/02_2d_curve/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/05_environment_map/01_skybox/CMakeLists.txt b/examples/05_environment_map/01_skybox/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/05_environment_map/02_environment_map/CMakeLists.txt b/examples/05_environment_map/02_environment_map/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/06_multipass/01_image_filter/CMakeLists.txt b/examples/06_multipass/01_image_filter/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/06_multipass/02_image_filter_basic_effects/CMakeLists.txt b/examples/06_multipass/02_image_filter_basic_effects/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/06_multipass/03_image_filters_chain/CMakeLists.txt b/examples/06_multipass/03_image_filters_chain/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/07_camera/01_camera_fly_mode/CMakeLists.txt b/examples/07_camera/01_camera_fly_mode/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/07_camera/02_camera_2d_displacement/CMakeLists.txt b/examples/07_camera/02_camera_2d_displacement/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/07_camera/03_multiple_cameras/CMakeLists.txt b/examples/07_camera/03_multiple_cameras/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/08_instancing/01_instancing_position/CMakeLists.txt b/examples/08_instancing/01_instancing_position/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/08_instancing/01_instancing_position/src/scene.cpp b/examples/08_instancing/01_instancing_position/src/scene.cpp
@@ -38,7 +38,7 @@ void scene_structure::initialize()
 
 	// Create two quads to display the blades of grass as impostors
 	mesh quad = mesh_primitive_quadrangle({ -0.5f,0.0f,0.0f }, { 0.5f,0.0f,0.0f }, { 0.5f,0.0f,1.0f }, { -0.5f,0.0f,1.0f });
-	mesh quad2 = quad; quad2.apply_rotation_to_position({ 0,0,1 }, Pi / 2.0f); // second quad is orthogonal to the first one
+	mesh quad2 = quad; quad2.rotate({ 0,0,1 }, Pi / 2.0f); // second quad is orthogonal to the first one
 	quad.push_back(quad2);
 	grass.initialize_data_on_gpu(quad);
 	grass.material.phong = { 1,0,0,1 };
@@ -53,7 +53,7 @@ void scene_structure::initialize()
 	// Add a per-instance vertex attribute for the position
 	numarray<vec3> instance_positions(N_instances);
 	for(int i=0; i< N_instances; ++i)
-		instance_positions[i] = { rand_interval(-L,L), rand_interval(-L,L), 0.f };
+		instance_positions[i] = { rand_uniform(-L,L), rand_uniform(-L,L), 0.f };
 	// Send these positions as a new buffer of data to the shader
 	grass.initialize_supplementary_data_on_gpu(instance_positions, /*location*/ 4, /*divisor: 1=per instance, 0=per vertex*/ 1);
 }

diff --git a/examples/08_instancing/02_instancing_procedural/CMakeLists.txt b/examples/08_instancing/02_instancing_procedural/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/08_instancing/02_instancing_procedural/src/scene.cpp b/examples/08_instancing/02_instancing_procedural/src/scene.cpp
@@ -46,7 +46,7 @@ void scene_structure::initialize()
 	// add a per-instance vertex attribute
 	numarray<vec3> instance_colors(gui.max_number_of_instances);
 	for(int i=0; i<instance_colors.size(); ++i)
-		instance_colors[i] = { rand_interval(), rand_interval(), 1.f };
+		instance_colors[i] = { rand_uniform(), rand_uniform(), 1.f };
 	grass.initialize_supplementary_data_on_gpu(instance_colors, /*location*/ 4, /*divisor: 1=per instance, 0=per vertex*/ 1);
 }
 

diff --git a/examples/09_mesh_loading/CMakeLists.txt b/examples/09_mesh_loading/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/example_compilation/CMakeLists.txt b/examples/example_compilation/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/test_cgp/CMakeLists.txt b/examples/test_cgp/CMakeLists.txt
@@ -48,6 +48,12 @@ add_definitions(-DSOLUTION)
 # Uncomment the following line to remove assertion checks from CGP library (for full efficiency)
 # add_definitions(-DCGP_NO_DEBUG)
 
+# Set the OpenGL Compatibility Version
+add_definitions(-DCGP_OPENGL_3_3)   # for OpenGL 3.3
+# add_definitions(-DCGP_OPENGL_4_1) # for OpenGL 4.1
+# add_definitions(-DCGP_OPENGL_4_3) # for OpenGL 4.3
+# add_definitions(-DCGP_OPENGL_4_6) # for OpenGL 4.6
+
 
 # Add all files to create executable
 #  @src_files: the local file for this project

diff --git a/examples/test_cgp/src/main.cpp b/examples/test_cgp/src/main.cpp
@@ -1,18 +1,18 @@
 
 // Automatically generated file using script update_test.py
-// Last generation on: 2023-04-26
+// Last generation on: 2023-12-31
 
 #include "cgp/cgp.hpp"
 #include <iostream> 
 
-#include "cgp/core/array/numarray/test/test_numarray.hpp"
-#include "cgp/core/array/numarray_stack/test/test_numarray_stack.hpp"
-#include "cgp/core/containers/grid/test/test_grid.hpp"
-#include "cgp/core/containers/grid_stack/grid_stack_2D/test/test_grid_stack_2D.hpp"
-#include "cgp/geometry/mat/test/test_matrix_stack.hpp"
-#include "cgp/geometry/mat/functions/test/test_vec_mat.hpp"
-#include "cgp/geometry/transform/rotation_transform/test/test_rotation.hpp"
-#include "cgp/graphics/camera/camera_controller/test/test_camera_controller.hpp"
+#include "cgp/09_geometric_transformation/rotation_transform/test/test_rotation.hpp"
+#include "cgp/04_grid_container/grid_stack/grid_stack_2D/test/test_grid_stack_2D.hpp"
+#include "cgp/04_grid_container/grid/test/test_grid.hpp"
+#include "cgp/02_numarray/numarray/test/test_numarray.hpp"
+#include "cgp/02_numarray/numarray_stack/test/test_numarray_stack.hpp"
+#include "cgp/19_camera_controller/test/test_camera_controller.hpp"
+#include "cgp/06_mat/test/test_matrix_stack.hpp"
+#include "cgp/06_mat/functions/test/test_vec_mat.hpp"
 
 
 using namespace cgp;
@@ -21,15 +21,15 @@ int main(int, char* argv[])
 {
 	std::cout << "Run " << argv[0] << std::endl;
 
-	cgp_test::test_numarray();
-	cgp_test::test_numarray_stack();
+	cgp_test::test_rotation();
+	cgp_test::test_grid_stack_2D();
 	cgp_test::test_grid_2D();
 	cgp_test::test_grid_3D();
-	cgp_test::test_grid_stack_2D();
+	cgp_test::test_numarray();
+	cgp_test::test_numarray_stack();
+	cgp_test::test_camera_controller();
 	cgp_test::test_matrix_stack();
 	cgp_test::test_vec_mat();
-	cgp_test::test_rotation();
-	cgp_test::test_camera_controller();
 
 
 	return 0;

diff --git a/library/cgp/core/base/base.hpp → library/cgp/01_base/base.hpp b/library/cgp/core/base/base.hpp → library/cgp/01_base/base.hpp
@@ -6,4 +6,4 @@
 #include "stl/stl.hpp"
 #include "types/types.hpp"
 #include "string/string.hpp"
-#include "rand/rand.hpp"
+
diff --git a/...cgp/core/base/basic_types/basic_types.cpp → ...y/cgp/01_base/basic_types/basic_types.cpp b/...cgp/core/base/basic_types/basic_types.cpp → ...y/cgp/01_base/basic_types/basic_types.cpp
diff --git a/...cgp/core/base/basic_types/basic_types.hpp → ...y/cgp/01_base/basic_types/basic_types.hpp b/...cgp/core/base/basic_types/basic_types.hpp → ...y/cgp/01_base/basic_types/basic_types.hpp
diff --git a/library/cgp/core/base/error/error.cpp → library/cgp/01_base/error/error.cpp b/library/cgp/core/base/error/error.cpp → library/cgp/01_base/error/error.cpp
diff --git a/library/cgp/core/base/error/error.hpp → library/cgp/01_base/error/error.hpp b/library/cgp/core/base/error/error.hpp → library/cgp/01_base/error/error.hpp
diff --git a/library/cgp/core/base/stl/stl.hpp → library/cgp/01_base/stl/stl.hpp b/library/cgp/core/base/stl/stl.hpp → library/cgp/01_base/stl/stl.hpp
diff --git a/library/cgp/core/base/string/string.cpp → library/cgp/01_base/string/string.cpp b/library/cgp/core/base/string/string.cpp → library/cgp/01_base/string/string.cpp
diff --git a/library/cgp/core/base/string/string.hpp → library/cgp/01_base/string/string.hpp b/library/cgp/core/base/string/string.hpp → library/cgp/01_base/string/string.hpp
diff --git a/library/cgp/core/base/types/types.hpp → library/cgp/01_base/types/types.hpp b/library/cgp/core/base/types/types.hpp → library/cgp/01_base/types/types.hpp
diff --git a/library/cgp/core/array/array.hpp → library/cgp/02_numarray/numarray.hpp b/library/cgp/core/array/array.hpp → library/cgp/02_numarray/numarray.hpp
diff --git a/library/cgp/core/array/numarray/numarray.hpp → ...ary/cgp/02_numarray/numarray/numarray.hpp b/library/cgp/core/array/numarray/numarray.hpp → ...ary/cgp/02_numarray/numarray/numarray.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cgp/core/base/base.hpp"
+#include "cgp/01_base/base.hpp"
 
 #include <vector>
 #include <iostream>

diff --git a/...ore/array/numarray/test/test_numarray.cpp → ..._numarray/numarray/test/test_numarray.cpp b/...ore/array/numarray/test/test_numarray.cpp → ..._numarray/numarray/test/test_numarray.cpp
@@ -1,4 +1,4 @@
-#include "cgp/core/array/array.hpp"
+#include "cgp/02_numarray/numarray.hpp"
 
 #if defined(__linux__) || defined(__EMSCRIPTEN__)
 #pragma GCC diagnostic ignored "-Wunused-variable"

diff --git a/...ore/array/numarray/test/test_numarray.hpp → ..._numarray/numarray/test/test_numarray.hpp b/...ore/array/numarray/test/test_numarray.hpp → ..._numarray/numarray/test/test_numarray.hpp
diff --git a/...y_stack/implementation/numarray_stack.hpp → ...y_stack/implementation/numarray_stack.hpp b/...y_stack/implementation/numarray_stack.hpp → ...y_stack/implementation/numarray_stack.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cgp/core/base/base.hpp"
+#include "cgp/01_base/base.hpp"
 #include <array>
 #include <cmath>
 

diff --git a/..._stack/implementation/numarray_stack2.hpp → ..._stack/implementation/numarray_stack2.hpp b/..._stack/implementation/numarray_stack2.hpp → ..._stack/implementation/numarray_stack2.hpp
diff --git a/..._stack/implementation/numarray_stack3.hpp → ..._stack/implementation/numarray_stack3.hpp b/..._stack/implementation/numarray_stack3.hpp → ..._stack/implementation/numarray_stack3.hpp
diff --git a/..._stack/implementation/numarray_stack4.hpp → ..._stack/implementation/numarray_stack4.hpp b/..._stack/implementation/numarray_stack4.hpp → ..._stack/implementation/numarray_stack4.hpp
diff --git a/...e/array/numarray_stack/numarray_stack.hpp → ...umarray/numarray_stack/numarray_stack.hpp b/...e/array/numarray_stack/numarray_stack.hpp → ...umarray/numarray_stack/numarray_stack.hpp
diff --git a/...ray/numarray_stack/numarray_stack_fwd.hpp → ...ray/numarray_stack/numarray_stack_fwd.hpp b/...ray/numarray_stack/numarray_stack_fwd.hpp → ...ray/numarray_stack/numarray_stack_fwd.hpp
diff --git a/...ray_stack/special_types/special_types.cpp → ...ray_stack/special_types/special_types.cpp b/...ray_stack/special_types/special_types.cpp → ...ray_stack/special_types/special_types.cpp
@@ -1,5 +1,5 @@
 
-#include "cgp/core/base/base.hpp"
+#include "cgp/01_base/base.hpp"
 #include "special_types.hpp"
 
 

diff --git a/...ray_stack/special_types/special_types.hpp → ...ray_stack/special_types/special_types.hpp b/...ray_stack/special_types/special_types.hpp → ...ray_stack/special_types/special_types.hpp
@@ -25,7 +25,7 @@ namespace cgp
     using uint4 = numarray_stack4<unsigned int>;
 
     using vec2 = numarray_stack2<float>;
-    //using vec3 = numarray_stack3<float>;
+    using vec3 = numarray_stack3<float>;
     using vec4 = numarray_stack4<float>;
 
 

diff --git a/...marray_stack/test/test_numarray_stack.cpp → ...marray_stack/test/test_numarray_stack.cpp b/...marray_stack/test/test_numarray_stack.cpp → ...marray_stack/test/test_numarray_stack.cpp
@@ -1,5 +1,5 @@
-#include "cgp/core/base/base.hpp"
-#include "cgp/geometry/vec/vec.hpp"
+#include "cgp/01_base/base.hpp"
+#include "cgp/05_vec/vec.hpp"
 
 
 #include <iostream>

diff --git a/...marray_stack/test/test_numarray_stack.hpp → ...marray_stack/test/test_numarray_stack.hpp b/...marray_stack/test/test_numarray_stack.hpp → ...marray_stack/test/test_numarray_stack.hpp
diff --git a/library/cgp/core/files/files.cpp → library/cgp/03_files/files.cpp b/library/cgp/core/files/files.cpp → library/cgp/03_files/files.cpp
@@ -1,6 +1,6 @@
 #include "files.hpp"
 
-#include "cgp/core/base/base.hpp"
+#include "cgp/01_base/base.hpp"
 
 #include <fstream>
 #include <iostream>