sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics: Rename Material to MaterialPass

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-07-13 14:56:52 +02:00
parent f0ea623408
commit 5669b5bc60
18 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Graphics/Model.hpp
View File

@@ -18,7 +18,7 @@
namespace Nz
{
class GraphicalMesh;
class Material;
class MaterialPass;
class NAZARA_GRAPHICS_API Model : public InstancedRenderable
{
@@ -32,13 +32,13 @@ namespace Nz
const std::shared_ptr<AbstractBuffer>& GetIndexBuffer(std::size_t subMeshIndex) const;
std::size_t GetIndexCount(std::size_t subMeshIndex) const;
const std::shared_ptr<Material>& GetMaterial(std::size_t subMeshIndex) const override;
const std::shared_ptr<MaterialPass>& GetMaterial(std::size_t subMeshIndex) const override;
std::size_t GetMaterialCount() const override;
const std::shared_ptr<RenderPipeline>& GetRenderPipeline(std::size_t subMeshIndex) const;
const std::shared_ptr<AbstractBuffer>& GetVertexBuffer(std::size_t subMeshIndex) const;
inline std::size_t GetSubMeshCount() const;
inline void SetMaterial(std::size_t subMeshIndex, std::shared_ptr<Material> material);
inline void SetMaterial(std::size_t subMeshIndex, std::shared_ptr<MaterialPass> material);
Model& operator=(const Model&) = delete;
Model& operator=(Model&&) noexcept = default;
@@ -46,7 +46,7 @@ namespace Nz
private:
struct SubMeshData
{
std::shared_ptr<Material> material;
std::shared_ptr<MaterialPass> material;
std::vector<RenderPipelineInfo::VertexBufferData> vertexBufferData;
};