celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-09 20:08:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improved material parsing

Browse Source
This commit is contained in:
antopilo
2025-02-08 18:38:28 -05:00
parent 7182f4c09b
commit d0c8e84f50
1 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Nuake/Source/Nuake/Rendering/Textures/Material.h
View File

@@ -138,6 +138,26 @@ namespace Nuake
}
// TODO others.
if (NormalImage != 0)
{
j["NormalImage"] = static_cast<uint64_t>(NormalImage);
}
if (RoughnessImage != 0)
{
j["RoughnessImage"] = static_cast<uint64_t>(RoughnessImage);
}
if (MetalnessImage != 0)
{
j["MetalnessImage"] = static_cast<uint64_t>(MetalnessImage);
}
if (AOImage != 0)
{
j["AOImage"] = static_cast<uint64_t>(AOImage);
}
if (HasAlbedo())
{
j["Albedo"] = this->m_Albedo->Serialize();
@@ -189,6 +209,26 @@ namespace Nuake
AlbedoImage = static_cast<uint64_t>(j["AlbedoImage"]);
}
if (j.contains("NormalImage"))
{
NormalImage = static_cast<uint64_t>(j["NormalImage"]);
}
if (j.contains("AOImage"))
{
AOImage = static_cast<uint64_t>(j["AOImage"]);
}
if (j.contains("RoughnessImage"))
{
RoughnessImage = static_cast<uint64_t>(j["RoughnessImage"]);
}
if (j.contains("MetalnessImage"))
{
MetalnessImage = static_cast<uint64_t>(j["MetalnessImage"]);
}
if (j.contains("Albedo"))
{
const auto& texturePath = j["Albedo"]["Path"];
@@ -248,6 +288,7 @@ namespace Nuake
{
const auto& texturePath = j["Normal"]["Path"];
const std::string absolutePath = FileSystem::RelativeToAbsolute(texturePath);
if (FileSystem::FileExists(texturePath))
{
GPUResources& resources = GPUResources::Get();
@@ -256,11 +297,18 @@ namespace Nuake
{
NormalImage = image->GetID();
}
Ref<Texture> normalTexture = TextureManager::Get()->GetTexture(absolutePath);
SetNormal(normalTexture);
}
else
{
GPUResources& resources = GPUResources::Get();
Ref<VulkanImage> missingTexture = TextureManager::Get()->GetTexture2("missing_texture");
NormalImage = missingTexture->GetID();
}
Ref<Texture> normalTexture = TextureManager::Get()->GetTexture(absolutePath);
SetMetalness(normalTexture);
}
if (j.contains("AO"))
{