Skip to content

Commit d434abd

Browse files
committed
feat : LDR Bloom 구현중
1 parent 0b007c0 commit d434abd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+288
-97
lines changed

EngineCopy.bat

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
xcopy /s /y /exclude:exclude_list.txt ".\Project\Engine\*.h" ".\External\Include\Engine"
2-
xcopy /s /y /exclude:exclude_list.txt ".\Project\Engine\*.inl" ".\External\Include\Engine"
3-
xcopy /s /y /exclude:exclude_list.txt ".\Project\Engine\*.fx" ".\OutputFile\content\shader"
4-
xcopy /s /y /exclude:exclude_list.txt ".\Project\Engine\*.hlsl" ".\OutputFile\content\shader"
5-
xcopy /s /y /exclude:exclude_list.txt ".\Project\Engine\*.hlsli" ".\OutputFile\content\shader"
1+
xcopy /s /y /exclude:Engine_exclude_list.txt ".\Project\Engine\*.h" ".\External\Include\Engine"
2+
xcopy /s /y /exclude:Engine_exclude_list.txt ".\Project\Engine\*.inl" ".\External\Include\Engine"
3+
xcopy /s /y /exclude:Engine_exclude_list.txt ".\Project\Engine\*.fx" ".\OutputFile\content\shader"
4+
xcopy /s /y /exclude:Engine_exclude_list.txt ".\Project\Engine\*.hlsl" ".\OutputFile\content\shader"
5+
xcopy /s /y /exclude:Engine_exclude_list.txt ".\Project\Engine\*.hlsli" ".\OutputFile\content\shader"
File renamed without changes.

External/Include/Engine/CRenderMgr.h

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,17 @@ class CRenderMgr : public CSingleton<CRenderMgr>
4646
CGameObject* m_PostEffectObj;
4747

4848
// Post Process
49-
int bloomLevels;
50-
vector<Ptr<CTexture>> m_BloomTextures;
51-
vector<CGameObject*> m_BloomDownFilters;
52-
vector<CGameObject*> m_BloomUpFilters;
49+
int m_bloomLevels;
50+
51+
vector<Ptr<CTexture>> m_BloomTextures_LDRI;
52+
CGameObject* m_SamplingObj;
53+
CGameObject* m_BlurXObj;
54+
CGameObject* m_BlurYObj;
55+
CGameObject* m_CombineObj;
56+
57+
vector<Ptr<CTexture>> m_BloomTextures_HDRI;
58+
vector<CGameObject*> m_BloomDownFilters_HDRI; // 객체하나로 수정 필요
59+
vector<CGameObject*> m_BloomUpFilters_HDRI; // 객체하나로 수정 필요
5360
CGameObject* m_ToneMappingObj;
5461

5562
// Render function pointer
@@ -87,8 +94,8 @@ class CRenderMgr : public CSingleton<CRenderMgr>
8794
void Clear_Buffers(const Vec4& Color);
8895

8996
void CopyRTTexToRTCopyTex();
90-
void CopyToPostProcessTex_HDRI();
9197
void CopyToPostProcessTex_LDRI();
98+
void CopyToPostProcessTex_HDRI();
9299
void Resize(Vec2 Resolution);
93100

94101
Ptr<CTexture> GetRTCopyTex() const { return m_RTCopyTex; }
@@ -106,7 +113,8 @@ class CRenderMgr : public CSingleton<CRenderMgr>
106113
void CreateBloomTextures(Vec2 Resolution);
107114

108115
public:
109-
void render_postprocess();
116+
void render_postprocess_LDRI();
117+
void render_postprocess_HDRI();
110118

111119
private:
112120
void render_play();
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)