Merge branch 'erfan_revive_raytracer' of github.com:Devsh-Graphics-Programming/Nabla into erfan_revive_raytracer

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/CommandLineHandler.cpp

@@ -41,12 +41,6 @@ CommandLineHandler::CommandLineHandler(const std::vector<std::string>& argv)
 			variablesHandle.end()
 		);
 
-		// remove double-quotes
-		for(auto& var : variablesHandle)
-		{
-			var.erase(std::remove(var.begin(), var.end(), '\"'), var.end());
-		}
-
 		return variablesHandle;
 	};
 
@@ -110,7 +104,8 @@ CommandLineHandler::CommandLineHandler(const std::vector<std::string>& argv)
 			if(endOfFetchedVariableName != std::string::npos)
 			{
 				auto value = rawFetchedCmdArgument.substr(endOfFetchedVariableName + 1);
-				std::vector<std::string> toAdd = getSerializedValues(value);
+				std::vector<std::string> toAdd;
+				toAdd.push_back(value);
 				rawVariables[arg].emplace(toAdd);
 			}
 			else

examples_tests/22.RaytracedAO/CommandLineHandler.hpp

@@ -16,24 +16,20 @@ constexpr std::string_view helpMessage = R"(
 
 Parameters:
 -SCENE=sceneMitsubaXMLPathOrZipAndXML
--SCREENSHOT_OUTPUT=exrScreenShotOutputFilePath
 -TERMINATE
 
 Description and usage: 
 
 -SCENE:
 	some/path extra/path which will make it skip the file choose dialog
-	
--SCREENSHOT_OUTPUT:
-	output folder path for exr screenshots
-	
+
 -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
 	
 Example Usage :
-	raytracedao.exe -SCENE=../../media/kitchen.zip scene.xml -TERMINATE -SCREENSHOT_OUTPUT_FOLDER=C:\\Users\\UserName\\Documents\\My-ScreenShots
+	raytracedao.exe -SCENE=../../media/kitchen.zip scene.xml -TERMINATE
 Alternative:
-	raytracedao.exe -SCENE ../../media/kitchen.zip scene.xml -TERMINATE -SCREENSHOT_OUTPUT_FOLDER C:\\Users\\UserName\\Documents\\My-ScreenShots
+	raytracedao.exe -SCENE ../../media/kitchen.zip scene.xml -TERMINATE
 )";
 
 

examples_tests/22.RaytracedAO/main.cpp

@@ -229,12 +229,16 @@ int main(int argc, char** argv)
 		qnc->saveCacheToFile<asset::EF_A2B10G10R10_SNORM_PACK32>(fs, "../../tmp/normalCache101010.sse");
 
 		auto contents = meshes.getContents();
-		if (!contents.size())
+		if (!contents.size()) {
+			std::cout << "[ERROR] Failed loading asset in " << filePath << ".";
 			return 2;
+		}
 
 		globalMeta = core::smart_refctd_ptr<const ext::MitsubaLoader::CMitsubaMetadata>(meshes.getMetadata()->selfCast<const ext::MitsubaLoader::CMitsubaMetadata>());
-		if (!globalMeta)
+		if (!globalMeta) {
+			std::cout << "[ERROR] Couldn't get global Meta";
 			return 3;
+		}
 	}
 
 	struct SensorData

src/nbl/ext/MitsubaLoader/ParserUtil.cpp

@@ -224,7 +224,7 @@ void ParserManager::onEnd(const Context& ctx, const char* _el)
 	if (!elements.empty())
 	{
 		IElement* parent = elements.top().first;
-		if (!parent->processChildData(element.first, element.second))
+		if (parent && !parent->processChildData(element.first, element.second))
 		{
 			if (element.first)
 				killParseWithError(ctx,element.first->getLogName() + " could not processChildData with name: " + element.second);