feat : LDR Bloom 구현중

Author: devJSY

EngineCopy.bat

@@ -1,5 +1,5 @@
-xcopy /s /y  /exclude:exclude_list.txt ".\Project\Engine\*.h" ".\External\Include\Engine"
-xcopy /s /y  /exclude:exclude_list.txt ".\Project\Engine\*.inl" ".\External\Include\Engine"
-xcopy /s /y  /exclude:exclude_list.txt ".\Project\Engine\*.fx" ".\OutputFile\content\shader"
-xcopy /s /y  /exclude:exclude_list.txt ".\Project\Engine\*.hlsl" ".\OutputFile\content\shader"
-xcopy /s /y  /exclude:exclude_list.txt ".\Project\Engine\*.hlsli" ".\OutputFile\content\shader"
+xcopy /s /y  /exclude:Engine_exclude_list.txt ".\Project\Engine\*.h" ".\External\Include\Engine"
+xcopy /s /y  /exclude:Engine_exclude_list.txt ".\Project\Engine\*.inl" ".\External\Include\Engine"
+xcopy /s /y  /exclude:Engine_exclude_list.txt ".\Project\Engine\*.fx" ".\OutputFile\content\shader"
+xcopy /s /y  /exclude:Engine_exclude_list.txt ".\Project\Engine\*.hlsl" ".\OutputFile\content\shader"
+xcopy /s /y  /exclude:Engine_exclude_list.txt ".\Project\Engine\*.hlsli" ".\OutputFile\content\shader"

exclude_list.txt Engine_exclude_list.txt

@@ -46,10 +46,17 @@ class CRenderMgr : public CSingleton<CRenderMgr>
     CGameObject* m_PostEffectObj;
 
     // Post Process
-    int bloomLevels;
-    vector<Ptr<CTexture>> m_BloomTextures;
-    vector<CGameObject*> m_BloomDownFilters;
-    vector<CGameObject*> m_BloomUpFilters;
+    int m_bloomLevels;
+
+    vector<Ptr<CTexture>> m_BloomTextures_LDRI;
+    CGameObject* m_SamplingObj;
+    CGameObject* m_BlurXObj;
+    CGameObject* m_BlurYObj;
+    CGameObject* m_CombineObj;
+
+    vector<Ptr<CTexture>> m_BloomTextures_HDRI;
+    vector<CGameObject*> m_BloomDownFilters_HDRI; // 객체하나로 수정 필요
+    vector<CGameObject*> m_BloomUpFilters_HDRI; // 객체하나로 수정 필요
     CGameObject* m_ToneMappingObj;
 
     // Render function pointer
@@ -87,8 +94,8 @@ class CRenderMgr : public CSingleton<CRenderMgr>
     void Clear_Buffers(const Vec4& Color);
 
     void CopyRTTexToRTCopyTex();
-    void CopyToPostProcessTex_HDRI();
     void CopyToPostProcessTex_LDRI();
+    void CopyToPostProcessTex_HDRI();
     void Resize(Vec2 Resolution);
 
     Ptr<CTexture> GetRTCopyTex() const { return m_RTCopyTex; }
@@ -106,7 +113,8 @@ class CRenderMgr : public CSingleton<CRenderMgr>
     void CreateBloomTextures(Vec2 Resolution);
 
 public:
-    void render_postprocess();
+    void render_postprocess_LDRI();
+    void render_postprocess_HDRI();
 
 private:
     void render_play();

External/Include/Engine/CRenderMgr.h

@@ -1,3 +1,3 @@
-xcopy /s /y  /exclude:exclude_list.txt ".\External\Library\assimp\*.dll" ".\OutputFile\bin"
-xcopy /s /y  /exclude:exclude_list.txt ".\External\Library\FMOD\*.dll" ".\OutputFile\bin"
-xcopy /s /y  /exclude:exclude_list.txt ".\External\Library\FontEngine\*.dll" ".\OutputFile\bin"
+xcopy /s /y  /exclude:Engine_exclude_list.txt ".\External\Library\assimp\*.dll" ".\OutputFile\bin"
+xcopy /s /y  /exclude:Engine_exclude_list.txt ".\External\Library\FMOD\*.dll" ".\OutputFile\bin"
+xcopy /s /y  /exclude:Engine_exclude_list.txt ".\External\Library\FontEngine\*.dll" ".\OutputFile\bin"

External/Library/Engine/2D_OutLinePS.cso

