Skip to content

Commit 01418b5

Browse files
iftodebogdaniftodebogdan
committed
GITechDemo:
* Added lens flare post-process effect * Motion blur sample count can now be modified on-the-fly from the HUD * Added some new utility textures for the lens flare effect * Added the lens flare textures to the utility texture compilation script
1 parent d3d0e79 commit 01418b5

25 files changed

+740
-112
lines changed

‎GITechDemo/Code/AppMain/GITechDemo.vcxproj

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@
268268
<ClInclude Include="GITechDemo\RenderScheme\GBufferPass.h" />
269269
<ClInclude Include="GITechDemo\RenderScheme\HDRToneMappingPass.h" />
270270
<ClInclude Include="GITechDemo\RenderScheme\HUDPass.h" />
271+
<ClInclude Include="GITechDemo\RenderScheme\LensFlarePass.h" />
271272
<ClInclude Include="GITechDemo\RenderScheme\LightingPass.h" />
272273
<ClInclude Include="GITechDemo\RenderScheme\MotionBlurPass.h" />
273274
<ClInclude Include="GITechDemo\RenderScheme\PostProcessingPass.h" />
@@ -299,6 +300,7 @@
299300
<ClCompile Include="GITechDemo\RenderScheme\GBufferPass.cpp" />
300301
<ClCompile Include="GITechDemo\RenderScheme\HDRToneMappingPass.cpp" />
301302
<ClCompile Include="GITechDemo\RenderScheme\HUDPass.cpp" />
303+
<ClCompile Include="GITechDemo\RenderScheme\LensFlarePass.cpp" />
302304
<ClCompile Include="GITechDemo\RenderScheme\LightingPass.cpp" />
303305
<ClCompile Include="GITechDemo\RenderScheme\MotionBlurPass.cpp" />
304306
<ClCompile Include="GITechDemo\RenderScheme\PostProcessingPass.cpp" />
@@ -724,6 +726,72 @@ call fxc.exe /T vs_3_0 /E vsmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(
724726
call fxc.exe /T ps_3_0 /E psmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm" "%(FullPath)"</Command>
725727
<Command Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">call "%25DXSDK_DIR%25\Utilities\bin\dx_setenv.cmd"
726728
call fxc.exe /T vs_3_0 /E vsmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm" "%(FullPath)"
729+
call fxc.exe /T ps_3_0 /E psmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm" "%(FullPath)"</Command>
730+
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling shader "%(Filename)%(Extension)"</Message>
731+
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling shader "%(Filename)%(Extension)"</Message>
732+
<Message Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Compiling shader "%(Filename)%(Extension)"</Message>
733+
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compiling shader "%(Filename)%(Extension)"</Message>
734+
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compiling shader "%(Filename)%(Extension)"</Message>
735+
<Message Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Compiling shader "%(Filename)%(Extension)"</Message>
736+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm;$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm;%(Outputs)</Outputs>
737+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm;$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm;%(Outputs)</Outputs>
738+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm;$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm;%(Outputs)</Outputs>
739+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm;$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm;%(Outputs)</Outputs>
740+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm;$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm;%(Outputs)</Outputs>
741+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm;$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm;%(Outputs)</Outputs>
742+
</CustomBuild>
743+
<CustomBuild Include="..\..\Data\shaders\LensFlareFeatures.hlsl">
744+
<FileType>Document</FileType>
745+
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call "%25DXSDK_DIR%25\Utilities\bin\dx_setenv.cmd"
746+
call fxc.exe /T vs_3_0 /E vsmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm" "%(FullPath)"
747+
call fxc.exe /T ps_3_0 /E psmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm" "%(FullPath)"</Command>
748+
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call "%25DXSDK_DIR%25\Utilities\bin\dx_setenv.cmd"
749+
call fxc.exe /T vs_3_0 /E vsmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm" "%(FullPath)"
750+
call fxc.exe /T ps_3_0 /E psmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm" "%(FullPath)"</Command>
751+
<Command Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">call "%25DXSDK_DIR%25\Utilities\bin\dx_setenv.cmd"
752+
call fxc.exe /T vs_3_0 /E vsmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm" "%(FullPath)"
753+
call fxc.exe /T ps_3_0 /E psmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm" "%(FullPath)"</Command>
754+
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call "%25DXSDK_DIR%25\Utilities\bin\dx_setenv.cmd"
755+
call fxc.exe /T vs_3_0 /E vsmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm" "%(FullPath)"
756+
call fxc.exe /T ps_3_0 /E psmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm" "%(FullPath)"</Command>
757+
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call "%25DXSDK_DIR%25\Utilities\bin\dx_setenv.cmd"
758+
call fxc.exe /T vs_3_0 /E vsmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm" "%(FullPath)"
759+
call fxc.exe /T ps_3_0 /E psmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm" "%(FullPath)"</Command>
760+
<Command Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">call "%25DXSDK_DIR%25\Utilities\bin\dx_setenv.cmd"
761+
call fxc.exe /T vs_3_0 /E vsmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm" "%(FullPath)"
762+
call fxc.exe /T ps_3_0 /E psmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm" "%(FullPath)"</Command>
763+
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling shader "%(Filename)%(Extension)"</Message>
764+
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling shader "%(Filename)%(Extension)"</Message>
765+
<Message Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Compiling shader "%(Filename)%(Extension)"</Message>
766+
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compiling shader "%(Filename)%(Extension)"</Message>
767+
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compiling shader "%(Filename)%(Extension)"</Message>
768+
<Message Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">Compiling shader "%(Filename)%(Extension)"</Message>
769+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm;$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm;%(Outputs)</Outputs>
770+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm;$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm;%(Outputs)</Outputs>
771+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm;$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm;%(Outputs)</Outputs>
772+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm;$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm;%(Outputs)</Outputs>
773+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm;$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm;%(Outputs)</Outputs>
774+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm;$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm;%(Outputs)</Outputs>
775+
</CustomBuild>
776+
<CustomBuild Include="..\..\Data\shaders\LensFlareApply.hlsl">
777+
<FileType>Document</FileType>
778+
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call "%25DXSDK_DIR%25\Utilities\bin\dx_setenv.cmd"
779+
call fxc.exe /T vs_3_0 /E vsmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm" "%(FullPath)"
780+
call fxc.exe /T ps_3_0 /E psmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm" "%(FullPath)"</Command>
781+
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">call "%25DXSDK_DIR%25\Utilities\bin\dx_setenv.cmd"
782+
call fxc.exe /T vs_3_0 /E vsmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm" "%(FullPath)"
783+
call fxc.exe /T ps_3_0 /E psmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm" "%(FullPath)"</Command>
784+
<Command Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">call "%25DXSDK_DIR%25\Utilities\bin\dx_setenv.cmd"
785+
call fxc.exe /T vs_3_0 /E vsmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm" "%(FullPath)"
786+
call fxc.exe /T ps_3_0 /E psmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm" "%(FullPath)"</Command>
787+
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">call "%25DXSDK_DIR%25\Utilities\bin\dx_setenv.cmd"
788+
call fxc.exe /T vs_3_0 /E vsmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm" "%(FullPath)"
789+
call fxc.exe /T ps_3_0 /E psmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm" "%(FullPath)"</Command>
790+
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">call "%25DXSDK_DIR%25\Utilities\bin\dx_setenv.cmd"
791+
call fxc.exe /T vs_3_0 /E vsmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm" "%(FullPath)"
792+
call fxc.exe /T ps_3_0 /E psmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm" "%(FullPath)"</Command>
793+
<Command Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">call "%25DXSDK_DIR%25\Utilities\bin\dx_setenv.cmd"
794+
call fxc.exe /T vs_3_0 /E vsmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).vsasm" "%(FullPath)"
727795
call fxc.exe /T ps_3_0 /E psmain /O3 /nologo /Fc "$(SolutionDir)..\..\BinTemp\$(ProjectName)\Shaders\%(Filename).psasm" "%(FullPath)"</Command>
728796
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling shader "%(Filename)%(Extension)"</Message>
729797
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling shader "%(Filename)%(Extension)"</Message>

