birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating latest from github/staging

Browse Source 
Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.cpp
+18 -18
View File
@@ -144,92 +144,92 @@ namespace AZ
return m_shininess;
}
void MaterialData::SetUseColorMap(bool useColorMap)
void MaterialData::SetUseColorMap(AZStd::optional<bool> useColorMap)
{
m_useColorMap = useColorMap;
}
bool MaterialData::GetUseColorMap() const
AZStd::optional<bool> MaterialData::GetUseColorMap() const
{
return m_useColorMap;
}
void MaterialData::SetBaseColor(const AZ::Vector3& baseColor)
void MaterialData::SetBaseColor(const AZStd::optional<AZ::Vector3>& baseColor)
{
m_baseColor = baseColor;
}
const AZ::Vector3& MaterialData::GetBaseColor() const
AZStd::optional<AZ::Vector3> MaterialData::GetBaseColor() const
{
return m_baseColor;
}
void MaterialData::SetUseMetallicMap(bool useMetallicMap)
void MaterialData::SetUseMetallicMap(AZStd::optional<bool> useMetallicMap)
{
m_useMetallicMap = useMetallicMap;
}
bool MaterialData::GetUseMetallicMap() const
AZStd::optional<bool> MaterialData::GetUseMetallicMap() const
{
return m_useMetallicMap;
}
void MaterialData::SetMetallicFactor(float metallicFactor)
void MaterialData::SetMetallicFactor(AZStd::optional<float> metallicFactor)
{
m_metallicFactor = metallicFactor;
}
float MaterialData::GetMetallicFactor() const
AZStd::optional<float> MaterialData::GetMetallicFactor() const
{
return m_metallicFactor;
}
void MaterialData::SetUseRoughnessMap(bool useRoughnessMap)
void MaterialData::SetUseRoughnessMap(AZStd::optional<bool> useRoughnessMap)
{
m_useRoughnessMap = useRoughnessMap;
}
bool MaterialData::GetUseRoughnessMap() const
AZStd::optional<bool> MaterialData::GetUseRoughnessMap() const
{
return m_useRoughnessMap;
}
void MaterialData::SetRoughnessFactor(float roughnessFactor)
void MaterialData::SetRoughnessFactor(AZStd::optional<float> roughnessFactor)
{
m_roughnessFactor = roughnessFactor;
}
float MaterialData::GetRoughnessFactor() const
AZStd::optional<float> MaterialData::GetRoughnessFactor() const
{
return m_roughnessFactor;
}
void MaterialData::SetUseEmissiveMap(bool useEmissiveMap)
void MaterialData::SetUseEmissiveMap(AZStd::optional<bool> useEmissiveMap)
{
m_useEmissiveMap = useEmissiveMap;
}
bool MaterialData::GetUseEmissiveMap() const
AZStd::optional<bool> MaterialData::GetUseEmissiveMap() const
{
return m_useEmissiveMap;
}
void MaterialData::SetEmissiveIntensity(float emissiveIntensity)
void MaterialData::SetEmissiveIntensity(AZStd::optional<float> emissiveIntensity)
{
m_emissiveIntensity = emissiveIntensity;
}
float MaterialData::GetEmissiveIntensity() const
AZStd::optional<float> MaterialData::GetEmissiveIntensity() const
{
return m_emissiveIntensity;
}
void MaterialData::SetUseAOMap(bool useAOMap)
void MaterialData::SetUseAOMap(AZStd::optional<bool> useAOMap)
{
m_useAOMap = useAOMap;
}
bool MaterialData::GetUseAOMap() const
AZStd::optional<bool> MaterialData::GetUseAOMap() const
{
return m_useAOMap;
}
Code/Tools/SceneAPI/SceneData/GraphData/MaterialData.h
+27 -27
View File
@@ -47,15 +47,15 @@ namespace AZ
SCENE_DATA_API virtual void SetOpacity(float opacity);
SCENE_DATA_API virtual void SetShininess(float shininess);
SCENE_DATA_API virtual void SetUniqueId(uint64_t uid);
SCENE_DATA_API virtual void SetUseColorMap(bool useColorMap);
SCENE_DATA_API virtual void SetBaseColor(const AZ::Vector3& baseColor);
SCENE_DATA_API virtual void SetUseMetallicMap(bool useMetallicMap);
SCENE_DATA_API virtual void SetMetallicFactor(float metallicFactor);
SCENE_DATA_API virtual void SetUseRoughnessMap(bool useRoughnessMap);
SCENE_DATA_API virtual void SetRoughnessFactor(float roughnessFactor);
SCENE_DATA_API virtual void SetUseEmissiveMap(bool useEmissiveMap);
SCENE_DATA_API virtual void SetEmissiveIntensity(float emissiveIntensity);
SCENE_DATA_API virtual void SetUseAOMap(bool useAOMap);
SCENE_DATA_API virtual void SetUseColorMap(AZStd::optional<bool> useColorMap);
SCENE_DATA_API virtual void SetBaseColor(const AZStd::optional<AZ::Vector3>& baseColor);
SCENE_DATA_API virtual void SetUseMetallicMap(AZStd::optional<bool> useMetallicMap);
SCENE_DATA_API virtual void SetMetallicFactor(AZStd::optional<float> metallicFactor);
SCENE_DATA_API virtual void SetUseRoughnessMap(AZStd::optional<bool> useRoughnessMap);
SCENE_DATA_API virtual void SetRoughnessFactor(AZStd::optional<float> roughnessFactor);
SCENE_DATA_API virtual void SetUseEmissiveMap(AZStd::optional<bool> useEmissiveMap);
SCENE_DATA_API virtual void SetEmissiveIntensity(AZStd::optional<float> emissiveIntensity);
SCENE_DATA_API virtual void SetUseAOMap(AZStd::optional<bool> useAOMap);
SCENE_DATA_API const AZStd::string& GetTexture(TextureMapType mapType) const override;
@@ -67,15 +67,15 @@ namespace AZ
SCENE_DATA_API float GetOpacity() const override;
SCENE_DATA_API float GetShininess() const override;
SCENE_DATA_API uint64_t GetUniqueId() const override;
SCENE_DATA_API bool GetUseColorMap() const override;
SCENE_DATA_API const AZ::Vector3& GetBaseColor() const override;
SCENE_DATA_API bool GetUseMetallicMap() const override;
SCENE_DATA_API float GetMetallicFactor() const override;
SCENE_DATA_API bool GetUseRoughnessMap() const override;
SCENE_DATA_API float GetRoughnessFactor() const override;
SCENE_DATA_API bool GetUseEmissiveMap() const override;
SCENE_DATA_API float GetEmissiveIntensity() const override;
SCENE_DATA_API bool GetUseAOMap() const override;
SCENE_DATA_API AZStd::optional<bool> GetUseColorMap() const override;
SCENE_DATA_API AZStd::optional<AZ::Vector3> GetBaseColor() const override;
SCENE_DATA_API AZStd::optional<bool> GetUseMetallicMap() const override;
SCENE_DATA_API AZStd::optional<float> GetMetallicFactor() const override;
SCENE_DATA_API AZStd::optional<bool> GetUseRoughnessMap() const override;
SCENE_DATA_API AZStd::optional<float> GetRoughnessFactor() const override;
SCENE_DATA_API AZStd::optional<bool> GetUseEmissiveMap() const override;
SCENE_DATA_API AZStd::optional<float> GetEmissiveIntensity() const override;
SCENE_DATA_API AZStd::optional<bool> GetUseAOMap() const override;
static void Reflect(ReflectContext* context);
@@ -85,18 +85,18 @@ namespace AZ
AZ::Vector3 m_diffuseColor;
AZ::Vector3 m_specularColor;
AZ::Vector3 m_emissiveColor;
AZ::Vector3 m_baseColor;
AZStd::optional<AZ::Vector3> m_baseColor;
float m_opacity;
float m_shininess;
float m_metallicFactor = 0.0f;
float m_roughnessFactor = 0.0f;
float m_emissiveIntensity = 0.0f;
AZStd::optional<float> m_metallicFactor = AZStd::nullopt;
AZStd::optional<float> m_roughnessFactor = AZStd::nullopt;
AZStd::optional<float> m_emissiveIntensity = AZStd::nullopt;
bool m_useColorMap = false;
bool m_useMetallicMap = false;
bool m_useRoughnessMap = false;
bool m_useEmissiveMap = false;
bool m_useAOMap = false;
AZStd::optional<bool> m_useColorMap = AZStd::nullopt;
AZStd::optional<bool> m_useMetallicMap = AZStd::nullopt;
AZStd::optional<bool> m_useRoughnessMap = AZStd::nullopt;
AZStd::optional<bool> m_useEmissiveMap = AZStd::nullopt;
AZStd::optional<bool> m_useAOMap = AZStd::nullopt;
bool m_isNoDraw;
Code/Tools/SceneAPI/SceneData/GraphData/SkinWeightData.cpp
+13
View File
@@ -66,6 +66,19 @@ namespace AZ
m_vertexLinks[vertexIndex].push_back(link);
}
bool CompareLinks(const SceneAPI::DataTypes::ISkinWeightData::Link& left, const SceneAPI::DataTypes::ISkinWeightData::Link& right)
{
// sort highest to lowest
return left.weight >= right.weight;
}
void SkinWeightData::AddAndSortLink(size_t vertexIndex, const SceneAPI::DataTypes::ISkinWeightData::Link& link)
{
AZ_Assert(vertexIndex < m_vertexLinks.size(), "Invalid vertex index %i for skin weight data links.", vertexIndex);
m_vertexLinks[vertexIndex].insert(
AZStd::lower_bound(m_vertexLinks[vertexIndex].begin(), m_vertexLinks[vertexIndex].end(), link, CompareLinks), link);
}
int SkinWeightData::GetBoneId(const AZStd::string& boneName)
{
if (m_boneNameIdMap.find(boneName) == m_boneNameIdMap.end())
Code/Tools/SceneAPI/SceneData/GraphData/SkinWeightData.h
+1
View File
@@ -41,6 +41,7 @@ namespace AZ
SCENE_DATA_API void ResizeContainerSpace(size_t size);
SCENE_DATA_API void AppendLink(size_t vertexIndex, const SceneAPI::DataTypes::ISkinWeightData::Link& link);
SCENE_DATA_API void AddAndSortLink(size_t vertexIndex, const SceneAPI::DataTypes::ISkinWeightData::Link& link);
SCENE_DATA_API int GetBoneId(const AZStd::string& boneName);