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

36
include/viewer/asset_loader.hpp
View File

@@ -4,7 +4,7 @@
#include <vector>
#include <filesystem>
#include "assets/data_loaders/glsl_loader.hpp"
#include "../assets/data_parsers"
#include "../assets/dynamic_read_buffers"
#include "opengl/handles/mesh_handle.hpp"
#include "opengl/handles/material_handle.hpp"
@@ -16,16 +16,16 @@
#include "opengl/data/point_cloud_data.hpp"
#include "opengl/data/shader_program_data.hpp"
#include "assets/dynamic_data_loaders/dynamic_mesh_loader.hpp"
#include "assets/data_loaders/obj_loader.hpp"
#include "assets/data_loaders/stl_loader.hpp"
#include "../assets/data_loaders"
#include "../assets/data_parsers"
#include "../assets/data_parsers"
#include "assets/dynamic_data_loaders/dynamic_point_cloud_loader.hpp"
#include "assets/data_loaders/kitti_loader.hpp"
#include "assets/data_loaders/uos_loader.hpp"
#include "assets/data_loaders/uos_normal_loader.hpp"
#include "assets/data_loaders/uos_rgb_loader.hpp"
#include "assets/data_loaders/uosr_loader.hpp"
#include "../assets/data_loaders"
#include "../assets/data_parsers"
#include "../assets/data_parsers"
#include "../assets/data_parsers"
#include "../assets/data_parsers"
#include "../assets/data_parsers"
#include "geometry/aabb.hpp"
#include "opengl/data/shader_data.hpp"
@@ -53,7 +53,7 @@ public:
{
zgl::point_cloud_handle handle;
aabb bounding_box;
components::point_cloud_vertex::flags components;
point_cloud_vertex_components::flags components;
};
struct dynamic_material_handle_type
@@ -66,15 +66,15 @@ public:
{
zgl::mesh_handle handle;
aabb bounding_box;
components::mesh_vertex::flags components;
mesh_vertex_components::flags components;
};
using material_reference_entry_type = std::pair<ztu::u32, ztu::u32>;
std::error_code init(
components::mesh_vertex::flags enabled_mesh_components,
mesh_vertex_components::flags enabled_mesh_components,
material_component::flags enabled_material_components,
components::point_cloud_vertex::flags enabled_point_cloud_components,
point_cloud_vertex_components::flags enabled_point_cloud_components,
const dynamic_material_data& default_material
);
@@ -159,15 +159,15 @@ protected:
private:
//sf::Context m_ctx;
components::mesh_vertex::flags m_enabled_mesh_components{
components::mesh_vertex::flags::none
mesh_vertex_components::flags m_enabled_mesh_components{
mesh_vertex_components::flags::none
};
material_component::flags m_enabled_material_components{
material_component::flags::none
};
components::point_cloud_vertex::flags m_enabled_point_cloud_components{
components::point_cloud_vertex::flags::none
point_cloud_vertex_components::flags m_enabled_point_cloud_components{
point_cloud_vertex_components::flags::none
};
glsl_loader m_shader_loader{};

4
include/viewer/instance.hpp
View File

@@ -49,7 +49,7 @@ public:
std::optional<asset_id> add_mesh(
const zgl::mesh_handle& mesh,
const aabb& bounding_box,
components::mesh_vertex::flags mesh_components,
mesh_vertex_components::flags mesh_components,
const zgl::material_handle& material,
material_component::flags material_components
);
@@ -57,7 +57,7 @@ public:
std::optional<asset_id> add_point_cloud(
const zgl::point_cloud_handle& point_cloud,
const aabb& bounding_box,
components::point_cloud_vertex::flags point_cloud_components
point_cloud_vertex_components::flags point_cloud_components
);
void add_shader_program(