In the middle of multithreading parsers.
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#include <optional>
|
||||
|
||||
#include "assets/components/material_components.hpp"
|
||||
#include "generic/component_set.hpp"
|
||||
|
||||
@@ -13,22 +11,27 @@ struct material_data : detail::component_set<material_components::all>
|
||||
|
||||
material_data() = default;
|
||||
|
||||
material_components::surface_properties& initialized_surface_properties();
|
||||
|
||||
[[nodiscard]] inline z3d::optional<material_components::surface_properties>& surface_properties();
|
||||
[[nodiscard]] inline z3d::optional<material_components::transparency>& transparency();
|
||||
[[nodiscard]] inline z3d::optional<material_components::ambient_color_texture>& ambient_color_texture_id();
|
||||
[[nodiscard]] inline z3d::optional<material_components::diffuse_color_texture>& diffuse_color_texture_id();
|
||||
[[nodiscard]] inline z3d::optional<material_components::specular_color_texture>& specular_color_texture_id();
|
||||
[[nodiscard]] inline z3d::optional<material_components::ambient_filter>& ambient_filter();
|
||||
[[nodiscard]] inline z3d::optional<material_components::diffuse_filter>& diffuse_filter();
|
||||
[[nodiscard]] inline z3d::optional<material_components::specular_filter>& specular_filter();
|
||||
[[nodiscard]] inline z3d::optional<material_components::shininess>& shininess();
|
||||
[[nodiscard]] inline z3d::optional<material_components::alpha>& alpha();
|
||||
[[nodiscard]] inline z3d::optional<material_components::ambient_filter_texture>& specular_filter_texture_id();
|
||||
[[nodiscard]] inline z3d::optional<material_components::diffuse_filter_texture>& diffuse_filter_texture_id();
|
||||
[[nodiscard]] inline z3d::optional<material_components::specular_filter_texture>& specular_filter_texture_id();
|
||||
[[nodiscard]] inline z3d::optional<material_components::shininess_texture>& shininess_texture_id();
|
||||
[[nodiscard]] inline z3d::optional<material_components::alpha_texture>& alpha_texture_id();
|
||||
[[nodiscard]] inline z3d::optional<material_components::bump_texture>& bump_texture_id();
|
||||
|
||||
[[nodiscard]] inline const z3d::optional<material_components::surface_properties>& surface_properties() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::transparency>& transparency() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::ambient_color_texture>& ambient_color_texture_id() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::diffuse_color_texture>& diffuse_color_texture_id() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::specular_color_texture>& specular_color_texture_id() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::ambient_filter>& ambient_filter() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::diffuse_filter>& diffuse_filter() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::specular_filter>& specular_filter() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::shininess>& shininess() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::alpha>& alpha() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::alpha>& transparency() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::ambient_filter_texture>& specular_filter_texture_id() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::diffuse_filter_texture>& diffuse_filter_texture_id() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::specular_filter_texture>& specular_filter_texture_id() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::shininess_texture>& shininess_texture_id() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::alpha_texture>& alpha_texture_id() const;
|
||||
[[nodiscard]] inline const z3d::optional<material_components::bump_texture>& bump_texture_id() const;
|
||||
@@ -38,6 +41,6 @@ struct material_data : detail::component_set<material_components::all>
|
||||
|
||||
}
|
||||
|
||||
#define INCLUDE_DYNAMIC_MATERIAL_DATA_IMPLEMENTATION
|
||||
#define INCLUDE_MATERIAL_DATA_IMPLEMENTATION
|
||||
#include "assets/data/material_data.ipp"
|
||||
#undef INCLUDE_DYNAMIC_MATERIAL_DATA_IMPLEMENTATION
|
||||
#undef INCLUDE_MATERIAL_DATA_IMPLEMENTATION
|
||||
|
||||
Reference in New Issue
Block a user