Add material loading for tools materials

This commit is contained in:
Jan
2022-08-07 12:06:02 +02:00
parent f87039d324
commit 713eb77230
3 changed files with 111 additions and 2 deletions

View File

@ -79,3 +79,66 @@ float AbstractGdtEntryReader::ReadFloatProperty(const std::string& propertyName,
return result;
}
Vector2f AbstractGdtEntryReader::ReadVec2Property(const std::string& propertyName, const Vector2f defaultValue) const
{
const auto foundProperty = m_entry.m_properties.find(propertyName);
if (foundProperty == m_entry.m_properties.end())
return defaultValue;
std::istringstream iss(foundProperty->second);
Vector2f result;
iss >> result(0) >> result(1);
if (iss.fail())
{
std::ostringstream oss;
oss << "\"" << foundProperty->second << "\" is not a valid vec2 value";
throw GdtReadingException(oss.str());
}
return result;
}
Vector3f AbstractGdtEntryReader::ReadVec3Property(const std::string& propertyName, const Vector3f defaultValue) const
{
const auto foundProperty = m_entry.m_properties.find(propertyName);
if (foundProperty == m_entry.m_properties.end())
return defaultValue;
std::istringstream iss(foundProperty->second);
Vector3f result;
iss >> result(0) >> result(1) >> result(2);
if (iss.fail())
{
std::ostringstream oss;
oss << "\"" << foundProperty->second << "\" is not a valid vec3 value";
throw GdtReadingException(oss.str());
}
return result;
}
Vector4f AbstractGdtEntryReader::ReadVec4Property(const std::string& propertyName, const Vector4f defaultValue) const
{
const auto foundProperty = m_entry.m_properties.find(propertyName);
if (foundProperty == m_entry.m_properties.end())
return defaultValue;
std::istringstream iss(foundProperty->second);
Vector4f result;
iss >> result(0) >> result(1) >> result(2) >> result(3);
if (iss.fail())
{
std::ostringstream oss;
oss << "\"" << foundProperty->second << "\" is not a valid vec4 value";
throw GdtReadingException(oss.str());
}
return result;
}

View File

@ -2,6 +2,7 @@
#include <exception>
#include "Math/Vector.h"
#include "Utils/ClassUtils.h"
#include "Obj/Gdt/GdtEntry.h"
@ -24,6 +25,9 @@ protected:
_NODISCARD bool ReadBoolProperty(const std::string& propertyName, bool defaultValue = false) const;
_NODISCARD int ReadIntegerProperty(const std::string& propertyName, int defaultValue = 0) const;
_NODISCARD float ReadFloatProperty(const std::string& propertyName, float defaultValue = 0.0f) const;
_NODISCARD Vector2f ReadVec2Property(const std::string& propertyName, Vector2f defaultValue = {}) const;
_NODISCARD Vector3f ReadVec3Property(const std::string& propertyName, Vector3f defaultValue = {}) const;
_NODISCARD Vector4f ReadVec4Property(const std::string& propertyName, Vector4f defaultValue = {}) const;
const GdtEntry& m_entry;
};