Merge branch 'new_ditt_premerge'

Author: devsh

.gitignore

@@ -12,3 +12,4 @@ compiled.spv
 *.pyc
 */.vscode/*
 */__main__.py
+/tmp/rtSamples.bin

22_RaytracedAO/CMakeLists.txt

@@ -31,14 +31,22 @@ endif()
 
 set(EXTRA_SOURCES
 	../../src/nbl/ext/DebugDraw/CDraw3DLine.cpp
+	../../src/nbl/ext/EnvmapImportanceSampling/EnvmapImportanceSampling.cpp
 	Renderer.cpp
 	CommandLineHandler.cpp
+	SimpleJson.cpp
 )
 
 nbl_create_executable_project(
 	"${EXTRA_SOURCES}"
 	""
 	"${RAY_TRACED_AO_EXAMPLE_INCLUDE_DIRS}"
 	"${RAY_TRACED_AO_EXAMPLE_LIBS}"
-	"${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}"
-)
+)
+
+# TODO: Abstract this stuff away inside `nbl_create_executable_project`
+if(NBL_RUN_TESTS)
+	get_target_property(_RTAO_OUTPUT_RUNTIME_RELEASE_ ${EXECUTABLE_NAME} RUNTIME_OUTPUT_DIRECTORY_RELEASE)
+	set(_NBL_PATHTRACER_EXE_ "${_RTAO_OUTPUT_RUNTIME_RELEASE_}/${EXECUTABLE_NAME}.exe" CACHE FILEPATH "")
+	configure_file("${NBL_ROOT_PATH}/tests/22.RaytracedAO/test.py" "${NBL_BINARY_PATH}/examples_tests/22.RaytracedAO/test.py")
+endif() 

22_RaytracedAO/CommandLineHandler.cpp

@@ -95,7 +95,14 @@ CommandLineHandler::CommandLineHandler(const std::vector<std::string>& argv)
 		else
 		{
 			const auto offset = firstHyphen + 1;
-			const auto endOfFetchedVariableName = rawFetchedCmdArgument.find_first_of("=");
+			bool hasArguments = true;
+			auto endOfFetchedVariableName = rawFetchedCmdArgument.find_first_of("=");
+			if (endOfFetchedVariableName == std::string::npos)
+			{
+				hasArguments = false;
+				endOfFetchedVariableName = std::distance(rawFetchedCmdArgument.begin(), rawFetchedCmdArgument.end());
+			}
+
 			const auto count = endOfFetchedVariableName - offset;
 			const auto cmdFetchedVariable = rawFetchedCmdArgument.substr(offset, count);
 			std::string variable = cmdFetchedVariable;
@@ -115,9 +122,10 @@ CommandLineHandler::CommandLineHandler(const std::vector<std::string>& argv)
 				break;
 			}
 
-			if(endOfFetchedVariableName != std::string::npos)
+			if(hasArguments)
 			{
 				auto value = rawFetchedCmdArgument.substr(endOfFetchedVariableName + 1);
+
 				auto zipExtensionPos = value.find(".zip");
 				if(zipExtensionPos == std::string::npos)
 					zipExtensionPos = value.find(".ZIP");
@@ -144,7 +152,6 @@ CommandLineHandler::CommandLineHandler(const std::vector<std::string>& argv)
 					toAdd.push_back(value);
 					rawVariables[arg].emplace(toAdd);
 				}
-
 			}
 			else
 			{
@@ -154,7 +161,6 @@ CommandLineHandler::CommandLineHandler(const std::vector<std::string>& argv)
 
 			previousArg = arg;
 		}
-
 	}
 
 	if (!validateParameters() || !success)

22_RaytracedAO/CommandLineHandler.hpp

@@ -16,69 +16,93 @@ constexpr std::string_view helpMessage = R"(
 
 Parameters:
 -SCENE=sceneMitsubaXMLPathOrZipAndXML
--TERMINATE
 
 Description and usage: 
 
 -SCENE:
 	some/path extra/path which will make it skip the file choose dialog
 
--TERMINATE:
-	which will make the app stop when the required amount of samples has been renderered (its in the Mitsuba Scene metadata) and obviously take screenshot when quitting
+-PROCESS_SENSORS ID:
+	It will control the behaviour of sensors in the app as detailed above.
+	If the option is not passed, then it defaults to RenderAllThenInteractive.
+	If the ID is not passed, then it defaults to 0.
 	
 Example Usages :
-	raytracedao.exe -SCENE=../../media/kitchen.zip scene.xml -TERMINATE
-	raytracedao.exe -SCENE="../../media/my good kitchen.zip" scene.xml -TERMINATE
-	raytracedao.exe -SCENE="../../media/my good kitchen.zip scene.xml" -TERMINATE
-	raytracedao.exe -SCENE="../../media/extraced folder/scene.xml" -TERMINATE
+	raytracedao.exe -SCENE=../../media/kitchen.zip scene.xml
+	raytracedao.exe -SCENE=../../media/kitchen.zip scene.xml -PROCESS_SENSORS RenderAllThenInteractive
+	raytracedao.exe -SCENE="../../media/my good kitchen.zip" scene.xml -PROCESS_SENSORS RenderAllThenTerminate 0
+	raytracedao.exe -SCENE="../../media/my good kitchen.zip scene.xml" -PROCESS_SENSORS RenderSensorThenInteractive 1
+	raytracedao.exe -SCENE="../../media/extraced folder/scene.xml" -PROCESS_SENSORS InteractiveAtSensor 2
 )";
 
 
 constexpr std::string_view SCENE_VAR_NAME						= "SCENE";
 constexpr std::string_view SCREENSHOT_OUTPUT_FOLDER_VAR_NAME	= "SCREENSHOT_OUTPUT_FOLDER";