‎GITechDemo/Code/AppMain/GITechDemo.vcxproj.filters

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@
114114
<ClInclude Include="GITechDemo\RenderScheme\MotionBlurPass.h">
115115
<Filter>Header Files</Filter>
116116
</ClInclude>
117+
<ClInclude Include="GITechDemo\RenderScheme\LensFlarePass.h">
118+
<Filter>Header Files</Filter>
119+
</ClInclude>
117120
</ItemGroup>
118121
<ItemGroup>
119122
<ClCompile Include="Framework\Windows\stdafx.cpp">
@@ -203,6 +206,9 @@
203206
<ClCompile Include="GITechDemo\RenderScheme\MotionBlurPass.cpp">
204207
<Filter>Source Files</Filter>
205208
</ClCompile>
209+
<ClCompile Include="GITechDemo\RenderScheme\LensFlarePass.cpp">
210+
<Filter>Source Files</Filter>
211+
</ClCompile>
206212
</ItemGroup>
207213
<ItemGroup>
208214
<Image Include="Framework\Windows\Framework.ico">
@@ -252,9 +258,8 @@
252258
<None Include="..\..\Build\build_data_win.py">
253259
<Filter>Build</Filter>
254260
</None>
255-
<None Include="..\..\Data\shaders\MotionBlur.hlsl">
256-
<Filter>Shaders</Filter>
257-
</None>
261+
<None Include="..\..\Data\shaders\LensFlare.hlsl" />
262+
<None Include="..\..\Data\shaders\LensFlareApply.hlsl" />
258263
</ItemGroup>
259264
<ItemGroup>
260265
<ResourceCompile Include="GITechDemo\GITechDemo.rc">
@@ -316,5 +321,6 @@
316321
<CustomBuild Include="..\..\Data\shaders\SSAO.hlsl">
317322
<Filter>Shaders</Filter>
318323
</CustomBuild>
324+
<CustomBuild Include="..\..\Data\shaders\MotionBlur.hlsl" />
319325
</ItemGroup>
320326
</Project>

