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/SceneCore/DataTypes/GraphData/IMaterialData.h
+9 -9
View File
@@ -87,15 +87,15 @@ namespace AZ
virtual float GetOpacity() const = 0;
virtual float GetShininess() const = 0;
virtual bool GetUseColorMap() const = 0;
virtual const AZ::Vector3& GetBaseColor() const = 0;
virtual bool GetUseMetallicMap() const = 0;
virtual float GetMetallicFactor() const = 0;
virtual bool GetUseRoughnessMap() const = 0;
virtual float GetRoughnessFactor() const = 0;
virtual bool GetUseEmissiveMap() const = 0;
virtual float GetEmissiveIntensity() const = 0;
virtual bool GetUseAOMap() const = 0;
virtual AZStd::optional<bool> GetUseColorMap() const = 0;
virtual AZStd::optional<AZ::Vector3> GetBaseColor() const = 0;
virtual AZStd::optional<bool> GetUseMetallicMap() const = 0;
virtual AZStd::optional<float> GetMetallicFactor() const = 0;
virtual AZStd::optional<bool> GetUseRoughnessMap() const = 0;
virtual AZStd::optional<float> GetRoughnessFactor() const = 0;
virtual AZStd::optional<bool> GetUseEmissiveMap() const = 0;
virtual AZStd::optional<float> GetEmissiveIntensity() const = 0;
virtual AZStd::optional<bool> GetUseAOMap() const = 0;
virtual uint64_t GetUniqueId() const = 0;
};
Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneBehaviorTests.cpp
+2 -1
View File
@@ -367,7 +367,8 @@ namespace AZ
MOCK_METHOD0(GetSerializeContext, AZ::SerializeContext* ());
MOCK_METHOD0(GetJsonRegistrationContext, AZ::JsonRegistrationContext* ());
MOCK_METHOD0(GetBehaviorContext, AZ::BehaviorContext* ());
MOCK_CONST_METHOD0(GetAppRoot, const char* ());
MOCK_CONST_METHOD0(GetAppRoot, const char*());
MOCK_CONST_METHOD0(GetEngineRoot, const char*());
MOCK_CONST_METHOD0(GetExecutableFolder, const char* ());
MOCK_METHOD0(GetDrillerManager, AZ::Debug::DrillerManager* ());
MOCK_CONST_METHOD1(QueryApplicationType, void(AZ::ApplicationTypeQuery&));
Code/Tools/SceneAPI/SceneCore/Utilities/DebugOutput.cpp
+35
View File
@@ -72,6 +72,41 @@ namespace AZ::SceneAPI::Utilities
m_output += AZStd::string::format("\t%s: <% f, % f, % f>\n", name, data.GetX(), data.GetY(), data.GetZ());
}
void DebugOutput::Write(const char* name, AZStd::optional<bool> data)
{
if (data.has_value())
{
Write(name, data.value());
}
else
{
Write(name, "Not set");
}
}
void DebugOutput::Write(const char* name, AZStd::optional<float> data)
{
if (data.has_value())
{
Write(name, data.value());
}
else
{
Write(name, "Not set");
}
}
void DebugOutput::Write(const char* name, AZStd::optional<AZ::Vector3> data)
{
if (data.has_value())
{
Write(name, data.value());
}
else
{
Write(name, "Not set");
}
}
const AZStd::string& DebugOutput::GetOutput() const
{
return m_output;
Code/Tools/SceneAPI/SceneCore/Utilities/DebugOutput.h
+3
View File
@@ -36,6 +36,9 @@ namespace AZ::SceneAPI::Utilities
SCENE_CORE_API void Write(const char* name, const DataTypes::MatrixType& data);
SCENE_CORE_API void Write(const char* name, bool data);
SCENE_CORE_API void Write(const char* name, Vector3 data);
SCENE_CORE_API void Write(const char* name, AZStd::optional<bool> data);
SCENE_CORE_API void Write(const char* name, AZStd::optional<float> data);
SCENE_CORE_API void Write(const char* name, AZStd::optional<AZ::Vector3> data);
SCENE_CORE_API const AZStd::string& GetOutput() const;