tried making naming more uniform and implemented most of the opengl managers

CMakeLists.txt

@@ -11,13 +11,13 @@ add_executable(z3d main.cpp
         include/assets/components/material_components.hpp
         include/assets/components/point_cloud_vertex_components.hpp
         include/assets/components/mesh_vertex_components.hpp
-        include/assets/dynamic_read_buffers/dynamic_material_buffer.hpp
-        include/assets/dynamic_read_buffers/dynamic_mesh_buffer.hpp
-        include/assets/dynamic_read_buffers/dynamic_point_cloud_buffer.hpp
-        include/assets/data_loaders/kitti_loader.hpp
-        include/assets/data_loaders/obj_loader.hpp
-        include/assets/data_loaders/stl_loader.hpp
-        include/assets/data_loaders/uos_loader.hpp
+        include/assets/data/material_data.hpp
+        include/assets/data/mesh_data.hpp
+        include/assets/data/point_cloud_data.hpp
+        include/assets/file_parsers/kitti_loader.hpp
+        include/assets/file_parsers/obj_loader.hpp
+        include/assets/file_parsers/stl_loader.hpp
+        include/assets/file_parsers/uos_loader.hpp
         include/assets/components/mesh_vertex_components.hpp
         include/scene/camera.hpp
         include/scene/flying_camera.hpp
@@ -42,8 +42,8 @@ add_executable(z3d main.cpp
         include/util/string_indexer.hpp
         include/util/string_literal.hpp
         include/util/uix.hpp
-        source/assets/data_loaders/stl_loader.cpp
-        source/assets/data_loaders/obj_loader.cpp
+        source/assets/file_parsers/stl_loader.cpp
+        source/assets/file_parsers/obj_loader.cpp
         source/scene/flying_camera.cpp
         source/opengl/data/point_cloud_data.cpp
         source/opengl/handles/shader_program_handle.ipp
@@ -62,18 +62,18 @@ add_executable(z3d main.cpp
         include/opengl/shader_program_variable.hpp
         include/opengl/type_utils.hpp
         include/util/binary_ifstream.hpp
-        source/assets/data_loaders/kitti_loader.cpp
-        include/assets/data_loaders/generic/generic_3dtk_loader.hpp
-        include/assets/data_loaders/uosr_loader.hpp
-        include/assets/data_loaders/uos_normal_loader.hpp
-        include/assets/data_loaders/uos_rgb_loader.hpp
-        include/assets/dynamic_data_loaders/dynamic_mesh_loader.hpp
-        source/assets/dynamic_data_loaders/dynamic_mesh_loader.cpp
-        source/assets/dynamic_data_loaders/dynamic_mesh_loader.cpp
-        include/assets/dynamic_data_loaders/dynamic_point_cloud_loader.hpp
-        include/assets/dynamic_data_loaders/generic/base_dynamic_loader.hpp
-        source/assets/dynamic_data_loaders/generic/base_dynamic_loader.ipp
-        source/assets/dynamic_data_loaders/dynamic_point_cloud_loader.cpp
+        source/assets/file_parsers/kitti_loader.cpp
+        include/assets/file_parsers/generic/generic_3dtk_loader.hpp
+        include/assets/file_parsers/uosr_loader.hpp
+        include/assets/file_parsers/uos_normal_loader.hpp
+        include/assets/file_parsers/uos_rgb_loader.hpp
+        include/assets/data_loaders/mesh_loader.hpp
+        source/assets/data_loaders/mesh_loader.cpp
+        source/assets/data_loaders/mesh_loader.cpp
+        include/assets/data_loaders/point_cloud_loader.hpp
+        include/assets/data_loaders/generic/base_dynamic_loader.hpp
+        source/assets/data_loaders/generic/base_dynamic_loader.ipp
+        source/assets/data_loaders/point_cloud_loader.cpp
         include/opengl/handles/matrix_handles.hpp
         include/viewer/instance.hpp
         include/opengl/data/material_data.hpp
@@ -86,9 +86,9 @@ add_executable(z3d main.cpp
         source/viewer/instance.cpp
         include/viewer/asset_loader.hpp
         source/viewer/asset_loader.cpp
-        include/assets/data_loaders/glsl_loader.hpp
-        include/assets/dynamic_read_buffers/dynamic_shader_buffer.hpp
-        source/assets/data_loaders/glsl_loader.cpp
+        include/assets/file_parsers/glsl_loader.hpp
+        include/assets/data/shader_source_data.hpp
+        source/assets/file_parsers/glsl_loader.cpp
         include/viewer/settings.hpp
         include/opengl/data/shader_data.hpp
         source/opengl/data/shader_data.ipp
@@ -122,58 +122,49 @@ add_executable(z3d main.cpp
         include/geometry/normal_estimation.hpp
         include/assets/components/texture_components.hpp
         include/util/enum_bitfield_operators.hpp
-        include/assets/dynamic_read_buffers/dynamic_texture_buffer.hpp
-        source/assets/dynamic_read_buffers/dynamic_mesh_buffer.ipp
-        source/assets/dynamic_read_buffers/dynamic_material_buffer.ipp
-        include/assets/dynamic_read_buffers/generic/dynamic_vertex_buffer.hpp
-        source/assets/dynamic_read_buffers/dynamic_model_buffer.ipp
-        source/assets/dynamic_read_buffers/dynamic_texture_buffer.ipp
-        source/assets/dynamic_read_buffers/dynamic_point_cloud_buffer.ipp
-        include/assets/data_loaders/mtl_loader.hpp
-        include/assets/dynamic_data_loaders/dynamic_material_loader.hpp
+        include/assets/data/texture_data.hpp
+        source/assets/data/mesh_data.ipp
+        source/assets/data/material_data.ipp
+        include/assets/data/generic/vertex_array_data.hpp
+        source/assets/data/texture_data.ipp
+        source/assets/data/point_cloud_data.ipp
+        include/assets/file_parsers/mtl_loader.hpp
+        include/assets/data_loaders/material_loader.hpp
         include/util/id_type.hpp
-        include/assets/dynamic_data_stores/generic/generic_dynamic_store.hpp
-        source/assets/dynamic_data_stores/generic/generic_dynamic_store.ipp
-        include/assets/dynamic_data_stores/dynamic_material_store.hpp
-        include/assets/dynamic_data_stores/dynamic_mesh_store.hpp
-        include/assets/dynamic_data_stores/dynamic_point_cloud_store.hpp
+        include/assets/data_stores/generic/generic_basic_store.hpp
+        source/assets/data_stores/generic/generic_basic_store.ipp
+        include/assets/data_stores/material_store.hpp
+        include/assets/data_stores/mesh_store.hpp
+        include/assets/data_stores/point_cloud_store.hpp
         include/util/result.hpp
-        source/assets/data_loaders/mtl_loader.cpp
+        source/assets/file_parsers/mtl_loader.cpp
         include/util/line_parser.hpp
-        include/assets/dynamic_data_loaders/dynamic_texture_loader.hpp
-        source/assets/dynamic_data_loaders/dynamic_texture_loader.cpp
-        include/assets/dynamic_data_stores/dynamic_texture_store.hpp
+        include/assets/data_loaders/texture_loader.hpp
+        source/assets/data_loaders/texture_loader.cpp
+        include/assets/data_stores/texture_store.hpp
         include/opengl/data_managers/texture_manager.hpp
-        include/assets/dynamic_data_stores/dynamic_vertex_store.hpp
         include/assets/prefetch_lookups/mesh_prefetch_lookup.hpp
         include/assets/prefetch_lookups/point_cloud_prefetch_lookup.hpp
         include/assets/prefetch_lookups/material_prefetch_lookup.hpp
         include/assets/prefetch_lookups/texture_prefetch_lookup.hpp
         include/assets/prefetch_lookups/pose_prefetch_lookup.hpp
-        include/assets/dynamic_data_stores/dynamic_pose_store.hpp
-        include/assets/data_loaders/kitti_pose_loader.hpp
-        include/assets/data_loaders/threedtk_pose_loader.hpp
-        source/assets/data_loaders/threedtk_pose_loader.cpp
-        include/assets/dynamic_read_buffers/dynamic_pose_buffer.hpp
-        source/assets/data_loaders/kitti_pose_loader.cpp
+        include/assets/data_stores/pose_store.hpp
+        include/assets/file_parsers/kitti_pose_loader.hpp
+        include/assets/file_parsers/threedtk_pose_loader.hpp
+        source/assets/file_parsers/threedtk_pose_loader.cpp
+        include/assets/data/pose_data.hpp
+        source/assets/file_parsers/kitti_pose_loader.cpp
         include/assets/prefetch_queue.hpp
         include/util/string_list.hpp
-        include/assets/dynamic_data_stores/dynamic_material_library_store.hpp
-        include/assets/dynamic_data_stores/generic/generic_dynamic_component_store.hpp
-        source/assets/dynamic_data_stores/generic/generic_dynamic_component_store.ipp
-        source/assets/dynamic_data_stores/dynamic_material_store.cpp
-        include/assets/dynamic_data_stores/generic/generic_dynamic_component_array_store.hpp
-        source/assets/dynamic_data_stores/generic/generic_dynamic_component_array_store.ipp
-        source/assets/dynamic_data_stores/dynamic_mesh_store.cpp
-        include/assets/dynamic_data_stores/generic/generic_dynamic_indexed_component_array_store.hpp
-        source/assets/dynamic_data_stores/dynamic_point_cloud_store.cpp
-        include/assets/dynamic_read_buffers/dynamic_material_library_buffer.hpp
-        include/assets/dynamic_data_loaders/dynamic_material_library_loader.hpp
+        include/assets/data_stores/material_library_store.hpp
+        source/assets/data_stores/generic/generic_dynamic_component_array_store.ipp
+        include/assets/data/material_library_data.hpp
+        include/assets/data_loaders/material_library_loader.hpp
         include/assets/prefetch_lookups/material_library_prefetch_lookup.hpp
         include/assets/prefetch_lookups/shader_prefetch_lookup.hpp
-        include/assets/dynamic_data_stores/dynamic_shader_source_store.hpp
-        include/assets/data_loaders/generic/generic_3dtk_loader.hpp
-        source/assets/data_loaders/generic/generic_3dtk_loader.ipp
+        include/assets/data_stores/shader_source_store.hpp
+        include/assets/file_parsers/generic/generic_3dtk_loader.hpp
+        source/assets/file_parsers/generic/generic_3dtk_loader.ipp
         include/assets/prefetch_lookup.hpp
         source/assets/prefetch_lookups/pose_prefetch_lookup.cpp
         include/assets/dynamic_data_store.hpp
@@ -202,7 +193,6 @@ add_executable(z3d main.cpp
         include/util/reference_counter.hpp
         include/opengl/resource_management/resource_manager.hpp
         source/opengl/resource_management/resource_manager.ipp
-        include/opengl/data_managers/buffer_manager.hpp
         include/opengl/data_managers/shader_manager.hpp
         include/opengl/data_managers/mesh_vertex_buffer_manager.hpp
         source/opengl/data_managers/mesh_vertex_buffer_manager.cpp
@@ -215,13 +205,32 @@ add_executable(z3d main.cpp
         include/opengl/handles/index_buffer_handle.hpp
         source/opengl/handles/index_buffer_handle.ipp
         include/opengl/metadata/texture_metadata.hpp
-        include/opengl/metadata/vertex_buffer_metadata.hpp
+        include/opengl/vertex_buffer_utils.hpp
+        include/opengl/data_managers/mesh_index_buffer_manager.hpp
+        include/opengl/metadata/index_buffer_metadata.hpp
+        source/opengl/data_managers/mesh_index_buffer_manager.cpp
+        include/opengl/data_managers/point_cloud_vertex_buffer_manager.hpp
+        source/opengl/data_managers/point_cloud_vertex_buffer_manager.cpp
+        include/assets/data_views/mesh_view.hpp
+        include/assets/data_views/point_cloud_view.hpp
+        include/assets/data_views/shader_source_view.hpp
+        include/assets/data_stores/generic/generic_mesh_store.hpp
+        source/assets/data_stores/generic/generic_mesh_store.ipp
+        include/assets/data_stores/generic/generic_point_cloud_store.hpp
+        source/assets/data_stores/generic/generic_point_cloud_store.ipp
+        include/assets/data_views/material_view.hpp
+        include/assets/data_views/texture_view.hpp
+        include/assets/data_stores/generic/generic_material_store.hpp
+        source/assets/data_stores/generic/generic_material_store.ipp
+        source/assets/data_stores/shader_source_store.ipp
+        include/opengl/metadata/mesh_vertex_buffer_metadata.hpp
+        include/opengl/metadata/point_cloud_vertex_buffer_metadata.hpp
 )
 
 target_include_directories(z3d PRIVATE include)
 target_include_directories(z3d PRIVATE source) # for ipp headers
-target_include_directories(z3d PRIVATE libraries/include/glm)
-target_include_directories(z3d PRIVATE libraries/include/stb)
+
+add_subdirectory(libraries)
 
 find_package(GLEW REQUIRED)
 find_package(OpenGL REQUIRED)