Broken build.

* Incorporating std variant into pbrmaterial to help with alphamask variations.

Author: htmlboss

MP-APS/.vs/MP-APS/v15/.suo

@@ -228,6 +228,7 @@ void RenderSystem::renderModelsWithTextures(GLShaderProgram& shader, const std::
 			glBindTexture(GL_TEXTURE_2D, mesh.Material->GetParameterTexture(PBRMaterial::METALLIC));
 			glActiveTexture(GL_TEXTURE6);
 			glBindTexture(GL_TEXTURE_2D, mesh.Material->GetParameterTexture(PBRMaterial::ROUGHNESS));
+			
 			//glActiveTexture(GL_TEXTURE7);
 			//glBindTexture(GL_TEXTURE_2D, mesh.Material.AOMap);
 

MP-APS/.vs/MP-APS/v15/Browse.VC.db

@@ -2,6 +2,13 @@
 
 #include "ResourceManager.h"
 
+/***********************************************************************************/
+PBRMaterial::PBRMaterial() {
+	// Set material defaults
+	std::fill(m_materialTextures.begin(), m_materialTextures.end(), 0);
+	std::fill(m_materialColors.begin(), m_materialColors.end(), glm::vec3(0.0f));
+}
+
 /***********************************************************************************/
 void PBRMaterial::Init(const std::string_view name, 
 					const std::string_view albedoPath, 
@@ -18,7 +25,28 @@ void PBRMaterial::Init(const std::string_view name,
 	m_materialTextures[METALLIC] = ResourceManager::GetInstance().LoadTexture(metallicPath);
 	m_materialTextures[NORMAL] = ResourceManager::GetInstance().LoadTexture(normalPath);
 	m_materialTextures[ROUGHNESS] = ResourceManager::GetInstance().LoadTexture(roughnessPath);
-	m_materialTextures[ALPHA] = ResourceManager::GetInstance().LoadTexture(alphaMaskPath);
+	
+	m_alpha = ResourceManager::GetInstance().LoadTexture(alphaMaskPath);
+}
+
+/***********************************************************************************/
+void PBRMaterial::Init(const std::string_view name,
+					const glm::vec3& albedo,
+					const glm::vec3& ao, 
+					const glm::vec3& metallic,
+					const glm::vec3& normal, 
+					const glm::vec3& roughness, 
+					const float alpha)
+{
+	Name = name;
+
+	m_materialColors[ALBEDO] = albedo;
+	m_materialColors[AO] = ao;
+	m_materialColors[METALLIC] = metallic;
+	m_materialColors[NORMAL] = normal;
+	m_materialColors[ROUGHNESS] = roughness;
+
+	m_alpha = alpha;
 }
 
 /***********************************************************************************/
@@ -27,6 +55,6 @@ unsigned int PBRMaterial::GetParameterTexture(const ParameterType parameter) con
 }
 
 /***********************************************************************************/
-float PBRMaterial::GetParameterColor(const ParameterType parameter) const noexcept {
+glm::vec3 PBRMaterial::GetParameterColor(const ParameterType parameter) const noexcept {
 	return m_materialColors[parameter];
 }

MP-APS/Core/RenderSystem.cpp

@@ -1,20 +1,22 @@
 #pragma once
 
+#include <glm/vec3.hpp>
+
 #include <memory>
 #include <array>
+#include <variant>
 
 // Material for a PBR pipeline
 class PBRMaterial {
-
 public:
+	PBRMaterial();
 
 	enum ParameterType {
 		ALBEDO = 0,
 		AO,
 		METALLIC,
 		NORMAL,
-		ROUGHNESS,
-		ALPHA
+		ROUGHNESS
 	};
 
 	void Init(const std::string_view name,
@@ -25,20 +27,33 @@ class PBRMaterial {
 		const std::string_view roughnessPath,
 		const std::string_view alphaMaskPath);
 
+	void Init(const std::string_view name,
+		const glm::vec3& albedo,
+		const glm::vec3& ao,
+		const glm::vec3& metallic,
+		const glm::vec3& normal,
+		const glm::vec3& roughness,
+		const float alpha = 1.0f);
+
 	auto operator==(const PBRMaterial& rhs) const noexcept {
 		return Name == rhs.Name;
 	}
 
 	std::string_view Name;
 
 	unsigned int GetParameterTexture(const ParameterType parameter) const noexcept;
-	float GetParameterColor(const ParameterType parameter) const noexcept;
+	glm::vec3 GetParameterColor(const ParameterType parameter) const noexcept;
+
+	// Gets active alpha texture/value from union
+	auto GetAlpha() const noexcept;
 
 private:
+	std::variant<unsigned int, float> m_alpha;
+
 	// unsigned int HeightMap;
 
-	std::array<unsigned int, 6> m_materialTextures;
-	std::array<float, 6> m_materialColors;
+	std::array<unsigned int, 5> m_materialTextures;
+	std::array<glm::vec3, 5> m_materialColors;
 };
 
 using PBRMaterialPtr = std::shared_ptr<PBRMaterial>;