zy4n/Z3D
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ZY4N
2025-03-25 02:22:44 +01:00
parent c609d49f0d
commit 71ea2d9237
155 changed files with 4097 additions and 2434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/assets/data_loaders/generic/base_dynamic_loader.hpp Normal file
View File

@@ -0,0 +1,42 @@
#pragma once
#include <optional>
#include <tuple>
#include "../../data_stores"
#include "util/uix.hpp"
#include "util/string_lookup.hpp"
#include "util/id_type.hpp"
#include "util/result.hpp"
template<typename C, class... Loaders>
class base_dynamic_loader
{
public:
using loader_id_type = ztu::id_type_for<base_dynamic_loader, ztu::u32>;
explicit base_dynamic_loader(C enabled_components);
[[nodiscard]] std::optional<loader_id_type> find_loader(std::string_view name);
[[nodiscard]] static consteval std::optional<loader_id_type> find_loader_static(std::string_view name);
template<loader_id_type ID>
auto& get_loader();
protected:
// TODO this seems like I modified this to something that does not make sense
template<typename F>
ztu::result<dynamic_point_cloud_store::id_type> invoke_with_matching_loader(loader_id_type loader_id, F&& f);
std::tuple<Loaders...> m_loaders{};
ztu::string_lookup<loader_id_type> m_loader_id_lookup{};
C m_enabled_components{ 0 };
};
#define INCLUDE_BASE_DYNAMIC_LOADER_IMPLEMENTATION
#include "../../data_loaders"
#undef INCLUDE_BASE_DYNAMIC_LOADER_IMPLEMENTATION

58
include/assets/data_loaders/generic/generic_3dtk_loader.hpp
View File

@@ -1,58 +0,0 @@
#pragma once
#include <filesystem>
#include <charconv>
#include <string_view>
#include "glm/mat4x4.hpp"
#include "util/result.hpp"
#include "util/string_list.hpp"
#include "assets/prefetch_queue.hpp"
#include "assets/dynamic_read_buffers/dynamic_point_cloud_buffer.hpp"
#include "assets/dynamic_data_stores/dynamic_point_cloud_store.hpp"
#include "assets/prefetch_lookup.hpp"
template<bool Normal, bool Color, bool Reflectance>
struct generic_3dtk_loader
{
[[nodiscard]] static std::error_code prefetch(
const ztu::string_list& filenames,
prefetch_queue& queue
);
[[nodiscard]] static std::error_code load(
dynamic_point_cloud_buffer& buffer,
const file_dir_list& paths,
dynamic_point_cloud_store& store,
prefetch_lookup& id_lookup,
bool pedantic = false
);
protected:
[[nodiscard]] static ztu::result<pose_prefetch_lookup::index_type> parse_index(
std::string_view filename
);
ztu::result<std::pair<ztu::u32, std::chars_format>> analyze_component_format(
std::string_view line
);
void transform_point_cloud(
std::span<components::point_cloud_vertex::position::value_type> points,
const glm::mat4& pose
);
private:
std::error_code read_point_file(
const std::filesystem::path& filename,
dynamic_point_cloud_buffer& point_cloud
);
};
#define INCLUDE_GENERIC_3DTK_LOADER_IMPLEMENTATION
#include "assets/data_loaders/generic/generic_3dtk_loader.ipp"
#undef INCLUDE_GENERIC_3DTK_LOADER_IMPLEMENTATION

30
include/assets/data_loaders/glsl_loader.hpp
View File

@@ -1,30 +0,0 @@
#pragma once
#include <filesystem>
#include <vector>
#include <string>
#include "assets/dynamic_data_store.hpp"
#include "assets/prefetch_lookup.hpp"
#include "assets/prefetch_queue.hpp"
#include "assets/prefetch_lookups/mesh_prefetch_lookup.hpp"
#include "assets/dynamic_read_buffers/dynamic_shader_buffer.hpp"
#include "util/string_list.hpp"
struct glsl_loader
{
static constexpr auto name = std::string_view("glsl");
[[nodiscard]] static std::error_code prefetch(
const file_dir_list& paths,
prefetch_queue& queue
);
[[nodiscard]] static std::error_code load(
dynamic_shader_buffer& buffer,
const file_dir_list& paths,
prefetch_lookup& id_lookup,
dynamic_shader_source_store& store,
bool pedantic = false
);
};

