piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12240 from iwubcode/material_asset_additional_properties

Browse Source 
VideoCommon: add additional data types to material asset
This commit is contained in:
Mai
2023-12-12 18:38:20 -05:00
committed by GitHub
parent 022b0a00a2 e204b3c8ee
commit ea3033731d
3 changed files with 219 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp
View File

@ -393,21 +393,15 @@ void CustomPipelineAction::OnTextureCreate(GraphicsModActionData::TextureCreate*
return;
}
if (property.m_type == VideoCommon::MaterialProperty::Type::Type_TextureAsset)
if (auto* value = std::get_if<std::string>(&property.m_value))
{
if (property.m_value)
auto asset = loader.LoadGameTexture(*value, m_library);
if (asset)
{
if (auto* value = std::get_if<std::string>(&*property.m_value))
{
auto asset = loader.LoadGameTexture(*value, m_library);
if (asset)
{
const auto loaded_time = asset->GetLastLoadedTime();
game_assets.push_back(VideoCommon::CachedAsset<VideoCommon::GameTextureAsset>{
std::move(asset), loaded_time});
m_texture_code_names.push_back(property.m_code_name);
}
}
const auto loaded_time = asset->GetLastLoadedTime();
game_assets.push_back(
VideoCommon::CachedAsset<VideoCommon::GameTextureAsset>{std::move(asset), loaded_time});
m_texture_code_names.push_back(property.m_code_name);
}
}
}