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.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;