Fix screenshots - reset counters for each sensor so FramesDispatched is 0 at the beginning of each render

Author: Erfan-Ahmadi

examples_tests/22.RaytracedAO/Renderer.cpp

@@ -853,6 +853,8 @@ void Renderer::deinitSceneResources()
 
 	m_raytraceCommonData = {vec3(),0,0,0,0u};
 	m_sceneBound = core::aabbox3df(FLT_MAX, FLT_MAX, FLT_MAX, -FLT_MAX, -FLT_MAX, -FLT_MAX);
+	
+	m_staticViewData = {{0.f,0.f,0.f},0u,{0u,0u},0u,0u};
 
 	auto rr = m_rrManager->getRadeonRaysAPI();
 	rr->DetachAll();
@@ -1207,14 +1209,22 @@ void Renderer::deinitScreenSizedResources()
 	m_closestHitPipeline = nullptr;
 	m_resolvePipeline = nullptr;
 
-	m_staticViewData = {{0.f,0.f,0.f},0u,{0u,0u},0u,0u};
+	m_staticViewData.imageDimensions = {0u, 0u};
+	m_staticViewData.samplesPerPixelPerDispatch = 0u;
 	m_totalRaysCast = 0ull;
 	m_rcpPixelSize = {0.f,0.f};
 	m_framesDispatched = 0u;
 	std::fill_n(m_prevView.pointer(),12u,0.f);
 	m_prevCamTform = nbl::core::matrix4x3();
 }
 
+void Renderer::resetSampleAndFrameCounters()
+{
+	m_totalRaysCast = 0ull;
+	m_framesDispatched = 0u;
+	std::fill_n(m_prevView.pointer(),12u,0.f);
+	m_prevCamTform = nbl::core::matrix4x3();
+}
 
 void Renderer::takeAndSaveScreenShot(const std::string& screenShotName, const std::filesystem::path& screenshotFolderPath)
 {
@@ -1355,7 +1365,6 @@ void Renderer::render(nbl::ITimer* timer)
 		m_driver->bindDescriptorSets(EPBP_COMPUTE,m_resolvePipeline->getLayout(),0u,1u,&m_resolveDS.get(),nullptr);
 		m_driver->bindComputePipeline(m_resolvePipeline.get());
 		m_driver->dispatch(m_raygenWorkGroups[0],m_raygenWorkGroups[1],1);
-
 		COpenGLExtensionHandler::pGlMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT|GL_SHADER_IMAGE_ACCESS_BARRIER_BIT
 	#ifndef _NBL_BUILD_OPTIX_
 			|GL_FRAMEBUFFER_BARRIER_BIT|GL_TEXTURE_UPDATE_BARRIER_BIT

examples_tests/22.RaytracedAO/Renderer.h

@@ -38,6 +38,8 @@ class Renderer : public nbl::core::IReferenceCounted, public nbl::core::Interfac
 
 		void deinitScreenSizedResources();
 
+		void resetSampleAndFrameCounters();
+
 		void takeAndSaveScreenShot(const std::string& screenShotName, const std::filesystem::path& screenshotFolderPath = "");
 
 		void render(nbl::ITimer* timer);

examples_tests/22.RaytracedAO/main.cpp

@@ -293,12 +293,14 @@ int main(int argc, char** argv)
 			std::cout << "\tSensor Type is not valid" << std::endl;
 			return false;
 		}
-		
+
 		outSensorData.samplesNeeded = sensor.sampler.sampleCount;
 		outSensorData.staticCamera = smgr->addCameraSceneNode(nullptr); 
 		outSensorData.interactiveCamera = smgr->addCameraSceneNodeModifiedMaya(nullptr, -400.0f, 20.0f, 200.0f, -1, 2.0f, 1.0f, false, true);
 		auto & staticCamera = outSensorData.staticCamera;
 		auto & interactiveCamera = outSensorData.interactiveCamera;
+		
+		std::cout << "\t SamplesPerPixelNeeded = " << outSensorData.samplesNeeded << std::endl;
 
 		// need to extract individual components
 		{
@@ -416,9 +418,17 @@ int main(int argc, char** argv)
 	std::cout << "New Injected Sensors[0] = " << std::endl;
 	SensorData newSensor = {};
 	extractSensorData(newSensor, globalMeta->m_global.m_sensors[0]);
-	newSensor.staticCamera->setPosition(core::vector3df(0.0f,0.0f,0.0f));
+	newSensor.staticCamera->setPosition(core::vector3df(0.0f,2.0f,0.0f));
+	newSensor.staticCamera->setTarget(core::vector3df(-0.900177f, 2.0f, -0.435524f));
+	core::vectorSIMDf UpVector(0.0f, 1.0f, 0.0f);
+	newSensor.staticCamera->setUpVector(UpVector);
+	newSensor.staticCamera->render(); // It's not actually "render" :| It's basically recomputeViewMatrix ;
+	
 	newSensor.resetInteractiveCamera();
 	sensors.push_back(newSensor);
+
+	sensors[0].samplesNeeded = 4u;
+	sensors[1].samplesNeeded = 4u;
 #endif
 
 	auto driver = device->getVideoDriver();
@@ -482,6 +492,7 @@ int main(int argc, char** argv)
 				bool needsReinit = (activeSensor == -1) || (sensors[activeSensor].width != sensors[index].width) || (sensors[activeSensor].height != sensors[index].height); // should be >= or != ?
 				activeSensor = index;
 
+				renderer->resetSampleAndFrameCounters();
 				if(needsReinit)
 				{
 					renderer->deinitScreenSizedResources();
@@ -521,7 +532,7 @@ int main(int argc, char** argv)
 			}
 
 			driver->beginScene(false, false);
-
+			
 			renderer->render(device->getTimer());
 
 			auto oldVP = driver->getViewPort();
@@ -556,18 +567,20 @@ int main(int argc, char** argv)
 	{
 		const auto& sensorData = sensors[s];
 
-		std::cout << "-- Rendering  " << filePath << " (Sensor=" << s << ") to file..." << std::endl;
-		smgr->setActiveCamera(sensorData.staticCamera);
+		std::cout << "-- Rendering  " << filePath << ", Sensor = " << s << " to file." << std::endl;
 
 		bool needsReinit = (prevWidth != sensorData.width) || (prevHeight != sensorData.height); // >= or !=
 		prevWidth = sensorData.width;
 		prevHeight = sensorData.height;
-
+		
+		renderer->resetSampleAndFrameCounters(); // so that renderer->getTotalSamplesPerPixelComputed is 0 at the very beginning
 		if(needsReinit)
 		{
 			renderer->deinitScreenSizedResources();
 			renderer->initScreenSizedResources(sensorData.width, sensorData.height, std::move(sampleSequence));
 		}
+		
+		smgr->setActiveCamera(sensorData.staticCamera);
 
 		const uint32_t samplesPerPixelPerDispatch = renderer->getSamplesPerPixelPerDispatch();
 		const uint32_t maxNeededIterations = (sensorData.samplesNeeded + samplesPerPixelPerDispatch - 1) / samplesPerPixelPerDispatch;