added depth for schoolls draw keys

Author: Alin

example/ThreadedRenderingGL/School.cpp

@@ -691,14 +691,20 @@ void School::UpdateInstanceDataBuffer()
 	m_pInstanceData->EndUpdate();
 }
 
-uint32_t School::Render(uint32_t batchSize, GeometryCommandBuffer& geometryCommands)
+uint32_t School::Render(const nv::matrix4f& projView, uint32_t batchSize, GeometryCommandBuffer& geometryCommands)
 {
 	uint32_t drawCallCount = 0;
 	if (nullptr == m_pInstancedModel)
 	{
 		return drawCallCount;
 	}
 
+	// draw closest opaque first for early-z culling
+	nv::vec4f position = projView * nv::vec4f(m_lastCentroid.x, 1.f);
+	float invDepth = (1.f - position.z / position.w);
+	invDepth *= 10000.f;
+	m_pInstancedModel->DrawKey().setDepth(invDepth);
+
 	m_pInstancedModel->SetBatchSize(batchSize);
 	drawCallCount += m_pInstancedModel->Render(geometryCommands, 0, 1, 2);
 

example/ThreadedRenderingGL/School.h

@@ -285,7 +285,7 @@ class School
 	/// Render the school using GL commands and structures
 	/// \param batchSize Number of instances rendered per draw call
 	/// \return Returns the number of draw calls invoked during the Render call
-	uint32_t Render(uint32_t batchSize, GeometryCommandBuffer& geometryCommands);
+	uint32_t Render(const nv::matrix4f& projView, uint32_t batchSize, GeometryCommandBuffer& geometryCommands);
 
 	/// Set the values used by the flocking simulation that drives the school
 	/// \param params A SchoolFlockingParams object initialized with the

example/ThreadedRenderingGL/ThreadedRenderingGL.cpp

@@ -272,6 +272,8 @@ void ThreadedRenderingGL::animateJobFunction(uint32_t threadIndex)
 			// its update).  In our fixed school size case, this is not an issue, so 
 			// thread utilization should not be significantly impacted.
 
+			const nv::matrix4f projView = m_projUBO_Data.m_projectionMatrix * m_projUBO_Data.m_viewMatrix;
+
 			schoolsDone = me.m_schoolCount;
 			if (!m_animPaused || m_forceUpdateMode != ForceUpdateMode::eNone)
 			{
@@ -288,7 +290,7 @@ void ThreadedRenderingGL::animateJobFunction(uint32_t threadIndex)
 						m_schools[i]->Update(m_geometryCommands);
 					}
 					// Dispatch render commands
-					m_schoolsDrawCount[i] = m_schools[i]->Render(m_uiBatchSize, m_geometryCommands);
+					m_schoolsDrawCount[i] = m_schools[i]->Render(projView, m_uiBatchSize, m_geometryCommands);
 				}
 			}
 
@@ -532,8 +534,9 @@ void ThreadedRenderingGL::helperJobFunction()
 					drawCmd.texGBuffer[i] = m_texGBuffer[i];
 				CB_DEBUG_COMMAND_TAG(drawCmd);
 
-				if(i > 4)
+				if(i > 4 || !m_useVolumetricLights)
 					continue;
+
 				transform.make_identity();
 				transform.set_scale(lightRadius * 0.005f + 0.5f);
 				transform.set_translate(nv::vec3f(position));
@@ -629,6 +632,7 @@ ThreadedRenderingGL::ThreadedRenderingGL() :
 	m_pFishplosionVar(nullptr),
 	m_animPaused(false),
 	m_avoidance(true),
+	m_useVolumetricLights(true),
 	m_currentTime(0.0f),
 	m_forceUpdateMode(ForceUpdateMode::eNone),
 	m_bUIDirty(true),
@@ -1210,6 +1214,8 @@ void ThreadedRenderingGL::initUI(void)
 			&m_pBatchSlider, &m_pBatchVar);
 		mTweakBar->addMenu("Mode", m_uiRenderingTechnique, &(RENDER_TECHNIQUES[0]), TECHNIQUE_GLAZDO_POOLED, UIACTION_RENDERINGTECHNIQUE);
 		mTweakBar->addMenu("BRDF", (uint32_t&)m_brdf, &(BRDF_OPTIONS[0]), BRDF_COUNT, UIACTION_UIBRDF);
+		var = mTweakBar->addValue("Use Volumetric Lights", m_useVolumetricLights);
+		addTweakKeyBind(var, NvKey::K_V);
 
 		mTweakBar->addPadding();
 		mTweakBar->addLabel("Animation Settings", true);

example/ThreadedRenderingGL/ThreadedRenderingGL.h

@@ -521,6 +521,7 @@ class ThreadedRenderingGL : public NvSampleAppGL
 	// Flag indicating whether schools should be aware of each other and 
 	// attempt to avoid each other
 	bool m_avoidance;
+	bool m_useVolumetricLights;
 
 	// Current application time in seconds
 	float m_currentTime;

example/ThreadedRenderingGL/assets/src_shaders/volumetric_FS.glsl

@@ -1,4 +1,6 @@
 
+// Based on: Volumetric Light Scattering as a Post-Process by Kenny Mitchell
+
 #version 310 es
 
 precision mediump float;
@@ -43,4 +45,4 @@ void main()
 		illuminationDecay *= decay;
      }
      outColor = vec4(color * uExposure, 1.0);
-}
+}