unified pbr shader

beaumanvienna · Jun 2, 2024 · 89feffc · 89feffc
1 parent 0fa4ca1
commit 89feffc
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 37 deletions.
diff --git a/engine/platform/Vulkan/material.h b/engine/platform/Vulkan/material.h
@@ -1,8 +1,5 @@
 /* Engine Copyright (c) 2024 Engine Development Team
    https://github.com/beaumanvienna/vulkan
-   *
-   * PBR rendering; parts of this code are based on https://learnopengl.com/PBR/Lighting
-   *
 
    Permission is hereby granted, free of charge, to any person
    obtaining a copy of this software and associated documentation files
@@ -24,14 +21,13 @@
    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
 
 // material
-#define GLSL_HAS_VERTEX_COLOR (0x1 << 0x0)
-#define GLSL_HAS_DIFFUSE_MAP (0x1 << 0x1)
-#define GLSL_HAS_NORMAL_MAP (0x1 << 0x2)
-#define GLSL_HAS_ROUGHNESS_MAP (0x1 << 0x3)
-#define GLSL_HAS_METALLIC_MAP (0x1 << 0x4)
-#define GLSL_HAS_ROUGHNESS_METALLIC_MAP (0x1 << 0x5)
-#define GLSL_HAS_EMISSIVE_COLOR (0x1 << 0x6)
-#define GLSL_HAS_EMISSIVE_MAP (0x1 << 0x7)
+#define GLSL_HAS_DIFFUSE_MAP (0x1 << 0x0)
+#define GLSL_HAS_NORMAL_MAP (0x1 << 0x1)
+#define GLSL_HAS_ROUGHNESS_MAP (0x1 << 0x2)
+#define GLSL_HAS_METALLIC_MAP (0x1 << 0x3)
+#define GLSL_HAS_ROUGHNESS_METALLIC_MAP (0x1 << 0x4)
+#define GLSL_HAS_EMISSIVE_COLOR (0x1 << 0x5)
+#define GLSL_HAS_EMISSIVE_MAP (0x1 << 0x6)
 
 // shader properties
 #define GLSL_HAS_SKELETAL_ANIMATION (0x1 << 0x0)

diff --git a/engine/platform/Vulkan/shaders/pbr.frag b/engine/platform/Vulkan/shaders/pbr.frag
@@ -105,15 +105,7 @@ void main()
     }
     else
     {
-        if (bool(push.m_Features & GLSL_HAS_VERTEX_COLOR))
-        {
-            col = vec4(fragColor.r, fragColor.g, fragColor.b, 1.0);
-        }
-        else
-        {
-            col = push.m_DiffuseColor;
-        }
-
+        col = vec4(fragColor.r, fragColor.g, fragColor.b, 1.0);
     }
     if (col.w < 0.5)
     {

diff --git a/engine/platform/Vulkan/shaders/pbrSA.frag b/engine/platform/Vulkan/shaders/pbrSA.frag
@@ -105,15 +105,7 @@ void main()
     }
     else
     {
-        if (bool(push.m_Features & GLSL_HAS_VERTEX_COLOR))
-        {
-            col = vec4(fragColor.r, fragColor.g, fragColor.b, 1.0);
-        }
-        else
-        {
-            col = push.m_DiffuseColor;
-        }
-
+        col = vec4(fragColor.r, fragColor.g, fragColor.b, 1.0);
     }
     if (col.w < 0.5)
     {

diff --git a/engine/platform/Vulkan/systems/VKpbrSys.cpp b/engine/platform/Vulkan/systems/VKpbrSys.cpp
@@ -95,7 +95,8 @@ namespace GfxRenderEngine
     {
         m_Pipeline->Bind(frameInfo.m_CommandBuffer);
 
-        auto view = registry.view<MeshComponent, TransformComponent, PbrMaterialTag, InstanceTag>(entt::exclude<SkeletalAnimationTag>);
+        auto view = registry.view<MeshComponent, TransformComponent, PbrMaterialTag, InstanceTag>(
+            entt::exclude<SkeletalAnimationTag>);
         for (auto mainInstance : view)
         {
             auto& mesh = view.get<MeshComponent>(mainInstance);

diff --git a/engine/renderer/builder/builder.cpp b/engine/renderer/builder/builder.cpp
@@ -198,7 +198,6 @@ namespace GfxRenderEngine
                 submesh.m_Material.m_PbrMaterial.m_Roughness = 0.5f;
                 submesh.m_Material.m_PbrMaterial.m_Metallic = 0.1f;
                 submesh.m_Material.m_PbrMaterial.m_NormalMapIntensity = 1.0f;
-                submesh.m_Material.m_PbrMaterial.m_Features = Material::HAS_VERTEX_COLOR;
 
                 { // create material descriptor
                     Material::MaterialTextures materialTextures;

diff --git a/engine/renderer/builder/fbxBuilder.cpp b/engine/renderer/builder/fbxBuilder.cpp
@@ -357,7 +357,8 @@ namespace GfxRenderEngine
                     if (texture)
                     {
                         materialTextures[Material::EMISSIVE_MAP_INDEX] = texture;
-                        pbrMaterial.m_Features |= Material::HAS_EMISSIVE_COLOR;
+                        pbrMaterial.m_Features |= Material::HAS_EMISSIVE_MAP;
+                        pbrMaterial.m_EmissiveColor = glm::vec3(1.0f);
                     }
                     break;
                 }
@@ -441,13 +442,13 @@ namespace GfxRenderEngine
 
             Material& material = m_Materials[materialIndex];
 
+            LoadProperties(fbxMaterial, material.m_PbrMaterial);
+
             LoadMap(fbxMaterial, aiTextureType_DIFFUSE, materialIndex);
             LoadMap(fbxMaterial, aiTextureType_NORMALS, materialIndex);
             LoadMap(fbxMaterial, aiTextureType_SHININESS, materialIndex);
             LoadMap(fbxMaterial, aiTextureType_METALNESS, materialIndex);
             LoadMap(fbxMaterial, aiTextureType_EMISSIVE, materialIndex);
-
-            LoadProperties(fbxMaterial, material.m_PbrMaterial);
         }
     }
 

diff --git a/engine/renderer/builder/ufbxBuilder.cpp b/engine/renderer/builder/ufbxBuilder.cpp
@@ -323,7 +323,7 @@ namespace GfxRenderEngine
                     float baseFactor = baseFactorMaterialMap.has_value ? baseFactorMaterialMap.value_real : 1.0f;
                     if (materialMap.texture)
                     {
-                        std::string filename(materialMap.texture->filename.data);
+                        std::string filename(materialMap.texture->absolute_filename.data);
                         materialTextures[Material::DIFFUSE_MAP_INDEX] = LoadTexture(filename, Texture::USE_SRGB);
                         pbrMaterial.m_Features |= Material::HAS_DIFFUSE_MAP;
                         pbrMaterial.m_DiffuseColor.r = baseFactor;
@@ -396,8 +396,9 @@ namespace GfxRenderEngine
                     std::string filename(materialMap.texture->filename.data);
                     materialTextures[Material::EMISSIVE_MAP_INDEX] = LoadTexture(filename, Texture::USE_SRGB);
                     pbrMaterial.m_Features |= Material::HAS_EMISSIVE_MAP;
+                    pbrMaterial.m_EmissiveColor = glm::vec3(1.0f);
                 }
-
+                else
                 {
                     glm::vec3 emissiveColor(materialMap.value_vec3.x, materialMap.value_vec3.y, materialMap.value_vec3.z);
                     pbrMaterial.m_EmissiveColor = emissiveColor;

diff --git a/engine/scene/material.h b/engine/scene/material.h
@@ -58,7 +58,6 @@ namespace GfxRenderEngine
 
         enum MaterialFeatures // bitset
         {
-            HAS_VERTEX_COLOR = GLSL_HAS_VERTEX_COLOR,
             HAS_DIFFUSE_MAP = GLSL_HAS_DIFFUSE_MAP,
             HAS_NORMAL_MAP = GLSL_HAS_NORMAL_MAP,
             HAS_ROUGHNESS_MAP = GLSL_HAS_ROUGHNESS_MAP,