GITechDemo:

iftodebogdan · iftodebogdan · commit e6842c9da956 · 2015-10-30T04:34:10.000+02:00
* added controls to HUD when app starts
* cosmetic modifications to code
diff --git a/GITechDemo/Code/AppMain/GITechDemo/GITechDemo.cpp b/GITechDemo/Code/AppMain/GITechDemo/GITechDemo.cpp
@@ -324,9 +324,7 @@ void GITechDemo::Update(const float fDeltaTime)
 			Vec3f(m_tCamera.mRot[0][0] * m_tCamera.vMoveVec[0], m_tCamera.mRot[0][1] * m_tCamera.vMoveVec[0], m_tCamera.mRot[0][2] * m_tCamera.vMoveVec[0]);
 
 		// Update mouse cursor
-		if (cmd & APP_CMD_CTRL_PITCH ||
-			cmd & APP_CMD_CTRL_YAW ||
-			cmd & APP_CMD_CTRL_ROLL)
+		if (cmd & (APP_CMD_CTRL_PITCH | APP_CMD_CTRL_YAW | APP_CMD_CTRL_ROLL))
 		{
 			int wLeft, wTop, wRight, wBottom;
 			pFW->GetWindowArea(wLeft, wTop, wRight, wBottom);
@@ -434,6 +432,26 @@ void GITechDemo::Update(const float fDeltaTime)
 	if (pAPM)
 		pAPM->Update();
 
+	// Draw controls on HUD
+	static bool bDrawControls = true;
+	if(!pAPM->IsDrawingOnHUD() && bDrawControls)
+	{
+		HUD_PASS.PrintLn("Left mouse button (hold) + mouse move: control camera pitch/yaw");
+		HUD_PASS.PrintLn("Right mouse button (hold) + mouse move: control camera roll");
+		HUD_PASS.PrintLn("W/A/S/D: move camera forward/backward/left/right");
+		HUD_PASS.PrintLn("LShift (hold): faster camera movement");
+		HUD_PASS.PrintLn("LCtrl (hold): slower camera movement");
+
+		if (pAPM->GetParameterCount() > 0)
+		{
+			HUD_PASS.PrintLn("");
+			HUD_PASS.PrintLn("Directional arrows up/down: cycle configurable parameters");
+			HUD_PASS.PrintLn("Directional arrows left/right: modify currently selected parameter");
+		}
+	}
+	if (cmd & (APP_CMD_FORWARD | APP_CMD_BACKWARD | APP_CMD_LEFT | APP_CMD_RIGHT))
+		bDrawControls = false;
+
 	POP_PROFILE_MARKER();
 }
 
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/AmbientOcclusionPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/AmbientOcclusionPass.cpp
@@ -30,7 +30,7 @@ AmbientOcclusionPass::AmbientOcclusionPass(const char* const passName, RenderPas
 AmbientOcclusionPass::~AmbientOcclusionPass()
 {}
 
-void AmbientOcclusionPass::OnUpdate(const float fDeltaTime)
+void AmbientOcclusionPass::Update(const float fDeltaTime)
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
@@ -182,7 +182,7 @@ void AmbientOcclusionPass::ApplyAmbientOcclusion()
 	POP_PROFILE_MARKER();
 }
 
-void AmbientOcclusionPass::OnDraw()
+void AmbientOcclusionPass::Draw()
 {
 	if (!AMBIENT_OCCLUSION_ENABLED)
 		return;
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/BloomPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/BloomPass.cpp
@@ -26,7 +26,7 @@ BloomPass::BloomPass(const char* const passName, RenderPass* const parentPass)
 BloomPass::~BloomPass()
 {}
 
-void BloomPass::OnUpdate(const float fDeltaTime)
+void BloomPass::Update(const float fDeltaTime)
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
@@ -189,7 +189,7 @@ void BloomPass::BloomApply()
 	POP_PROFILE_MARKER();
 }
 