19
include/assets/data_loaders/interface.txt
View File

@@ -1,19 +0,0 @@
struct X {
[[nodiscard]] static std::error_code prefetch(
const file_dir_list& paths,
prefetch_queue& queue
);
[[nodiscard]] static std::error_code load(
// space stuff that has to persist
dynamic_X_buffer& buffer,
const file_dir_list& paths,
dynamic_X_store& store,
prefetch_lookup& id_lookup,
bool pedantic = false
);
}

53
include/assets/data_loaders/kitti_loader.hpp
View File

@@ -1,53 +0,0 @@
#pragma once
#include <filesystem>
#include <vector>
#include <span>
#include "assets/dynamic_data_store.hpp"
#include "assets/components/point_cloud_vertex_components.hpp"
#include "assets/dynamic_read_buffers/dynamic_point_cloud_buffer.hpp"
#include "assets/dynamic_data_stores/dynamic_point_cloud_store.hpp"
#include "assets/prefetch_lookup.hpp"
#include "assets/prefetch_queue.hpp"
#include "glm/mat4x4.hpp"
#include "util/result.hpp"
struct kitti_loader
{
static constexpr auto name = std::string_view("kitti");
[[nodiscard]] static std::error_code prefetch(
const file_dir_list& paths,
prefetch_queue& queue
);
[[nodiscard]] static std::error_code load(
dynamic_point_cloud_buffer& buffer,
const file_dir_list& paths,
prefetch_lookup& id_lookup,
dynamic_shader_source_store& store,
bool pedantic = false
);
private:
inline static constexpr auto frame_folder = "frames";
[[nodiscard]] static ztu::result<std::size_t> frame_id_from_filename(
std::string_view filename
);
[[nodiscard]] static std::error_code load_point_file(
const std::filesystem::path& filename,
dynamic_point_cloud_buffer& point_cloud
);
static void transform_point_cloud(
std::span<components::point_cloud_vertex::position> points,
const glm::mat4& pose
);
[[nodiscard]] static ztu::result<std::string_view> parent_directory(std::string_view path);
};

37
include/assets/data_loaders/kitti_pose_loader.hpp
View File

@@ -1,37 +0,0 @@
#pragma once
#include <filesystem>
#include "assets/dynamic_data_store.hpp"
#include "assets/prefetch_lookup.hpp"
#include "assets/prefetch_queue.hpp"
#include "util/string_list.hpp"
#include "assets/dynamic_data_stores/dynamic_pose_store.hpp"
#include "assets/dynamic_read_buffers/dynamic_pose_buffer.hpp"
#include "assets/prefetch_lookups/pose_prefetch_lookup.hpp"
struct kitti_pose_loader
{
static constexpr auto name = std::string_view("kitti_pose");
[[nodiscard]] static std::error_code prefetch(
const file_dir_list& paths,
prefetch_queue& queue
);
[[nodiscard]] static std::error_code load(
dynamic_pose_buffer& buffer,
const file_dir_list& paths,
prefetch_lookup& id_lookup,
dynamic_shader_source_store& store,
bool pedantic = false
);
private:
static constexpr auto pose_filename = std::string_view{ "pose.txt" };
static std::error_code parse_pose(
std::ifstream& in,
dynamic_pose_buffer& pose
);
};

43
include/assets/data_loaders/material_library_loader.hpp Normal file
View File

@@ -0,0 +1,43 @@
#pragma once
#include "assets/prefetch_queue.hpp"
#include "assets/components/material_components.hpp"
#include "assets/data/material_library_data.hpp"
#include "assets/data_stores/material_store.hpp"
#include "assets/prefetch_lookups/material_library_prefetch_lookup.hpp"
#include "generic/base_dynamic_loader.hpp"
#include "util/string_list.hpp"
#include "assets/file_parsers/mtl_loader.hpp"
// TODO not implemented?!?
namespace assets
{
class material_library_loader : public base_dynamic_loader<
material_components::flags,
mtl_loader
> {
public:
[[nodiscard]] std::error_code prefetch(
loader_id_type loader_id,
const ztu::string_list& directories,
prefetch_queue& queue
);
[[nodiscard]] std::error_code load(
loader_id_type loader_id,
const ztu::string_list& directories,
material_library_store& store,
material_store& material_store,
material_library_prefetch_lookup& id_lookup,
bool pedantic = false
);
private:
material_library_data m_buffer{};
};
}

