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

Ported the obj parser.

Browse Source
This commit is contained in:
zy4n
2025-04-01 21:51:56 +02:00
parent bc065bc657
commit 27977c1738
34 changed files with 1676 additions and 1554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/assets/data/material_data.ipp
View File

@@ -45,7 +45,7 @@ inline std::optional<assets::material_components::alpha_texture>& assets::materi
}
inline std::optional<assets::material_components::bump_texture>& assets::material_data::bump_texture_id()
{
return std::get<material_components::indices::bump_texture(components);
return std::get<material_components::indices::bump_texture>(components);
}
inline const std::optional<assets::material_components::specular_filter>& assets::material_data::specular_filter() const

6
source/assets/data/mesh_data.ipp
View File

@@ -32,7 +32,7 @@ inline std::vector<z3d::index_triangle>& assets::mesh_data::triangles()
return m_triangles;
}
inline auto& assets::mesh_data::material()
inline assets::material_id& assets::mesh_data::material()
{
return m_material_id;
}
@@ -62,12 +62,12 @@ inline const std::vector<assets::mesh_vertex_components::reflectance>& assets::m
return std::get<mesh_vertex_components::indices::reflectance>(component_arrays);
}
inline const std::vector<assets::mesh_data::triangle_type>& assets::mesh_data::triangles() const
inline const std::vector<z3d::index_triangle>& assets::mesh_data::triangles() const
{
return m_triangles;
}
inline const auto& assets::mesh_data::material() const
inline const assets::material_id& assets::mesh_data::material() const
{
return m_material_id;
}

16
source/assets/data/point_cloud_data.ipp
View File

@@ -5,42 +5,42 @@
inline std::vector<assets::point_cloud_vertex_components::position>& assets::point_cloud_data::positions()
{
return std::get<point_cloud_vertex_components::indices::position>(vertices);
return std::get<point_cloud_vertex_components::indices::position>(component_arrays);
}
inline std::vector<assets::point_cloud_vertex_components::normal>& assets::point_cloud_data::normals()
{
return std::get<point_cloud_vertex_components::indices::normal>(vertices);
return std::get<point_cloud_vertex_components::indices::normal>(component_arrays);
}
inline std::vector<assets::point_cloud_vertex_components::color>& assets::point_cloud_data::colors()
{
return std::get<point_cloud_vertex_components::indices::color>(vertices);
return std::get<point_cloud_vertex_components::indices::color>(component_arrays);
}
inline std::vector<assets::point_cloud_vertex_components::reflectance>& assets::point_cloud_data::reflectances()
{
return std::get<point_cloud_vertex_components::indices::reflectance>(vertices);
return std::get<point_cloud_vertex_components::indices::reflectance>(component_arrays);
}
inline const std::vector<assets::point_cloud_vertex_components::position>& assets::point_cloud_data::positions() const
{
return std::get<point_cloud_vertex_components::indices::position>(vertices);
return std::get<point_cloud_vertex_components::indices::position>(component_arrays);
}
inline const std::vector<assets::point_cloud_vertex_components::normal>& assets::point_cloud_data::normals() const
{
return std::get<point_cloud_vertex_components::indices::normal>(vertices);
return std::get<point_cloud_vertex_components::indices::normal>(component_arrays);
}
inline const std::vector<assets::point_cloud_vertex_components::color>& assets::point_cloud_data::colors() const
{
return std::get<point_cloud_vertex_components::indices::color>(vertices);
return std::get<point_cloud_vertex_components::indices::color>(component_arrays);
}
inline const std::vector<assets::point_cloud_vertex_components::reflectance>& assets::point_cloud_data::reflectances() const
{
return std::get<point_cloud_vertex_components::indices::reflectance>(vertices);
return std::get<point_cloud_vertex_components::indices::reflectance>(component_arrays);
}
inline void assets::point_cloud_data::clear()