From 1b7768de92045cdb58d54adf6c88b9f2009ee614 Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Thu, 21 Jan 2016 23:09:11 +0100
Subject: [PATCH] Add nesting to `SettingsLoader::load`

---
 src/Application/SettingsLoader.cpp | 108 ++++++++++++++++-------------
 1 file changed, 61 insertions(+), 47 deletions(-)

diff --git a/src/Application/SettingsLoader.cpp b/src/Application/SettingsLoader.cpp
index 7a9386b..ba48c5c 100644
--- a/src/Application/SettingsLoader.cpp
+++ b/src/Application/SettingsLoader.cpp
@@ -18,6 +18,10 @@ SettingsLoader * SettingsLoader::instance(){
 bool SettingsLoader::load(SurfaceStack & surfaces, MediaServer & mediaServer, string fileName){
 	
 	ofxXmlSettings * xmlSettings = new ofxXmlSettings();
+	string sourceType = "";
+	string sourceName = "";
+	
+	BaseSource * source = 0;
 	
 	if(!xmlSettings->loadFile(fileName)){
 		ofLogWarning("SettingsLoader::load()") << "Could not load XML settings";
@@ -27,62 +31,72 @@ bool SettingsLoader::load(SurfaceStack & surfaces, MediaServer & mediaServer, st
 	if(!xmlSettings->tagExists("surfaces")){
 		ofLogWarning("SettingsLoader::load()") << "XML settings is empty or has wrong markup";
 		return false;
-	}
-	
-	xmlSettings->pushTag("surfaces");
-
-	int numSurfaces = xmlSettings->getNumTags("surface");
-	for(int i = 0; i < numSurfaces; i++){
-		xmlSettings->pushTag("surface", i);
-
-		// attempt to load surface source
-		xmlSettings->pushTag("source");
-		string sourceType = xmlSettings->getValue("source-type", "");
-		string sourceName = xmlSettings->getValue("source-name", "");
-		BaseSource * source = 0;
-		if(sourceName != "" && sourceName != "none" && sourceType != ""){
-
-			// Load source depending on type
-			int typeEnum = SourceType::GetSourceTypeEnum(sourceType);
-			if(typeEnum == SourceType::SOURCE_TYPE_FBO){
+	}else{
+		xmlSettings->pushTag("surfaces");
+
+		int numSurfaces = xmlSettings->getNumTags("surface");
+		for(int i = 0; i < numSurfaces; i++){
+			if(xmlSettings->tagExists("surface", i)){
+				xmlSettings->pushTag("surface", i);
+
+				// attempt to load surface source
+				if(xmlSettings->tagExists("source", 0)){
+					xmlSettings->pushTag("source");
+					sourceType = xmlSettings->getValue("source-type", "");
+					sourceName = xmlSettings->getValue("source-name", "");
+					
+					if(sourceName != "" && sourceName != "none" && sourceType != ""){
+
+						// Load source depending on type
+						int typeEnum = SourceType::GetSourceTypeEnum(sourceType);
+						if(typeEnum == SourceType::SOURCE_TYPE_FBO){
 				
-				// Load FBO source using sourceName
-				source = mediaServer.loadMedia(sourceName, typeEnum);
-			}else{
+							// Load FBO source using sourceName
+							source = mediaServer.loadMedia(sourceName, typeEnum);
+						}else{
 				
-				// Construct full path
-				string dir = mediaServer.getDefaultMediaDir(typeEnum);
-				stringstream pathss;
-				pathss << ofToDataPath(dir, true) << sourceName;
-				string sourcePath = pathss.str();
+							// Construct full path
+							string dir = mediaServer.getDefaultMediaDir(typeEnum);
+							stringstream pathss;
+							pathss << ofToDataPath(dir, true) << sourceName;
+							string sourcePath = pathss.str();
 				
-				// Load media by using full path
-				source = mediaServer.loadMedia(sourcePath, typeEnum);
-			}
-		}
+							// Load media by using full path
+							source = mediaServer.loadMedia(sourcePath, typeEnum);
+						}
+					}
 		
-		xmlSettings->popTag(); // source
-		xmlSettings->pushTag("vertices");
-		int vertexCount = xmlSettings->getNumTags("vertex");
+					xmlSettings->popTag(); // source
+				}
+				
+				if(xmlSettings->tagExists("vertices", 0)){
+					xmlSettings->pushTag("vertices");
+					int vertexCount = xmlSettings->getNumTags("vertex");
 		
-		if(vertexCount == 3){
-			BaseSurface * triangleSurface = getTriangleSurface(xmlSettings);
-			if(sourceName != "none" && source != 0){
-				triangleSurface->setSource(source);
+					if(vertexCount == 3){
+						BaseSurface * triangleSurface = getTriangleSurface(xmlSettings);
+						if(sourceName != "none" && source != 0){
+							triangleSurface->setSource(source);
+						}
+						surfaces.push_back(triangleSurface);
+					}else if(vertexCount == 4){
+						BaseSurface * quadSurface = getQuadSurface(xmlSettings);
+						if(sourceName != "none" && source != 0){
+							quadSurface->setSource(source);
+						}
+						surfaces.push_back(quadSurface);
+					}
+					
+					//xmlSettings->popTag(); // vertices
+					// this is done in getTriangleSurface and getQuadSurface
+				}
+
+				xmlSettings->popTag(); // surface
 			}
-			surfaces.push_back(triangleSurface);
-		}else if(vertexCount == 4){
-			BaseSurface * quadSurface = getQuadSurface(xmlSettings);
-			if(sourceName != "none" && source != 0){
-				quadSurface->setSource(source);
-			}
-			surfaces.push_back(quadSurface);
 		}
 
-		xmlSettings->popTag(); // surface
+		xmlSettings->popTag(); // surfaces
 	}
-
-	xmlSettings->popTag(); // surfaces
 	
 	return true;
 }