@@ -7,12 +7,18 @@ static const float weights[5] = { 0.0545, 0.2442, 0.4026, 0.2442, 0.0545 };
 float4 main(PS_IN input) : SV_TARGET
 {
     float3 color = float3(0.f, 0.f, 0.f);
-    float dx = 1.0 / g_RenderResolution.x;
-    float dy = 1.0 / g_RenderResolution.y;
+    float width;
+    float height;
+    g_tex_0.GetDimensions(width, height);
+    float dx = 1.0 / width;
+    float dy = 1.0 / height;
+    
+    //float dx = 1.0 / g_RenderResolution.x;
+    //float dy = 1.0 / g_RenderResolution.y;
 
     for (int i = 0; i < 5; i++)
     {
-        color += weights[i] * g_postprocess_Tex.Sample(g_PointSampler, input.vUV + (float2(dx, 0.0) * float(i - 2))).rgb;
+        color += weights[i] * g_tex_0.Sample(g_LinearClampSampler, input.vUV + (float2(dx, 0.0) * float(i - 2))).rgb;
     }
 
     return float4(color, 1.f);

External/Library/Engine/2D_OutLineVS.cso

@@ -7,12 +7,18 @@ static const float weights[5] = { 0.0545, 0.2442, 0.4026, 0.2442, 0.0545 };
 float4 main(PS_IN input) : SV_TARGET
 {
     float3 color = float3(0.f, 0.f, 0.f);
-    float dx = 1.0 / g_RenderResolution.x;
-    float dy = 1.0 / g_RenderResolution.y;
+    float width;
+    float height;
+    g_tex_0.GetDimensions(width, height);
+    float dx = 1.0 / width;
+    float dy = 1.0 / height;
+    
+    //float dx = 1.0 / g_RenderResolution.x;
+    //float dy = 1.0 / g_RenderResolution.y;
 
     for (int i = 0; i < 5; i++)
     {
-        color += weights[i] * g_postprocess_Tex.Sample(g_PointSampler, input.vUV + (float2(0.0, dy) * float(i - 2))).rgb;
+        color += weights[i] * g_tex_0.Sample(g_LinearClampSampler, input.vUV + (float2(0.0, dy) * float(i - 2))).rgb;
     }
 
     return float4(color, 1.f);

External/Library/Engine/3D_OutLinePS.cso

@@ -489,21 +489,41 @@ void CAssetMgr::CreateDefaultGraphicsShader()
         AddAsset(L"IDMapShader", pShader);
     }
 
+    // =================================
+    // Sampling Shader
+    // =================================
+    {
+        Ptr<CGraphicsShader> pShader = new CGraphicsShader;
+        pShader->CreateVertexShader(L"shader\\postprocessVS.hlsl", "main");
+        pShader->CreatePixelShader(L"shader\\SamplingPS.hlsl", "main");
+
+        pShader->SetRSType(RS_TYPE::CULL_BACK);
+        pShader->SetDSType(DS_TYPE::NO_TEST_NO_WRITE);
+
+        pShader->SetDomain(SHADER_DOMAIN::DOMAIN_POSTPROCESS);
+
+        pShader->AddScalarParam(FLOAT_0, "Threshold");
+
+        pShader->AddTexParam(TEX_0, "Sampling Texture");
+
+        pShader->SetName(L"SamplingShader");
+        AddAsset(L"SamplingShader", pShader);
+    }
+
     // =================================
     // Combine Shader
     // =================================
     {
         Ptr<CGraphicsShader> pShader = new CGraphicsShader;
         pShader->CreateVertexShader(L"shader\\postprocessVS.hlsl", "main");
-        pShader->CreatePixelShader(L"shader\\Combine.hlsl", "main");
+        pShader->CreatePixelShader(L"shader\\CombinePS.hlsl", "main");
 
         pShader->SetRSType(RS_TYPE::CULL_BACK);
         pShader->SetDSType(DS_TYPE::NO_TEST_NO_WRITE);
 
         pShader->SetDomain(SHADER_DOMAIN::DOMAIN_POSTPROCESS);
 
         pShader->AddScalarParam(FLOAT_0, "Strength");
-        pShader->AddScalarParam(FLOAT_1, "Threshold");
 
         pShader->AddTexParam(TEX_0, "Render Texture");
         pShader->AddTexParam(TEX_1, "Bloom Texture");
@@ -843,12 +863,20 @@ void CAssetMgr::CreateDefaultMaterial()
         AddAsset<CMaterial>(L"SpotLightMtrl", pMtrl);
     }
 
+    // Sampling
+    {
+        Ptr<CMaterial> pMtrl = new CMaterial(true);
+        pMtrl->SetShader(FindAsset<CGraphicsShader>(L"SamplingShader"));
+        pMtrl->SetScalarParam(FLOAT_1, 0.5f); // Threshold
+        pMtrl->SetName(L"SamplingMtrl");
+        AddAsset<CMaterial>(L"SamplingMtrl", pMtrl);
+    }
+
     // Combine
     {
         Ptr<CMaterial> pMtrl = new CMaterial(true);
         pMtrl->SetShader(FindAsset<CGraphicsShader>(L"CombineShader"));
-        pMtrl->SetScalarParam(FLOAT_0, 1.f);  // Strength
-        pMtrl->SetScalarParam(FLOAT_1, 0.5f); // Threshold
+        pMtrl->SetScalarParam(FLOAT_0, 0.f); // Strength
         pMtrl->SetName(L"CombineMtrl");
         AddAsset<CMaterial>(L"CombineMtrl", pMtrl);
     }

External/Library/Engine/3D_OutLineVS.cso

@@ -197,12 +197,13 @@ void CCamera::render()
         // 후처리
         CDevice::GetInst()->SetFloatRenderTarget();
         render_postprocess_HDRI();
-        CRenderMgr::GetInst()->render_postprocess();
+        CRenderMgr::GetInst()->render_postprocess_HDRI();
     }
     else
     {
         CDevice::GetInst()->SetRenderTarget();
         render_postprocess_LDRI();
+        CRenderMgr::GetInst()->render_postprocess_LDRI();
     }
 
     // Clear