Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified Scripts/GenerateProjects.bat
100644 → 100755
Empty file.
14 changes: 7 additions & 7 deletions Sources/Overload/OvCore/src/OvCore/Resources/Material.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,31 +180,31 @@ void OvCore::Resources::Material::OnDeserialize(tinyxml2::XMLDocument& p_doc, ti

if constexpr (std::same_as<T, bool>)
{
SetProperty(propName, Serializer::DeserializeBoolean(p_doc, uniform, "value"));
TrySetProperty(propName, Serializer::DeserializeBoolean(p_doc, uniform, "value"));
}
else if constexpr (std::same_as<T, int>)
{
SetProperty(propName, Serializer::DeserializeInt(p_doc, uniform, "value"));
TrySetProperty(propName, Serializer::DeserializeInt(p_doc, uniform, "value"));
}
else if constexpr (std::same_as<T, float>)
{
SetProperty(propName, Serializer::DeserializeFloat(p_doc, uniform, "value"));
TrySetProperty(propName, Serializer::DeserializeFloat(p_doc, uniform, "value"));
}
else if constexpr (std::same_as<T, FVector2>)
{
SetProperty(propName, Serializer::DeserializeVec2(p_doc, uniform, "value"));
TrySetProperty(propName, Serializer::DeserializeVec2(p_doc, uniform, "value"));
}
else if constexpr (std::same_as<T, FVector3>)
{
SetProperty(propName, Serializer::DeserializeVec3(p_doc, uniform, "value"));
TrySetProperty(propName, Serializer::DeserializeVec3(p_doc, uniform, "value"));
}
else if constexpr (std::same_as<T, FVector4>)
{
SetProperty(propName, Serializer::DeserializeVec4(p_doc, uniform, "value"));
TrySetProperty(propName, Serializer::DeserializeVec4(p_doc, uniform, "value"));
}
else if constexpr (std::same_as<T, OvRendering::Resources::Texture*>)
{
SetProperty(propName, Serializer::DeserializeTexture(p_doc, uniform, "value"));
TrySetProperty(propName, Serializer::DeserializeTexture(p_doc, uniform, "value"));
}
// No need to handle TextureHandle* here as it's not serializable (only texture assets are)
};
Expand Down