eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 17:09:19 +02:00
Code Issues 123 Wiki Activity

add adapter for legacy reflection materials

Browse Source
This commit is contained in:
WLs50
2025-03-17 13:00:18 +01:00
parent e8fc147b5f
commit 91a03dbcd4
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manul/renderer/source/materialparser.cpp
View File

@@ -108,11 +108,15 @@ std::string_view MaterialAdapterLegacyMatFile::GetTexturePathForEntry(
if (auto it = m_texture_mapping.find("_normals:"); if (auto it = m_texture_mapping.find("_normals:");
it != m_texture_mapping.end()) { it != m_texture_mapping.end()) {
return it->second.m_path; return it->second.m_path;
} }
if (auto it = m_texture_mapping.find("_normalmap:"); if (auto it = m_texture_mapping.find("_normalmap:");
it != m_texture_mapping.end()) { it != m_texture_mapping.end()) {
return it->second.m_path; return it->second.m_path;
} }
if (auto it = m_texture_mapping.find("_reflmap:");
it != m_texture_mapping.end()) {
return it->second.m_path;
}
if (auto it = m_texture_mapping.find("2:"); it != m_texture_mapping.end()) { if (auto it = m_texture_mapping.find("2:"); it != m_texture_mapping.end()) {
return it->second.m_path; return it->second.m_path;
} }
@@ -138,6 +142,9 @@ std::string_view MaterialAdapterLegacyMatFile::GetShader() const {
if (IsNormalMapShader() && HasNormalMap()) { if (IsNormalMapShader() && HasNormalMap()) {
return "legacy_normalmap"; return "legacy_normalmap";
} }
if (HasNormalMap()) {
return "legacy_reflection";
}
return "legacy"; return "legacy";
} }
@@ -255,6 +262,7 @@ bool MaterialAdapterLegacyMatFile::ParseLevel(cParser& parser, int priority) {
bool MaterialAdapterLegacyMatFile::HasNormalMap() const { bool MaterialAdapterLegacyMatFile::HasNormalMap() const {
return m_texture_mapping.find("_normals:") != m_texture_mapping.end() || return m_texture_mapping.find("_normals:") != m_texture_mapping.end() ||
m_texture_mapping.find("_normalmap:") != m_texture_mapping.end() || m_texture_mapping.find("_normalmap:") != m_texture_mapping.end() ||
m_texture_mapping.find("_reflmap:") != m_texture_mapping.end() ||
m_texture_mapping.find("2:") != m_texture_mapping.end(); m_texture_mapping.find("2:") != m_texture_mapping.end();
} }
@@ -267,6 +275,10 @@ bool MaterialAdapterLegacyMatFile::IsNormalMapShader() const {
m_shader.find("parallax") != std::string::npos; m_shader.find("parallax") != std::string::npos;
} }
bool MaterialAdapterLegacyMatFile::IsReflectionShader() const {
return m_shader.find("reflmap") != std::string::npos;
}
bool MaterialAdapterLegacyMatFile::IsSpecGlossShader() const { bool MaterialAdapterLegacyMatFile::IsSpecGlossShader() const {
return m_shader.find("specgloss") != std::string::npos; return m_shader.find("specgloss") != std::string::npos;
} }

1
manul/renderer/source/materialparser.h
View File

@@ -75,6 +75,7 @@ struct MaterialAdapterLegacyMatFile : public MaterialAdapterInternal {
bool HasSpecGlossMap() const; bool HasSpecGlossMap() const;
bool IsSpecGlossShader() const; bool IsSpecGlossShader() const;
bool IsNormalMapShader() const; bool IsNormalMapShader() const;
bool IsReflectionShader() const;
std::unordered_map<std::string, TextureEntry> m_texture_mapping; std::unordered_map<std::string, TextureEntry> m_texture_mapping;
virtual int GetShadowRank() const override { return m_shadow_rank; } virtual int GetShadowRank() const override { return m_shadow_rank; }
virtual std::optional<float> GetOpacity() const override; virtual std::optional<float> GetOpacity() const override;