‎GITechDemo/Code/AppMain/GITechDemo/RenderScheme/BloomPass.cpp

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ void BloomPass::Update(const float fDeltaTime)
3737
return;
3838

3939
ResourceMgr->GetTexture(
40-
HDRBloomBuffer[0]->GetRenderTarget()->GetColorBuffer(0)
40+
BloomBuffer[0]->GetRenderTarget()->GetColorBuffer(0)
4141
)->SetAddressingMode(SAM_CLAMP);
4242
ResourceMgr->GetTexture(
43-
HDRBloomBuffer[1]->GetRenderTarget()->GetColorBuffer(0)
43+
BloomBuffer[1]->GetRenderTarget()->GetColorBuffer(0)
4444
)->SetAddressingMode(SAM_CLAMP);
4545

4646
nDownsampleFactor = 1;
@@ -60,27 +60,31 @@ void BloomPass::BloomBrightnessFilter()
6060

6161
PUSH_PROFILE_MARKER("Brightness filter");
6262

63-
HDRBloomBuffer[0]->Enable();
63+
BloomBuffer[0]->Enable();
6464

6565
// Not necesarry
6666
//RenderContext->Clear(Vec4f(0.f, 0.f, 0.f, 0.f), 1.f, 0);
6767

68+
const SamplerFilter samplerFilter = ResourceMgr->GetTexture(HDRDownsampleBuffer[SIXTEENTH]->GetRenderTarget()->GetColorBuffer(0))->GetFilter();
69+
ResourceMgr->GetTexture(HDRDownsampleBuffer[SIXTEENTH]->GetRenderTarget()->GetColorBuffer(0))->SetFilter(SF_MIN_MAG_LINEAR_MIP_NONE);
70+
6871
f2HalfTexelOffset = Vec2f(
69-
0.5f / HDRBloomBuffer[0]->GetRenderTarget()->GetWidth(),
70-
0.5f / HDRBloomBuffer[0]->GetRenderTarget()->GetHeight()
72+
0.5f / BloomBuffer[0]->GetRenderTarget()->GetWidth(),
73+
0.5f / BloomBuffer[0]->GetRenderTarget()->GetHeight()
7174
);
7275
f2TexelSize = Vec2f(
7376
1.f / HDRDownsampleBuffer[SIXTEENTH]->GetRenderTarget()->GetWidth(),
7477
1.f / HDRDownsampleBuffer[SIXTEENTH]->GetRenderTarget()->GetHeight()
7578
);
76-
ResourceMgr->GetTexture(HDRDownsampleBuffer[SIXTEENTH]->GetRenderTarget()->GetColorBuffer(0))->SetFilter(SF_MIN_MAG_LINEAR_MIP_NONE);
7779
texSource = HDRDownsampleBuffer[SIXTEENTH]->GetRenderTarget()->GetColorBuffer(0);
7880

7981
DownsampleShader.Enable();
8082
RenderContext->DrawVertexBuffer(FullScreenTri);
8183
DownsampleShader.Disable();
8284

83-
HDRBloomBuffer[0]->Disable();
85+
ResourceMgr->GetTexture(HDRDownsampleBuffer[SIXTEENTH]->GetRenderTarget()->GetColorBuffer(0))->SetFilter(samplerFilter);
86+
87+
BloomBuffer[0]->Disable();
8488

8589
POP_PROFILE_MARKER();
8690
}
@@ -106,22 +110,22 @@ void BloomPass::BloomBlur()
106110
#endif
107111
PUSH_PROFILE_MARKER(label);
108112

109-
HDRBloomBuffer[(i + 1) % 2]->Enable();
113+
BloomBuffer[(i + 1) % 2]->Enable();
110114

111115
// Not necesarry
112116
//RenderContext->Clear(Vec4f(0.f, 0.f, 0.f, 0.f), 1.f, 0);
113117