39
include/assets/data_loaders/material_loader.hpp Normal file
View File

@@ -0,0 +1,39 @@
#pragma once
#include "assets/prefetch_queue.hpp"
#include "assets/components/material_components.hpp"
#include "generic/base_dynamic_loader.hpp"
#include "assets/data_stores/material_store.hpp"
#include "assets/data/material_data.hpp"
#include "assets/prefetch_lookups/material_prefetch_lookup.hpp"
#include "util/string_list.hpp"
namespace assets
{
class material_loader : public base_dynamic_loader<
material_components::flags
// TODO no loaders (mtl is for material libraries)
> {
public:
[[nodiscard]] std::error_code prefetch(
loader_id_type loader_id,
const ztu::string_list& directories,
prefetch_queue& queue
);
[[nodiscard]] std::error_code load(
loader_id_type loader_id,
const ztu::string_list& directories,
material_store& store,
material_prefetch_lookup& id_lookup,
bool pedantic = false
);
private:
material_data m_buffer{};
};
}

39
include/assets/data_loaders/mesh_loader.hpp Normal file
View File

@@ -0,0 +1,39 @@
#pragma once
#include "generic/base_dynamic_loader.hpp"
#include <filesystem>
#include "assets/data/mesh_data.hpp"
#include "assets/data_stores/mesh_store.hpp"
#include "assets/file_parsers/obj_loader.hpp"
#include "assets/file_parsers/stl_loader.hpp"
#include "assets/prefetch_lookups/mesh_prefetch_lookup.hpp"
namespace assets
{
class mesh_loader : public base_dynamic_loader<
mesh_vertex_components::flags,
obj_loader,
stl_loader
> {
public:
[[nodiscard]] std::error_code prefetch(
loader_id_type loader_id,
const ztu::string_list& directories,
prefetch_queue& queue
);
[[nodiscard]] std::error_code load(
loader_id_type loader_id,
const ztu::string_list& directories,
mesh_store& store,
mesh_prefetch_lookup& id_lookup,
bool pedantic = false
);
private:
mesh_data m_buffer{};
};
}

56
include/assets/data_loaders/mtl_loader.hpp
View File

@@ -1,56 +0,0 @@
#pragma once
#include <filesystem>
#include <system_error>
#include "assets/dynamic_data_store.hpp"
#include "assets/prefetch_lookup.hpp"
#include "assets/prefetch_queue.hpp"
#include "assets/dynamic_read_buffers/dynamic_material_buffer.hpp"
#include "assets/dynamic_data_stores/dynamic_material_library_store.hpp"
#include "assets/dynamic_data_stores/dynamic_material_store.hpp"
#include "util/string_lookup.hpp"
#include "util/result.hpp"
namespace mtl_loader_error
{
enum class codes {
ok = 0,
cannot_open_file,
cannot_open_texture,
malformed_ambient_color,
malformed_diffuse_color,
malformed_specular_color,
malformed_specular_exponent,
malformed_dissolve,
unknown_line_begin
};
} // namespace mtl_loader_error
struct mtl_loader
{
static constexpr auto name = std::string_view("mtl");
[[nodiscard]] static std::error_code prefetch(
const file_dir_list& paths,
prefetch_queue& queue
);
// THis is not very elegant, but right now I do not see a better solution...
[[nodiscard]] static std::error_code load(
dynamic_material_library_buffer& material_library_buffer,
const file_dir_list& paths,
prefetch_lookup& id_lookup,
dynamic_shader_source_store& store,
bool pedantic = false
);
protected:
static void find_textures(
std::span<char> buffer,
std::filesystem::path& path_buffer,
const std::filesystem::path& base_directory,
std::ifstream& in,
ztu::string_list& texture_filenames
);
};

82
include/assets/data_loaders/obj_loader.hpp
View File

