Merge branch 'master' of https://github.com/tcsullivan/gamedev

1 files changed, 27 insertions, 20 deletions

diff --git a/src/world.cpp b/src/world.cpp
index 059b6c7..c458ab0 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -190,17 +190,14 @@ void WorldSystem::load(const std::string& file)
 
 	entityx::Entity entity;
 
-	std::string xmlRaw;
-	std::string xmlPath;
-
 	// check for empty file name
 	if (file.empty())
 		return;
 
 	// load file data to string
-	xmlPath = xmlFolder + file;
+	auto xmlPath = xmlFolder + file;
 	auto xmlRawData = readFile(xmlPath.c_str());
-	xmlRaw = xmlRawData;
+	std::string xmlRaw = xmlRawData;
 	delete[] xmlRawData;
 
 	// let tinyxml parse the file
@@ -209,18 +206,23 @@ void WorldSystem::load(const std::string& file)
 
 	// include headers
 	auto ixml = xmlDoc.FirstChildElement("include");
-	while (ixml) {
+	while (ixml != nullptr) {
 		auto file = ixml->Attribute("file");
+
 		if (file != nullptr) {
 			DEBUG_printf("Including file: %s\n", file);
 			auto include = readFile((xmlFolder + file).c_str());
 			xmlRaw.append(include);
 			delete[] include;
+		} else {
+			UserError("XML Error: <include> tag file not given");
 		}
-		ixml = ixml->NextSiblingElement();
+
+		break;//ixml = ixml->NextSiblingElement();
 	}
 
-	xmlDoc.Parse(xmlRaw.data());
+	if (xmlDoc.Parse(xmlRaw.data()) != XML_NO_ERROR)
+		UserError("XML Error:");
 
 	// look for an opening world tag
 	auto wxml = xmlDoc.FirstChildElement("World");
@@ -1043,19 +1045,22 @@ void WorldSystem::render(void)
 		static const float e = static_cast<float>(SCREEN_WIDTH) / 2.0f;
 
 		static const float sheight = static_cast<float>(SCREEN_HEIGHT);
+			
 
 		if (offset.x + world.startX > s) {
 			Colors::black.use();
 			glUniform1f(Render::worldShader.uniform[WU_light_impact], 0.0f);
 
+			auto off = offset.y - static_cast<float>(SCREEN_HEIGHT) / 2.0f;
+
 			GLfloat blackBarLeft[] = {
-				s,            0.0f,    -3.5f, 0.0f, 0.0f,
-				world.startX, 0.0f,    -3.5f, 1.0f, 0.0f,
-				world.startX, sheight, -3.5f, 1.0f, 1.0f,
+				s,            0.0f    + off,    -3.5f, 0.0f, 0.0f,
+				world.startX, 0.0f    + off,    -3.5f, 1.0f, 0.0f,
+				world.startX, sheight + off, -3.5f, 1.0f, 1.0f,
 
-				world.startX, sheight, -3.5f, 1.0f, 1.0f,
-    			s,            sheight, -3.5f, 0.0f, 1.0f,
-				s,            0.0f,    -3.5f, 0.0f, 0.0f
+				world.startX, sheight + off, -3.5f, 1.0f, 1.0f,
+    			s,            sheight + off, -3.5f, 0.0f, 1.0f,
+				s,            0.0f 	  + off,    -3.5f, 0.0f, 0.0f
 			};
 
 	    	glVertexAttribPointer(Render::worldShader.coord, 3, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 5, &blackBarLeft[0]);
@@ -1066,15 +1071,17 @@ void WorldSystem::render(void)
 		if (offset.x - world.startX < e) {
 			Colors::black.use();
 			glUniform1f(Render::worldShader.uniform[WU_light_impact], 0.0f);
+		
+			auto off = offset.y - static_cast<float>(SCREEN_HEIGHT) / 2.0f;
 
 			GLfloat blackBarRight[] = {
-				-(world.startX), 0.0f,    -3.5f, 0.0f, 0.0f,
-				e,               0.0f,    -3.5f, 1.0f, 0.0f,
-				e,               sheight, -3.5f, 1.0f, 1.0f,
+				-(world.startX), 0.0f    + off,    -3.5f, 0.0f, 0.0f,
+				e,               0.0f    + off,    -3.5f, 1.0f, 0.0f,
+				e,               sheight + off, -3.5f, 1.0f, 1.0f,
 
-				e,               sheight, -3.5f, 1.0f, 1.0f,
-    			-(world.startX), sheight, -3.5f, 0.0f, 1.0f,
-				-(world.startX), 0.0f,    -3.5f, 0.0f, 0.0f
+				e,               sheight + off, -3.5f, 1.0f, 1.0f,
+    			-(world.startX), sheight + off, -3.5f, 0.0f, 1.0f,
+				-(world.startX), 0.0f    + off,    -3.5f, 0.0f, 0.0f
 			};
 
 	    	glVertexAttribPointer(Render::worldShader.coord, 3, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 5, &blackBarRight[0]);