114118
f2HalfTexelOffset = Vec2f(
115-
0.5f / HDRBloomBuffer[i % 2]->GetRenderTarget()->GetWidth(),
116-
0.5f / HDRBloomBuffer[i % 2]->GetRenderTarget()->GetHeight()
119+
0.5f / BloomBuffer[i % 2]->GetRenderTarget()->GetWidth(),
120+
0.5f / BloomBuffer[i % 2]->GetRenderTarget()->GetHeight()
117121
);
118122
ResourceMgr->GetTexture(
119-
HDRBloomBuffer[i % 2]->GetRenderTarget()->GetColorBuffer(0)
123+
BloomBuffer[i % 2]->GetRenderTarget()->GetColorBuffer(0)
120124
)->SetFilter(SF_MIN_MAG_POINT_MIP_NONE);
121-
texSource = HDRBloomBuffer[i % 2]->GetRenderTarget()->GetColorBuffer(0);
125+
texSource = BloomBuffer[i % 2]->GetRenderTarget()->GetColorBuffer(0);
122126
f2TexelSize = Vec2f(
123-
1.f / HDRBloomBuffer[i % 2]->GetRenderTarget()->GetWidth(),
124-
1.f / HDRBloomBuffer[i % 2]->GetRenderTarget()->GetHeight()
127+
1.f / BloomBuffer[i % 2]->GetRenderTarget()->GetWidth(),
128+
1.f / BloomBuffer[i % 2]->GetRenderTarget()->GetHeight()
125129
);
126130
nKernel = BLOOM_BLUR_KERNEL[i];
127131
if (i == BLOOM_BLUR_KERNEL_COUNT - 1)
@@ -133,7 +137,7 @@ void BloomPass::BloomBlur()
133137
RenderContext->DrawVertexBuffer(FullScreenTri);
134138
BloomShader.Disable();
135139

136-
HDRBloomBuffer[(i + 1) % 2]->Disable();
140+
BloomBuffer[(i + 1) % 2]->Disable();
137141

138142
POP_PROFILE_MARKER();
139143
}
@@ -168,11 +172,11 @@ void BloomPass::BloomApply()
168172
RenderContext->GetRenderStateManager()->SetZWriteEnabled(false);
169173
RenderContext->GetRenderStateManager()->SetZFunc(CMP_ALWAYS);
170174

171-
f2HalfTexelOffset = Vec2f(0.5f / HDRBloomBuffer[BLOOM_BLUR_KERNEL_COUNT % 2]->GetRenderTarget()->GetWidth(), 0.5f / HDRBloomBuffer[BLOOM_BLUR_KERNEL_COUNT % 2]->GetRenderTarget()->GetHeight());
175+
f2HalfTexelOffset = Vec2f(0.5f / BloomBuffer[BLOOM_BLUR_KERNEL_COUNT % 2]->GetRenderTarget()->GetWidth(), 0.5f / BloomBuffer[BLOOM_BLUR_KERNEL_COUNT % 2]->GetRenderTarget()->GetHeight());
172176
ResourceMgr->GetTexture(
173-
HDRBloomBuffer[BLOOM_BLUR_KERNEL_COUNT % 2]->GetRenderTarget()->GetColorBuffer(0)
177+
BloomBuffer[BLOOM_BLUR_KERNEL_COUNT % 2]->GetRenderTarget()->GetColorBuffer(0)
174178
)->SetFilter(SF_MIN_MAG_LINEAR_MIP_NONE);
175-
texSource = HDRBloomBuffer[BLOOM_BLUR_KERNEL_COUNT % 2]->GetRenderTarget()->GetColorBuffer(0);
179+
texSource = BloomBuffer[BLOOM_BLUR_KERNEL_COUNT % 2]->GetRenderTarget()->GetColorBuffer(0);
176180

177181
ColorCopyShader.Enable();
178182
RenderContext->DrawVertexBuffer(FullScreenTri);

‎GITechDemo/Code/AppMain/GITechDemo/RenderScheme/GBufferPass.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace GITechDemoApp
77
{
88
class GBufferPass : public RenderPass
99
{
10-
IMPLEMENT_RENDER_PASS(GBufferPass);
10+
IMPLEMENT_RENDER_PASS(GBufferPass)
1111
};
1212
}
1313

‎GITechDemo/Code/AppMain/GITechDemo/RenderScheme/HDRToneMappingPass.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace GITechDemoApp
77
{
88
class HDRToneMappingPass : public RenderPass
99
{
10-
IMPLEMENT_RENDER_PASS(HDRToneMappingPass);
10+
IMPLEMENT_RENDER_PASS(HDRToneMappingPass)
1111

1212
private:
1313
void LuminanceMeasurementPass();

‎GITechDemo/Code/AppMain/GITechDemo/RenderScheme/HUDPass.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace GITechDemoApp
1313
{
1414
class HUDPass : public RenderPass
1515
{
16-
IMPLEMENT_RENDER_PASS(HUDPass);
16+
IMPLEMENT_RENDER_PASS(HUDPass)
1717

1818
private:
1919
struct GlyphCache

0 commit comments

Comments
 (0)