@@ -1,82 +0,0 @@
#pragma once
#include <filesystem>
#include <system_error>
#include <string_view>
#include "assets/dynamic_data_loaders/dynamic_material_loader.hpp"
#include "assets/dynamic_data_stores/dynamic_mesh_store.hpp"
#include "assets/prefetch_lookup.hpp"
#include <set>
namespace obj_loader_error {
enum class codes {
ok = 0,
cannot_open_file,
malformed_vertex,
malformed_texture_coordinate,
malformed_normal,
malformed_face,
face_index_out_of_range,
unknown_line_begin,
use_material_without_material_library,
unknown_material_name
};
} // namespace obj_loader_error
struct obj_loader {
static constexpr auto name = std::string_view("obj");
[[nodiscard]] static std::error_code prefetch(
const file_dir_list& paths,
prefetch_queue& queue
);
[[nodiscard]] static std::error_code load(
dynamic_mesh_buffer& buffer,
const file_dir_list& paths,
prefetch_lookup& id_lookup,
dynamic_shader_source_store& store,
bool pedantic = false
);
protected:
using index_type = dynamic_mesh_buffer::index_type;
using vertex_type = std::array<index_type, 3>;
struct indexed_vertex_type
{
vertex_type vertex;
index_type buffer_index;
friend auto operator<=>(const indexed_vertex_type& a, const indexed_vertex_type& b) {
return a.vertex <=> b.vertex;
}
bool operator==(const indexed_vertex_type& other) const noexcept {
return other.vertex == vertex;
}
};
static void find_materials(
std::span<char> buffer,
std::filesystem::path& path_buffer,
const std::filesystem::path& base_directory,
std::ifstream& in,
ztu::string_list& material_filenames
);
[[nodiscard]] static std::error_code obj_loader::parse_file(
dynamic_mesh_buffer& read_buffer,
dynamic_mesh_buffer& mesh_buffer,
std::filesystem::path& path_buffer,
const std::filesystem::path& base_directory,
std::set<indexed_vertex_type>& vertex_ids,
std::ifstream& in,
prefetch_lookup& id_lookup,
dynamic_shader_source_store& store,
bool pedantic
);
};

50
include/assets/data_loaders/point_cloud_loader.hpp Normal file
View File

@@ -0,0 +1,50 @@
#pragma once
#include <filesystem>
#include <system_error>
#include "assets/prefetch_queue.hpp"
#include "generic/base_dynamic_loader.hpp"
#include "assets/data/point_cloud_data.hpp"
#include "assets/data_stores/point_cloud_store.hpp"
#include "assets/prefetch_lookups/point_cloud_prefetch_lookup.hpp"
#include "util/string_list.hpp"
#include "assets/file_parsers/kitti_loader.hpp"
#include "assets/file_parsers/uos_loader.hpp"
#include "assets/file_parsers/uos_normal_loader.hpp"
#include "assets/file_parsers/uos_rgb_loader.hpp"
#include "assets/file_parsers/uosr_loader.hpp"
namespace assets
{
class point_cloud_loader : public base_dynamic_loader<
point_cloud_vertex_components::flags,
kitti_loader,
uos_loader,
uos_normal_loader,
uos_rgb_loader,
uos_loader,
uosr_loader
> {
public:
[[nodiscard]] std::error_code prefetch(
loader_id_type loader_id,
const ztu::string_list& directories,
prefetch_queue& queue
);
[[nodiscard]] std::error_code load(
loader_id_type loader_id,
const ztu::string_list& directories,
point_cloud_store& store,
point_cloud_prefetch_lookup& id_lookup,
bool pedantic = false
);
private:
point_cloud_data m_buffer{};
};
}

30
include/assets/data_loaders/stl_loader.hpp
View File

@@ -1,30 +0,0 @@
#pragma once
#include <filesystem>
#include <system_error>
#include <string_view>
#include "assets/dynamic_data_store.hpp"
#include "assets/dynamic_read_buffers/dynamic_mesh_buffer.hpp"
#include "assets/dynamic_data_stores/dynamic_mesh_store.hpp"
#include "assets/prefetch_lookup.hpp"
#include "assets/prefetch_queue.hpp"
struct stl_loader {
static constexpr auto name = std::string_view("stl");
[[nodiscard]] static std::error_code prefetch(
const file_dir_list& paths,
prefetch_queue& queue
);
[[nodiscard]] static std::error_code load(
// space stuff that has to persist
dynamic_mesh_buffer& buffer,
const file_dir_list& paths,
prefetch_lookup& id_lookup,
dynamic_shader_source_store& store,
bool pedantic = false
);
};

