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

6
src/Nazara/Graphics/Formats/TextureLoader.cpp
View File

@@ -35,11 +35,11 @@ namespace Nz
switch (parameters.lightingType)
{
case MaterialLightingType::Phong:
materialInstance = Graphics::Instance()->GetDefaultMaterials().phongMaterial->CreateInstance();
materialInstance = Graphics::Instance()->GetDefaultMaterials().phongMaterial->Instantiate();
break;
case MaterialLightingType::PhysicallyBased:
materialInstance = Graphics::Instance()->GetDefaultMaterials().pbrMaterial->CreateInstance();
materialInstance = Graphics::Instance()->GetDefaultMaterials().pbrMaterial->Instantiate();
break;
case MaterialLightingType::None:
@@ -47,7 +47,7 @@ namespace Nz
}
if (!materialInstance)
materialInstance = Graphics::Instance()->GetDefaultMaterials().basicMaterial->CreateInstance();
materialInstance = Graphics::Instance()->GetDefaultMaterials().basicMaterial->Instantiate();
if (hasAlphaTest && PixelFormatInfo::HasAlpha(texture->GetFormat()))
materialInstance->SetValueProperty("AlphaTest", true);

4
src/Nazara/Graphics/Graphics.cpp
View File

@@ -262,14 +262,14 @@ namespace Nz
m_defaultMaterials.basicDefault = m_defaultMaterials.basicMaterial->GetDefaultInstance();
m_defaultMaterials.basicNoDepth = m_defaultMaterials.basicMaterial->CreateInstance();
m_defaultMaterials.basicNoDepth = m_defaultMaterials.basicMaterial->Instantiate();
m_defaultMaterials.basicNoDepth->DisablePass(depthPassIndex);
m_defaultMaterials.basicNoDepth->UpdatePassStates(forwardPassIndex, [](RenderStates& states)
{
states.depthBuffer = false;
});
m_defaultMaterials.basicTransparent = m_defaultMaterials.basicMaterial->CreateInstance();
m_defaultMaterials.basicTransparent = m_defaultMaterials.basicMaterial->Instantiate();
m_defaultMaterials.basicTransparent->DisablePass(depthPassIndex);
m_defaultMaterials.basicTransparent->UpdatePassStates(forwardPassIndex, [](RenderStates& renderStates)
{

12
src/Nazara/Graphics/Material.cpp
View File

@@ -164,23 +164,23 @@ namespace Nz
}
}
std::shared_ptr<MaterialInstance> Material::CreateInstance() const
{
return std::make_shared<MaterialInstance>(shared_from_this());
}
std::shared_ptr<MaterialInstance> Material::GetDefaultInstance() const
{
std::shared_ptr<MaterialInstance> instance = m_defaultInstance.lock();
if (!instance)
{
instance = CreateInstance();
instance = Instantiate();
m_defaultInstance = std::weak_ptr<MaterialInstance>(instance);
}
return instance;
}
std::shared_ptr<MaterialInstance> Material::Instantiate() const
{
return std::make_shared<MaterialInstance>(shared_from_this());
}
std::shared_ptr<Material> Material::Build(const ParameterList& materialData)
{
return std::shared_ptr<Material>();

2
src/Nazara/Widgets/DefaultWidgetTheme.cpp
View File

@@ -132,7 +132,7 @@ namespace Nz
auto CreateMaterialFromTexture = [&](std::shared_ptr<Texture> texture)
{
std::shared_ptr<MaterialInstance> material = defaultBasicMaterial.basicMaterial->CreateInstance();
std::shared_ptr<MaterialInstance> material = defaultBasicMaterial.basicMaterial->Instantiate();
material->DisablePass(depthPassIndex);
material->UpdatePassStates(forwardPassIndex, [](RenderStates& renderStates)
{

4
src/Nazara/Widgets/Widgets.cpp
View File

@@ -28,7 +28,7 @@ namespace Nz
std::size_t depthPassIndex = materialPassRegistry.GetPassIndex("DepthPass");
std::size_t forwardPassIndex = materialPassRegistry.GetPassIndex("ForwardPass");
m_opaqueMaterial = defaultMaterials.basicMaterial->CreateInstance();
m_opaqueMaterial = defaultMaterials.basicMaterial->Instantiate();
for (std::size_t passIndex : { depthPassIndex, forwardPassIndex })
{
m_opaqueMaterial->UpdatePassStates(passIndex, [](RenderStates& renderStates)
@@ -37,7 +37,7 @@ namespace Nz
});
}
m_transparentMaterial = defaultMaterials.basicMaterial->CreateInstance();
m_transparentMaterial = defaultMaterials.basicMaterial->Instantiate();
m_transparentMaterial->DisablePass(depthPassIndex);
m_transparentMaterial->UpdatePassStates(forwardPassIndex, [](RenderStates& renderStates)