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

Graphics/Material: Rename CreateInstance to Instantiate

Browse Source
This commit is contained in:
SirLynix
2022-11-05 00:14:16 +01:00
parent 4e631da7dc
commit 1205155466
11 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Graphics/Material.hpp
View File

@@ -48,8 +48,6 @@ namespace Nz
Material(MaterialSettings settings, const nzsl::Ast::ModulePtr& referenceModule);
~Material() = default;
std::shared_ptr<MaterialInstance> CreateInstance() const;
std::shared_ptr<MaterialInstance> GetDefaultInstance() const;
inline std::size_t FindTextureByTag(const std::string& tag) const;
@@ -63,6 +61,8 @@ namespace Nz
inline const UniformBlockData& GetUniformBlockData(std::size_t uniformBlockIndex) const;
inline std::size_t GetUniformBlockCount() const;
std::shared_ptr<MaterialInstance> Instantiate() const;
static std::shared_ptr<Material> Build(const ParameterList& materialData);
static std::shared_ptr<Material> LoadFromFile(const std::filesystem::path& filePath, const MaterialParams& params = MaterialParams());
static std::shared_ptr<Material> LoadFromMemory(const void* data, std::size_t size, const MaterialParams& params = MaterialParams());