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/SDKWrapper/AssImpMaterialWrapper.h
+9 -9
View File
@@ -33,15 +33,15 @@ namespace AZ
float GetShininess() const override;
AZStd::string GetTextureFileName(MaterialMapType textureType) const override;
bool GetUseColorMap() const;
AZ::Vector3 GetBaseColor() const;
bool GetUseMetallicMap() const;
float GetMetallicFactor() const;
bool GetUseRoughnessMap() const;
float GetRoughnessFactor() const;
bool GetUseEmissiveMap() const;
float GetEmissiveIntensity() const;
bool GetUseAOMap() const;
AZStd::optional<bool> GetUseColorMap() const;
AZStd::optional<AZ::Vector3> GetBaseColor() const;
AZStd::optional<bool> GetUseMetallicMap() const;
AZStd::optional<float> GetMetallicFactor() const;
AZStd::optional<bool> GetUseRoughnessMap() const;
AZStd::optional<float> GetRoughnessFactor() const;
AZStd::optional<bool> GetUseEmissiveMap() const;
AZStd::optional<float> GetEmissiveIntensity() const;
AZStd::optional<bool> GetUseAOMap() const;
};
} // namespace AssImpSDKWrapper
}// namespace AZ