tried making naming more uniform and implemented most of the opengl managers
This commit is contained in:
@@ -20,16 +20,16 @@ private:
|
||||
const std::optional<surface_properties_handle>& surface_properties_handle,
|
||||
const std::optional<alpha_handle>& alpha_handle,
|
||||
std::optional<texture_data>&& texture_data,
|
||||
components::material::flags components
|
||||
material_components::flags components
|
||||
);
|
||||
|
||||
public:
|
||||
material_data() = default;
|
||||
|
||||
[[nodiscard]] static std::error_code build_from(
|
||||
const std::optional<components::material::texture>& texture_opt,
|
||||
const std::optional<components::material::surface_properties>& surface_properties_opt,
|
||||
const std::optional<components::material::transparency>& transparency_opt,
|
||||
const std::optional<material_texture_components>& texture_opt,
|
||||
const std::optional<material_components::surface_properties>& surface_properties_opt,
|
||||
const std::optional<material_components::transparency>& transparency_opt,
|
||||
material_component::flags components,
|
||||
material_data& data
|
||||
);
|
||||
|
||||
@@ -19,7 +19,7 @@ private:
|
||||
GLuint index_vbo_id,
|
||||
GLuint vao_id,
|
||||
ztu::u32 material_id,
|
||||
components::mesh_vertex::flags components,
|
||||
mesh_vertex_components::flags components,
|
||||
GLsizei index_count
|
||||
);
|
||||
|
||||
@@ -33,7 +33,7 @@ public:
|
||||
GLsizei stride,
|
||||
std::span<const ztu::u32> index_buffer,
|
||||
ztu::u32 material_id,
|
||||
components::mesh_vertex::flags components,
|
||||
mesh_vertex_components::flags components,
|
||||
mesh_data& data
|
||||
);
|
||||
|
||||
@@ -47,7 +47,7 @@ public:
|
||||
|
||||
[[nodiscard]] mesh_handle handle() const;
|
||||
|
||||
[[nodiscard]] components::mesh_vertex::flags components() const;
|
||||
[[nodiscard]] mesh_vertex_components::flags components() const;
|
||||
|
||||
[[nodiscard]] ztu::u32 material_id() const;
|
||||
|
||||
@@ -57,8 +57,8 @@ private:
|
||||
GLuint m_vertex_vbo_id{ 0 };
|
||||
GLuint m_index_vbo_id{ 0 };
|
||||
ztu::u32 m_material_id{ 0 };
|
||||
components::mesh_vertex::flags m_component_types{
|
||||
components::mesh_vertex::flags::none
|
||||
mesh_vertex_components::flags m_component_types{
|
||||
mesh_vertex_components::flags::none
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -39,13 +39,13 @@ public:
|
||||
|
||||
[[nodiscard]] point_cloud_handle handle() const;
|
||||
|
||||
[[nodiscard]] components::point_cloud_vertex::flags components() const;
|
||||
[[nodiscard]] point_cloud_vertex_components::flags components() const;
|
||||
|
||||
private:
|
||||
point_cloud_handle m_handle{};
|
||||
GLuint m_vertex_vbo_id{ 0 };
|
||||
components::point_cloud_vertex::flags m_component_types{
|
||||
components::point_cloud_vertex::flags::none
|
||||
point_cloud_vertex_components::flags m_component_types{
|
||||
point_cloud_vertex_components::flags::none
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user