-void BloomPass::OnDraw()
+void BloomPass::Draw()
 {
 	if (!BLOOM_ENABLED)
 		return;
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/DepthOfFieldPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/DepthOfFieldPass.cpp
@@ -28,7 +28,7 @@ DepthOfFieldPass::DepthOfFieldPass(const char* const passName, RenderPass* const
 DepthOfFieldPass::~DepthOfFieldPass()
 {}
 
-void DepthOfFieldPass::OnUpdate(const float fDeltaTime)
+void DepthOfFieldPass::Update(const float fDeltaTime)
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
@@ -200,7 +200,7 @@ void DepthOfFieldPass::ApplyDoF()
 	POP_PROFILE_MARKER();
 }
 
-void DepthOfFieldPass::OnDraw()
+void DepthOfFieldPass::Draw()
 {
 	if (!DOF_ENABLED)
 		return;
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/DirectionalIndirectLightPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/DirectionalIndirectLightPass.cpp
@@ -62,7 +62,7 @@ DirectionalIndirectLightPass::~DirectionalIndirectLightPass()
 		delete[] f3RSMKernel;
 }
 
-void DirectionalIndirectLightPass::OnUpdate(const float fDeltaTime)
+void DirectionalIndirectLightPass::Update(const float fDeltaTime)
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
@@ -84,7 +84,7 @@ void DirectionalIndirectLightPass::OnUpdate(const float fDeltaTime)
 	texSource = IndirectLightAccumulationBuffer.GetRenderTarget()->GetColorBuffer(0);
 }
 
-void DirectionalIndirectLightPass::OnDraw()
+void DirectionalIndirectLightPass::Draw()
 {
 	if (!INDIRECT_LIGHT_ENABLED)
 		return;
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/DirectionalLightPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/DirectionalLightPass.cpp
@@ -55,7 +55,7 @@ DirectionalLightPass::~DirectionalLightPass()
 		delete[] f2PoissonDisk;
 }
 
-void DirectionalLightPass::OnUpdate(const float fDeltaTime)
+void DirectionalLightPass::Update(const float fDeltaTime)
 {
 	f2HalfTexelOffset = Vec2f(0.5f / GBuffer.GetRenderTarget()->GetWidth(), 0.5f / GBuffer.GetRenderTarget()->GetHeight());
 	texDiffuseBuffer = GBuffer.GetRenderTarget()->GetColorBuffer(0);
@@ -74,7 +74,7 @@ void DirectionalLightPass::OnUpdate(const float fDeltaTime)
 	texEnvMap = EnvironmentTexture.GetTextureIndex();
 }
 
-void DirectionalLightPass::OnDraw()
+void DirectionalLightPass::Draw()
 {
 	if (!DIRECTIONAL_LIGHT_ENABLED)
 		return;
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/FXAAPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/FXAAPass.cpp
@@ -25,7 +25,7 @@ FXAAPass::FXAAPass(const char* const passName, RenderPass* const parentPass)
 FXAAPass::~FXAAPass()
 {}
 
-void FXAAPass::OnUpdate(const float fDeltaTime)
+void FXAAPass::Update(const float fDeltaTime)
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
@@ -46,7 +46,7 @@ void FXAAPass::OnUpdate(const float fDeltaTime)
 
 }
 
