Reworked PBRMaterial to support textures and raw colours.

Author: htmlboss

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

@@ -221,13 +221,13 @@ void RenderSystem::renderModelsWithTextures(GLShaderProgram& shader, const std::
 const auto meshes = model->GetMeshes();
 for (const auto& mesh : meshes) {
 glActiveTexture(GL_TEXTURE3);
-glBindTexture(GL_TEXTURE_2D, mesh.Material->AlbedoMap);
+glBindTexture(GL_TEXTURE_2D, mesh.Material->GetParameterTexture(PBRMaterial::ALBEDO));
 glActiveTexture(GL_TEXTURE4);
-glBindTexture(GL_TEXTURE_2D, mesh.Material->NormalMap);
+glBindTexture(GL_TEXTURE_2D, mesh.Material->GetParameterTexture(PBRMaterial::NORMAL));
 glActiveTexture(GL_TEXTURE5);
-glBindTexture(GL_TEXTURE_2D, mesh.Material->MetallicMap);
+glBindTexture(GL_TEXTURE_2D, mesh.Material->GetParameterTexture(PBRMaterial::METALLIC));
 glActiveTexture(GL_TEXTURE6);
-glBindTexture(GL_TEXTURE_2D, mesh.Material->RoughnessMap);
+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

@@ -9,13 +9,24 @@ void PBRMaterial::Init(const std::string_view name,
 const std::string_view metallicPath, 
 const std::string_view normalPath,
 const std::string_view roughnessPath,
-const std::string_view alphaMaskPath) {
+const std::string_view alphaMaskPath) 
+{
 Name = name;
 
-AlbedoMap = ResourceManager::GetInstance().LoadTexture(albedoPath);
-AOMap = ResourceManager::GetInstance().LoadTexture(aoPath);
-MetallicMap = ResourceManager::GetInstance().LoadTexture(metallicPath);
-NormalMap = ResourceManager::GetInstance().LoadTexture(normalPath);
-RoughnessMap = ResourceManager::GetInstance().LoadTexture(roughnessPath);
-AlphaMask = ResourceManager::GetInstance().LoadTexture(alphaMaskPath);
+m_materialTextures[ALBEDO] = ResourceManager::GetInstance().LoadTexture(albedoPath);
+m_materialTextures[AO] = ResourceManager::GetInstance().LoadTexture(aoPath);
+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);
+}
+
+/***********************************************************************************/
+unsigned int PBRMaterial::GetParameterTexture(const ParameterType parameter) const noexcept {
+return m_materialTextures[parameter];
+}
+
+/***********************************************************************************/
+float PBRMaterial::GetParameterColor(const ParameterType parameter) const noexcept {
+return m_materialColors[parameter];
 }

MP-APS/Core/RenderSystem.cpp

@@ -1,10 +1,21 @@
 #pragma once
 
-#include <string_view>
 #include <memory>
+#include <array>
 
 // Material for a PBR pipeline
-struct PBRMaterial {
+class PBRMaterial {
+
+public:
+
+enum ParameterType {
+ALBEDO = 0,
+AO,
+METALLIC,
+NORMAL,
+ROUGHNESS,
+ALPHA
+};
 
 void Init(const std::string_view name,
 const std::string_view albedoPath,
@@ -20,13 +31,14 @@ struct PBRMaterial {
 
 std::string_view Name;
 
-unsigned int AlbedoMap;
-unsigned int AOMap;
-unsigned int MetallicMap;
-unsigned int NormalMap;
-unsigned int RoughnessMap;
-unsigned int AlphaMask;
+unsigned int GetParameterTexture(const ParameterType parameter) const noexcept;
+float GetParameterColor(const ParameterType parameter) const noexcept;
+
+private:
 // unsigned int HeightMap;
+
+std::array<unsigned int, 6> m_materialTextures;
+std::array<float, 6> m_materialColors;
 };
 
 using PBRMaterialPtr = std::shared_ptr<PBRMaterial>;

MP-APS/PBRMaterial.cpp

@@ -4,6 +4,7 @@
 #include <sstream>
 #include <fstream>
 #include <cassert>
+#include <string_view>
 
 #define STB_IMAGE_IMPLEMENTATION
 #define STBI_FAILURE_USERMSG

MP-APS/PBRMaterial.h

@@ -4,6 +4,8 @@
 #include "ViewFrustum.h"
 
 #include <ppl.h> // Concurrency library
+
+#include <string_view>
 #include <iostream>
 
 /***********************************************************************************/