49
include/assets/data_loaders/texture_loader.hpp Normal file
View File

@@ -0,0 +1,49 @@
#pragma once
#include <optional>
#include <filesystem>
#include "util/uix.hpp"
#include "util/id_type.hpp"
#include "util/string_lookup.hpp"
#include "util/result.hpp"
#include "assets/components/texture_components.hpp"
#include "assets/data/texture_data.hpp"
#include "assets/data_stores/texture_store.hpp"
#include "assets/dynamic_data_store.hpp"
#include "assets/prefetch_queue.hpp"
#include "assets/prefetch_lookups/texture_prefetch_lookup.hpp"
#include "util/string_list.hpp"
namespace assets
{
class texture_loader
{
public:
using loader_id_type = ztu::id_type_for<texture_loader, ztu::u8>;
explicit texture_loader(texture_components::flags enabled_components);
[[nodiscard]] std::optional<loader_id_type> find_loader(const std::string_view& name);
[[nodiscard]] std::error_code prefetch(
loader_id_type loader_id,
const ztu::string_list& directories,
prefetch_queue& queue
);
[[nodiscard]] std::error_code load(
loader_id_type loader_id,
const ztu::string_list& directories,
texture_store& store,
texture_prefetch_lookup& id_lookup,
bool pedantic = false
);
private:
ztu::string_lookup<loader_id_type> m_loader_id_lookup{};
texture_components::flags m_enabled_components{ texture_components::flags::none };
};
}

40
include/assets/data_loaders/threedtk_pose_loader.hpp
View File

@@ -1,40 +0,0 @@
#pragma once
#include <filesystem>
#include "assets/dynamic_data_store.hpp"
#include "assets/prefetch_lookup.hpp"
#include "assets/prefetch_queue.hpp"
#include "assets/dynamic_read_buffers/dynamic_pose_buffer.hpp"
#include "util/string_list.hpp"
#include "util/result.hpp"
#include "assets/prefetch_lookups/pose_prefetch_lookup.hpp"
struct threedtk_pose_loader
{
static constexpr auto name = std::string_view("3dtk_pose");
[[nodiscard]] static std::error_code prefetch(
const file_dir_list& paths,
prefetch_queue& queue
);
[[nodiscard]] static std::error_code load(
dynamic_pose_buffer& buffer,
const file_dir_list& paths,
prefetch_lookup& id_lookup,
dynamic_shader_source_store& store,
bool pedantic = false
);
protected:
static std::error_code parse_transform_info(
std::ifstream& in,
std::string& line,
std::array<glm::vec3, 2>& transform_info
);
static ztu::result<pose_prefetch_lookup::index_type> parse_index(
std::string_view filename
);
};

9
include/assets/data_loaders/uos_loader.hpp
View File

@@ -1,9 +0,0 @@
#pragma once
#include "generic/generic_3dtk_loader.hpp"
struct uos_loader : generic_3dtk_loader<false, false, false>
{
static constexpr auto name = std::string_view("uos");
};

8
include/assets/data_loaders/uos_normal_loader.hpp
View File

@@ -1,8 +0,0 @@
#pragma once
#include "generic/generic_3dtk_loader.hpp"
struct uos_normal_loader : generic_3dtk_loader<true, false, false>
{
static constexpr auto name = std::string_view("uos_normal");
};

8
include/assets/data_loaders/uos_rgb_loader.hpp
View File

@@ -1,8 +0,0 @@
#pragma once
#include "generic/generic_3dtk_loader.hpp"
struct uos_rgb_loader : generic_3dtk_loader<false, true, false>
{
static constexpr auto name = std::string_view("uos_rgb");
};

8
include/assets/data_loaders/uosr_loader.hpp
View File

@@ -1,8 +0,0 @@
#pragma once
#include "generic/generic_3dtk_loader.hpp"
struct uosr_loader : generic_3dtk_loader<false, false, true>
{
static constexpr auto name = std::string_view("uosr");
};