-constexpr std::string_view TERMINATE_VAR_NAME					= "TERMINATE";
+constexpr std::string_view PROCESS_SENSORS_VAR_NAME				= "PROCESS_SENSORS";
+constexpr std::string_view DEFER_DENOISE_VAR_NAME               = "DEFER_DENOISE";
 
 constexpr uint32_t MaxRayTracerCommandLineArgs = 8;
 
 enum RaytracerExampleArguments
 {
 	REA_SCENE,
-	REA_TERMINATE,
+	REA_PROCESS_SENSORS,
+	REA_DEFER_DENOISE,
 	REA_COUNT,
 };
 
+enum class ProcessSensorsBehaviour
+{
+	PSB_RENDER_ALL_THEN_INTERACTIVE,
+	PSB_RENDER_ALL_THEN_TERMINATE,
+	PSB_RENDER_SENSOR_THEN_INTERACTIVE,
+	PSB_INTERACTIVE_AT_SENSOR,
+	PSB_COUNT
+};
+
 using variablesType = std::unordered_map<RaytracerExampleArguments, std::optional<std::vector<std::string>>>;
 
 class CommandLineHandler
 {
 	public:
-
 		CommandLineHandler(const std::vector<std::string>& argv);
 
-		auto& getSceneDirectory() const
+		inline auto& getSceneDirectory() const
 		{
 			return sceneDirectory;
 		}
 
-		auto& getTerminate() const
+		inline auto& getProcessSensorsBehaviour() const
 		{
-			return terminate;
+			return processSensorsBehaviour;
 		}
 
-	private:
+		inline auto& getSensorID() const
+		{
+			return sensorID;
+		}
 
+		inline bool getDeferredDenoiseFlag() const
+		{
+			return isDenoiseDeferred;
+		}
+
+	private:
 		void initializeMatchingMap()
 		{
 			rawVariables[REA_SCENE];
-			rawVariables[REA_TERMINATE];
+			rawVariables[REA_PROCESS_SENSORS];
+			rawVariables[REA_DEFER_DENOISE];
 		}
 
 		RaytracerExampleArguments getMatchedVariableMapID(const std::string& variableName)
 		{
 			if (variableName == SCENE_VAR_NAME)
 				return REA_SCENE;
-			else if (variableName == TERMINATE_VAR_NAME)
-				return REA_TERMINATE;
+			else if (variableName == PROCESS_SENSORS_VAR_NAME)
+				return REA_PROCESS_SENSORS;
+			else if (variableName == DEFER_DENOISE_VAR_NAME)
+				return REA_DEFER_DENOISE;
 			else
 				return REA_COUNT;
 		}
@@ -89,16 +113,57 @@ class CommandLineHandler
 		{
 			if(rawVariables[REA_SCENE].has_value())
 				sceneDirectory = rawVariables[REA_SCENE].value();
-			if(rawVariables[REA_TERMINATE].has_value())
-				terminate = true;
+			if (rawVariables[REA_PROCESS_SENSORS].has_value())
+			{
+				const auto& values = rawVariables[REA_PROCESS_SENSORS].value();
+				for (uint32_t i = 0; i < values.size(); ++i)
+				{
+					if (i == 0)
+					{
+						const char* behaviour = values[0].c_str();
+						if (strcmp(behaviour, "RenderAllThenInteractive") == 0)
+						{
+							processSensorsBehaviour = ProcessSensorsBehaviour::PSB_RENDER_ALL_THEN_INTERACTIVE;
+						}
+						else if (strcmp(behaviour, "RenderAllThenTerminate") == 0)
+						{
+							processSensorsBehaviour = ProcessSensorsBehaviour::PSB_RENDER_ALL_THEN_TERMINATE;
+						}
+						else if (strcmp(behaviour, "RenderSensorThenInteractive") == 0)
+						{
+							processSensorsBehaviour = ProcessSensorsBehaviour::PSB_RENDER_SENSOR_THEN_INTERACTIVE;
+						}
+						else if (strcmp(behaviour, "InteractiveAtSensor") == 0)
+						{
+							processSensorsBehaviour = ProcessSensorsBehaviour::PSB_INTERACTIVE_AT_SENSOR;
+						}
+						else
+						{
+							printf("[ERROR]: Invalid option for '%s'. Using RenderAllThenInteractive.\n", PROCESS_SENSORS_VAR_NAME.data());
+						}
+					}
+					else if (i == 1)
+					{
+                        sensorID = std::stoi(values[1]);
+					}
+				}
+			}
+			
+			isDenoiseDeferred = rawVariables[REA_DEFER_DENOISE].has_value();
 		}
 
 		variablesType rawVariables;
 
 		// Loaded from CMD
 		std::vector<std::string> sceneDirectory; // [0] zip [1] optional xml in zip
 		std::string outputScreenshotsFolderPath;
-		bool terminate = false;
+		bool isDenoiseDeferred;
+		struct
+		{
+			ProcessSensorsBehaviour processSensorsBehaviour = ProcessSensorsBehaviour::PSB_RENDER_ALL_THEN_INTERACTIVE;
+			uint32_t sensorID = 0;
+		};
+
 };
 
 #endif // _DENOISER_TONEMAPPER_COMMAND_LINE_HANDLER_