-void FXAAPass::OnDraw()
+void FXAAPass::Draw()
 {
 	if (!FXAA_ENABLED)
 		return;
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/GBufferPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/GBufferPass.cpp
@@ -27,7 +27,7 @@ GBufferPass::GBufferPass(const char* const passName, RenderPass* const parentPas
 GBufferPass::~GBufferPass()
 {}
 
-void GBufferPass::OnUpdate(const float fDeltaTime)
+void GBufferPass::Update(const float fDeltaTime)
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
@@ -45,7 +45,7 @@ void GBufferPass::OnUpdate(const float fDeltaTime)
 	f44WorldViewProjMat = f44ProjMat * f44WorldViewMat;
 }
 
-void GBufferPass::OnDraw()
+void GBufferPass::Draw()
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/HDRDownsamplePass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/HDRDownsamplePass.cpp
@@ -19,7 +19,7 @@ HDRDownsamplePass::HDRDownsamplePass(const char* const passName, RenderPass* con
 HDRDownsamplePass::~HDRDownsamplePass()
 {}
 
-void HDRDownsamplePass::OnUpdate(const float fDeltaTime)
+void HDRDownsamplePass::Update(const float fDeltaTime)
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
@@ -65,7 +65,7 @@ void HDRDownsamplePass::DownsamplePass(GITechDemoApp::RenderTarget* const pSourc
 	pDest->Disable();
 }
 
-void HDRDownsamplePass::OnDraw()
+void HDRDownsamplePass::Draw()
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/HDRToneMappingPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/HDRToneMappingPass.cpp
@@ -24,7 +24,7 @@ HDRToneMappingPass::HDRToneMappingPass(const char* const passName, RenderPass* c
 HDRToneMappingPass::~HDRToneMappingPass()
 {}
 
-void HDRToneMappingPass::OnUpdate(const float fDeltaTime)
+void HDRToneMappingPass::Update(const float fDeltaTime)
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
@@ -182,7 +182,7 @@ void HDRToneMappingPass::ToneMappingPass()
 	POP_PROFILE_MARKER();
 }
 
-void HDRToneMappingPass::OnDraw()
+void HDRToneMappingPass::Draw()
 {
 	LuminanceMeasurementPass();
 	LuminanceAdaptationPass();
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/HUDPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/HUDPass.cpp
@@ -84,7 +84,7 @@ HUDPass::HUDPass(const char* const passName, RenderPass* const parentPass)
 HUDPass::~HUDPass()
 {}
 
-void HUDPass::OnUpdate(const float fDeltaTime)
+void HUDPass::Update(const float fDeltaTime)
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
@@ -115,7 +115,7 @@ void HUDPass::OnUpdate(const float fDeltaTime)
 	texSource = m_nHUDTextureIdx;
 }
 
-void HUDPass::OnDraw()
+void HUDPass::Draw()
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/LightingPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/LightingPass.cpp
@@ -19,7 +19,7 @@ LightingPass::LightingPass(const char* const passName, RenderPass* const parentP
 LightingPass::~LightingPass()
 {}
 
-void LightingPass::OnUpdate(const float fDeltaTime)
+void LightingPass::Update(const float fDeltaTime)
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
@@ -79,7 +79,7 @@ void LightingPass::CopyDepthBuffer()
 	POP_PROFILE_MARKER();
 }
 
-void LightingPass::OnDraw()
+void LightingPass::Draw()
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/PostProcessingPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/PostProcessingPass.cpp
@@ -32,7 +32,7 @@ PostProcessingPass::PostProcessingPass(const char* const passName, RenderPass* c
 PostProcessingPass::~PostProcessingPass()
 {}
 
-void PostProcessingPass::OnUpdate(const float fDeltaTime)
+void PostProcessingPass::Update(const float fDeltaTime)
 {
 	if (POST_PROCESSING_ENABLED)
 	{
@@ -88,7 +88,7 @@ void PostProcessingPass::CopyResultToBackBuffer(LibRendererDll::RenderTarget* co
 	POP_PROFILE_MARKER();
 }
 
-void PostProcessingPass::OnDraw()
+void PostProcessingPass::Draw()
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/RSMDirectionalLightPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/RSMDirectionalLightPass.cpp
@@ -26,7 +26,7 @@ RSMDirectionalLightPass::RSMDirectionalLightPass(const char* const passName, Ren
 RSMDirectionalLightPass::~RSMDirectionalLightPass()
 {}
 
-void RSMDirectionalLightPass::OnUpdate(const float fDeltaTime)
+void RSMDirectionalLightPass::Update(const float fDeltaTime)
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
@@ -69,7 +69,7 @@ void RSMDirectionalLightPass::OnUpdate(const float fDeltaTime)
 	}
 }
 
-void RSMDirectionalLightPass::OnDraw()
+void RSMDirectionalLightPass::Draw()
 {
 	if (!INDIRECT_LIGHT_ENABLED)
 		return;
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/RenderPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/RenderPass.cpp
@@ -35,8 +35,8 @@ void RenderPass::DrawChildren()
 		if (m_arrChildList[child] != nullptr)
 		{
 			PUSH_PROFILE_MARKER(m_arrChildList[child]->GetPassName());
-			m_arrChildList[child]->OnUpdate(((GITechDemo*)AppMain)->GetDeltaTime());
-			m_arrChildList[child]->OnDraw();
+			m_arrChildList[child]->Update(((GITechDemo*)AppMain)->GetDeltaTime());
+			m_arrChildList[child]->Draw();
 			POP_PROFILE_MARKER();
 		}
 	}
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/RenderPass.h b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/RenderPass.h
@@ -8,8 +8,8 @@
 	Class (const char* const passName, RenderPass* const parentPass); \
 	~ Class (); \
 	protected: \
-	void OnUpdate(const float fDeltaTime); \
-	void OnDraw();
+	void Update(const float fDeltaTime); \
+	void Draw();
 
 namespace GITechDemoApp
 {
@@ -23,8 +23,8 @@ namespace GITechDemoApp
 		const char* GetPassName() { return m_szPassName.c_str(); }
 
 	protected:
-		virtual void OnUpdate(const float fDeltaTime) {}
-		virtual void OnDraw() {}
+		virtual void Update(const float fDeltaTime) {}
+		virtual void Draw();
 
 		void DrawChildren();
 
@@ -34,8 +34,6 @@ namespace GITechDemoApp
 		RenderPass(const RenderPass&);
 		void operator=(const RenderPass&) {}
 
-		void Draw();
-
 		std::string					m_szPassName;
 		std::vector<RenderPass*>	m_arrChildList;
 
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/ShadowMapDirectionalLightPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/ShadowMapDirectionalLightPass.cpp
@@ -24,7 +24,7 @@ namespace GITechDemoApp
 
 	// Cascaded Shadow Maps (CSM) and directional light related variables
 	float CASCADE_SPLIT_FACTOR = 0.7f;
-	float CASCADE_MAX_VIEW_DEPTH = 2500.f;
+	float CASCADE_MAX_VIEW_DEPTH = 3000.f;
 
 	extern const unsigned int PCF_MAX_SAMPLE_COUNT = 16;
 	const unsigned int NUM_CASCADES = 4;
@@ -118,7 +118,7 @@ void ShadowMapDirectionalLightPass::UpdateSceneAABB()
 	SceneAABB.setInitialized();
 }
 
-void ShadowMapDirectionalLightPass::OnUpdate(const float fDeltaTime)
+void ShadowMapDirectionalLightPass::Update(const float fDeltaTime)
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
@@ -307,7 +307,7 @@ void ShadowMapDirectionalLightPass::OnUpdate(const float fDeltaTime)
 	}
 }
 
-void ShadowMapDirectionalLightPass::OnDraw()
+void ShadowMapDirectionalLightPass::Draw()
 {
 	if (!DIRECTIONAL_LIGHT_ENABLED)
 		return;
diff --git a/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/SkyPass.cpp b/GITechDemo/Code/AppMain/GITechDemo/RenderScheme/SkyPass.cpp
@@ -91,7 +91,7 @@ void SkyPass::ReleaseSkyBoxVB()
 	m_pSkyBoxCube = nullptr;
 }
 
-void SkyPass::OnUpdate(const float fDeltaTime)
+void SkyPass::Update(const float fDeltaTime)
 {
 	if (!AppMain)
 		return;
@@ -107,7 +107,7 @@ void SkyPass::OnUpdate(const float fDeltaTime)
 // Draw a world axis-aligned cube with its' center coinciding with the camera's position.
 // The vertex shader sets the visible face(s) at max depth so as to not draw over
 // other objects that aren't inside the cube (which, at 2x2x2, is quite small)
-void SkyPass::OnDraw()
+void SkyPass::Draw()
 {
 	Renderer* RenderContext = Renderer::GetInstance();
 	if (!RenderContext)
diff --git a/GITechDemo/Code/AppMain/GITechDemo/Resources/ArtistParameter.cpp b/GITechDemo/Code/AppMain/GITechDemo/Resources/ArtistParameter.cpp
@@ -122,16 +122,15 @@ void ArtistParameterManager::Update()
 			sprintf_s(szTempBuffer, "Step:     Negate", fStep);
 			HUD_PASS.PrintLn(szTempBuffer);
 
-			if (cmd & APM_CMD_STEP_UP || cmd & APM_CMD_STEP_DOWN)
+			if (cmd & (APM_CMD_STEP_UP | APM_CMD_STEP_DOWN))
 				*(bool*)pCurrAP->pParam = !(*(bool*)pCurrAP->pParam);
 		}
 		else
 			assert(0);
 
 		HUD_PASS.PrintLn("");
-		HUD_PASS.PrintLn("Hold CtrlR or ShiftR to scale step value.");
+		HUD_PASS.PrintLn("Hold RCtrl or RShift to scale step value.");
 	}
-
 }
 
 void ArtistParameterManager::SetupInput(gainput::InputManager* pInputManager)
diff --git a/GITechDemo/Code/AppMain/GITechDemo/Resources/ArtistParameter.h b/GITechDemo/Code/AppMain/GITechDemo/Resources/ArtistParameter.h
@@ -24,6 +24,9 @@ namespace GITechDemoApp
 		void Update();
 		void SetupInput(gainput::InputManager* pInputManager);
 
+		bool IsDrawingOnHUD() { return m_nCurrParam != -1; }
+		unsigned int GetParameterCount() { return (unsigned int)ms_arrParams.size(); }
+
 		static void CreateInstance() { ms_pInstance = new ArtistParameterManager(); }
 		static void DestroyInstance() { if (ms_pInstance) delete ms_pInstance; ms_pInstance = nullptr; }
 		static ArtistParameterManager* GetArtistParameterManager() { return ms_pInstance; }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ AmbientOcclusionPass::AmbientOcclusionPass(const char* const passName, RenderPas`
`30`	`30`	`AmbientOcclusionPass::~AmbientOcclusionPass()`
`31`	`31`	`{}`
`32`	`32`
`33`		`-void AmbientOcclusionPass::OnUpdate(const float fDeltaTime)`
	`33`	`+void AmbientOcclusionPass::Update(const float fDeltaTime)`
`34`	`34`	`{`
`35`	`35`	`Renderer* RenderContext = Renderer::GetInstance();`
`36`	`36`	`if (!RenderContext)`
`@@ -182,7 +182,7 @@ void AmbientOcclusionPass::ApplyAmbientOcclusion()`
`182`	`182`	`POP_PROFILE_MARKER();`
`183`	`183`	`}`
`184`	`184`
`185`		`-void AmbientOcclusionPass::OnDraw()`
	`185`	`+void AmbientOcclusionPass::Draw()`
`186`	`186`	`{`
`187`	`187`	`if (!AMBIENT_OCCLUSION_ENABLED)`
`188`	`188`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ BloomPass::BloomPass(const char* const passName, RenderPass* const parentPass)`
`26`	`26`	`BloomPass::~BloomPass()`
`27`	`27`	`{}`
`28`	`28`
`29`		`-void BloomPass::OnUpdate(const float fDeltaTime)`
	`29`	`+void BloomPass::Update(const float fDeltaTime)`
`30`	`30`	`{`
`31`	`31`	`Renderer* RenderContext = Renderer::GetInstance();`
`32`	`32`	`if (!RenderContext)`
`@@ -189,7 +189,7 @@ void BloomPass::BloomApply()`
`189`	`189`	`POP_PROFILE_MARKER();`
`190`	`190`	`}`
`191`	`191`
`192`		`-void BloomPass::OnDraw()`
	`192`	`+void BloomPass::Draw()`
`193`	`193`	`{`
`194`	`194`	`if (!BLOOM_ENABLED)`
`195`	`195`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ DepthOfFieldPass::DepthOfFieldPass(const char* const passName, RenderPass* const`
`28`	`28`	`DepthOfFieldPass::~DepthOfFieldPass()`
`29`	`29`	`{}`
`30`	`30`
`31`		`-void DepthOfFieldPass::OnUpdate(const float fDeltaTime)`
	`31`	`+void DepthOfFieldPass::Update(const float fDeltaTime)`
`32`	`32`	`{`
`33`	`33`	`Renderer* RenderContext = Renderer::GetInstance();`
`34`	`34`	`if (!RenderContext)`
`@@ -200,7 +200,7 @@ void DepthOfFieldPass::ApplyDoF()`
`200`	`200`	`POP_PROFILE_MARKER();`
`201`	`201`	`}`
`202`	`202`
`203`		`-void DepthOfFieldPass::OnDraw()`
	`203`	`+void DepthOfFieldPass::Draw()`
`204`	`204`	`{`
`205`	`205`	`if (!DOF_ENABLED)`
`206`	`206`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ DirectionalIndirectLightPass::~DirectionalIndirectLightPass()`
`62`	`62`	`delete[] f3RSMKernel;`
`63`	`63`	`}`
`64`	`64`
`65`		`-void DirectionalIndirectLightPass::OnUpdate(const float fDeltaTime)`
	`65`	`+void DirectionalIndirectLightPass::Update(const float fDeltaTime)`
`66`	`66`	`{`
`67`	`67`	`Renderer* RenderContext = Renderer::GetInstance();`
`68`	`68`	`if (!RenderContext)`
`@@ -84,7 +84,7 @@ void DirectionalIndirectLightPass::OnUpdate(const float fDeltaTime)`
`84`	`84`	`texSource = IndirectLightAccumulationBuffer.GetRenderTarget()->GetColorBuffer(0);`
`85`	`85`	`}`
`86`	`86`
`87`		`-void DirectionalIndirectLightPass::OnDraw()`
	`87`	`+void DirectionalIndirectLightPass::Draw()`
`88`	`88`	`{`
`89`	`89`	`if (!INDIRECT_LIGHT_ENABLED)`
`90`	`90`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ DirectionalLightPass::~DirectionalLightPass()`
`55`	`55`	`delete[] f2PoissonDisk;`
`56`	`56`	`}`
`57`	`57`
`58`		`-void DirectionalLightPass::OnUpdate(const float fDeltaTime)`
	`58`	`+void DirectionalLightPass::Update(const float fDeltaTime)`
`59`	`59`	`{`
`60`	`60`	`f2HalfTexelOffset = Vec2f(0.5f / GBuffer.GetRenderTarget()->GetWidth(), 0.5f / GBuffer.GetRenderTarget()->GetHeight());`
`61`	`61`	`texDiffuseBuffer = GBuffer.GetRenderTarget()->GetColorBuffer(0);`
`@@ -74,7 +74,7 @@ void DirectionalLightPass::OnUpdate(const float fDeltaTime)`
`74`	`74`	`texEnvMap = EnvironmentTexture.GetTextureIndex();`
`75`	`75`	`}`
`76`	`76`
`77`		`-void DirectionalLightPass::OnDraw()`
	`77`	`+void DirectionalLightPass::Draw()`
`78`	`78`	`{`
`79`	`79`	`if (!DIRECTIONAL_LIGHT_ENABLED)`
`80`	`80`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ FXAAPass::FXAAPass(const char* const passName, RenderPass* const parentPass)`
`25`	`25`	`FXAAPass::~FXAAPass()`
`26`	`26`	`{}`
`27`	`27`
`28`		`-void FXAAPass::OnUpdate(const float fDeltaTime)`
	`28`	`+void FXAAPass::Update(const float fDeltaTime)`
`29`	`29`	`{`
`30`	`30`	`Renderer* RenderContext = Renderer::GetInstance();`
`31`	`31`	`if (!RenderContext)`
`@@ -46,7 +46,7 @@ void FXAAPass::OnUpdate(const float fDeltaTime)`
`46`	`46`
`47`	`47`	`}`
`48`	`48`
`49`		`-void FXAAPass::OnDraw()`
	`49`	`+void FXAAPass::Draw()`
`50`	`50`	`{`
`51`	`51`	`if (!FXAA_ENABLED)`
`52`	`52`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ GBufferPass::GBufferPass(const char* const passName, RenderPass* const parentPas`
`27`	`27`	`GBufferPass::~GBufferPass()`
`28`	`28`	`{}`
`29`	`29`
`30`		`-void GBufferPass::OnUpdate(const float fDeltaTime)`
	`30`	`+void GBufferPass::Update(const float fDeltaTime)`
`31`	`31`	`{`
`32`	`32`	`Renderer* RenderContext = Renderer::GetInstance();`
`33`	`33`	`if (!RenderContext)`
`@@ -45,7 +45,7 @@ void GBufferPass::OnUpdate(const float fDeltaTime)`
`45`	`45`	`f44WorldViewProjMat = f44ProjMat * f44WorldViewMat;`
`46`	`46`	`}`
`47`	`47`
`48`		`-void GBufferPass::OnDraw()`
	`48`	`+void GBufferPass::Draw()`
`49`	`49`	`{`
`50`	`50`	`Renderer* RenderContext = Renderer::GetInstance();`
`51`	`51`	`if (!RenderContext)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ HDRDownsamplePass::HDRDownsamplePass(const char* const passName, RenderPass* con`
`19`	`19`	`HDRDownsamplePass::~HDRDownsamplePass()`
`20`	`20`	`{}`
`21`	`21`
`22`		`-void HDRDownsamplePass::OnUpdate(const float fDeltaTime)`
	`22`	`+void HDRDownsamplePass::Update(const float fDeltaTime)`
`23`	`23`	`{`
`24`	`24`	`Renderer* RenderContext = Renderer::GetInstance();`
`25`	`25`	`if (!RenderContext)`
`@@ -65,7 +65,7 @@ void HDRDownsamplePass::DownsamplePass(GITechDemoApp::RenderTarget* const pSourc`
`65`	`65`	`pDest->Disable();`
`66`	`66`	`}`
`67`	`67`
`68`		`-void HDRDownsamplePass::OnDraw()`
	`68`	`+void HDRDownsamplePass::Draw()`
`69`	`69`	`{`
`70`	`70`	`Renderer* RenderContext = Renderer::GetInstance();`
`71`	`71`	`if (!RenderContext)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ HDRToneMappingPass::HDRToneMappingPass(const char* const passName, RenderPass* c`
`24`	`24`	`HDRToneMappingPass::~HDRToneMappingPass()`
`25`	`25`	`{}`
`26`	`26`
`27`		`-void HDRToneMappingPass::OnUpdate(const float fDeltaTime)`
	`27`	`+void HDRToneMappingPass::Update(const float fDeltaTime)`
`28`	`28`	`{`
`29`	`29`	`Renderer* RenderContext = Renderer::GetInstance();`
`30`	`30`	`if (!RenderContext)`
`@@ -182,7 +182,7 @@ void HDRToneMappingPass::ToneMappingPass()`
`182`	`182`	`POP_PROFILE_MARKER();`
`183`	`183`	`}`
`184`	`184`
`185`		`-void HDRToneMappingPass::OnDraw()`
	`185`	`+void HDRToneMappingPass::Draw()`
`186`	`186`	`{`
`187`	`187`	`LuminanceMeasurementPass();`
`188`	`188`	`LuminanceAdaptationPass();`