Merge branch 'master' into BoxModelCollision

# Conflicts:
#	include/Engine/Collision/CollisionSystem.h
#	src/Engine/Collision/CollisionSystem.cpp

src/Engine/Core/AABB.cpp

@@ -20,10 +20,6 @@ AABB::AABB(const glm::vec3& minPos, const glm::vec3& maxPos)
     }
 }
 
-AABB::AABB(const glm::vec4& minPos, const glm::vec4& maxPos)
-    : AABB(glm::vec3(minPos), glm::vec3(maxPos))
-{ }
-
 AABB AABB::FromOriginSize(const glm::vec3& origin, const glm::vec3& size)
 {
     return AABB(origin - (size/2.f), origin + (size/2.f));

src/Engine/Core/EntityFile.cpp

@@ -20,7 +20,7 @@ void EntityFile::Parse(const EntityFileHandler* handler) const
 {
     using namespace xercesc;
 
-    EntityFileSAXHandler saxHandler(handler, nullptr);
+    EntityFileSAXHandler saxHandler(handler, m_SAX2XMLReader);
     setReaderFeatures(m_SAX2XMLReader);
     m_SAX2XMLReader->setContentHandler(&saxHandler);
     m_SAX2XMLReader->setErrorHandler(&saxHandler);
@@ -37,6 +37,7 @@ void EntityFile::setReaderFeatures(xercesc::SAX2XMLReader* reader)
     reader->setFeature(XMLUni::fgSAX2CoreNameSpaces, true);
     reader->setFeature(XMLUni::fgXercesSchema, true);
     reader->setFeature(XMLUni::fgXercesSchemaFullChecking, true);
+    reader->setFeature(XMLUni::fgXercesCalculateSrcOfs, true);
 }
 
 std::size_t EntityFile::GetTypeStride(std::string typeName)
@@ -111,8 +112,9 @@ void EntityFile::WriteValueData(char* outData, const ComponentInfo::Field_t& fie
     } catch (const boost::bad_lexical_cast&) { }
 }
 
-EntityFileSAXHandler::EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader) : m_Handler(handler)
-, m_Reader(reader)
+EntityFileSAXHandler::EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader) 
+    : m_Handler(handler)
+    , m_Reader(reader)
 {
     // 0 is imaginary base parent
     m_EntityStack.push(0);
@@ -188,21 +190,29 @@ void EntityFileSAXHandler::characters(const XMLCh* const chars, const XMLSize_t
 
 void EntityFileSAXHandler::fatalError(const xercesc::SAXParseException& e)
 {
-    XS::ToString s(e.getMessage());
-    LOG_ERROR("SAXParseException: %s", ((std::string)s).c_str());
-    //throw e;
+    std::string message = XS::ToString(e.getMessage());
+    std::string systemId = XS::ToString(e.getSystemId());
+    XMLFileLoc line = e.getLineNumber();
+    XMLFileLoc column = e.getColumnNumber();
+    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tFatal Error: %s", systemId.c_str(), line, column, message.c_str());
 }
 
 void EntityFileSAXHandler::error(const xercesc::SAXParseException& e)
 {
-    XS::ToString s(e.getMessage());
-    LOG_ERROR("SAXParseException: %s", ((std::string)s).c_str());
+    std::string message = XS::ToString(e.getMessage());
+    std::string systemId = XS::ToString(e.getSystemId());
+    XMLFileLoc line = e.getLineNumber();
+    XMLFileLoc column = e.getColumnNumber();
+    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tError: %s", systemId.c_str(), line, column, message.c_str());
 }
 
 void EntityFileSAXHandler::warning(const xercesc::SAXParseException& e)
 {
-    XS::ToString s(e.getMessage());
-    LOG_ERROR("SAXParseException: %s", ((std::string)s).c_str());
+    std::string message = XS::ToString(e.getMessage());
+    std::string systemId = XS::ToString(e.getSystemId());
+    XMLFileLoc line = e.getLineNumber();
+    XMLFileLoc column = e.getColumnNumber();
+    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tWarning: %s", systemId.c_str(), line, column, message.c_str());
 }
 
 void EntityFileSAXHandler::onStartEntity(const xercesc::Attributes& attrs)

src/Engine/Core/EntityFilePreprocessor.cpp

@@ -65,6 +65,7 @@ void EntityFilePreprocessor::parseComponentInfo()
 
         // Name
         compInfo.Name = XS::ToString(element->getName());
+        bool brk = compInfo.Name == "HiddenForLocalPlayer";
         // Known allocation
         compInfo.Meta->Allocation = m_ComponentCounts[compInfo.Name];
         // Annotation
@@ -90,7 +91,7 @@ void EntityFilePreprocessor::parseComponentInfo()
         // <xs:all>
         auto modelGroupParticle = complexTypeDefinition->getParticle();
         if (modelGroupParticle == nullptr || modelGroupParticle->getTermType() != XSParticle::TERM_MODELGROUP) {
-            //LOG_ERROR("Failed to parse component definition for \"%s\": Model group particle was null or wasn't TERM_MODELGROUP!", compInfo.Name.c_str());
+            LOG_ERROR("Failed to parse component definition for \"%s\": Model group particle was null or wasn't TERM_MODELGROUP!", compInfo.Name.c_str());
             continue;
         }
         auto modelGroup = modelGroupParticle->getModelGroupTerm();

src/Engine/Core/EntityWrapper.cpp

@@ -97,11 +97,6 @@ EntityWrapper::operator EntityID() const
     return this->ID;
 }
 
-EntityWrapper::operator bool()
-{
-    return this->Valid();
-}
-
 EntityWrapper EntityWrapper::firstChildByNameRecursive(const std::string& name, EntityID parent)
 {
     if (!this->World->ValidEntity(parent)) {

src/Engine/Core/Octree.cpp

@@ -105,8 +105,7 @@ bool Child::BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected) const
         for (int i : m_DynamicObjIndices) {
             if (!m_DynamicObjectsRef[i].Checked) {
                 const AABB& objBox = *m_DynamicObjectsRef[i].Box;
-                if (!Collision::IsSameBoxProbably(boxToTest, objBox) &&
-                    Collision::AABBVsAABB(boxToTest, objBox)) {
+                if (Collision::AABBVsAABB(boxToTest, objBox)) {
                     outBoxIntersected = objBox;
                     return true;
                 }

src/Engine/Core/Util/Logging.cpp

@@ -4,4 +4,40 @@
 _LOG_LEVEL LOG_LEVEL = LOG_LEVEL_DEBUG;
 #else
 _LOG_LEVEL LOG_LEVEL = LOG_LEVEL_INFO;
-#endif
+#endif
+
+const char* _LOG_LEVEL_PREFIX[] =
+{
+    "EE: ",
+	"",
+	"WW: ",
+	"DD: "
+};
+
+void _LOG(_LOG_LEVEL logLevel, const char* file, const char* func, unsigned int line, const char* format, ...)
+{
+	if (logLevel > LOG_LEVEL) {
+		return;
+	}
+
+	char* message = nullptr;
+	va_list args;
+
+	va_start(args, format);
+	size_t size = vsnprintf(message, 0, format, args) + 1;
+	va_end(args);
+
+	va_start(args, format);
+	message = new char[size];
+	vsnprintf(message, size, format, args);
+	va_end(args);
+
+	if (logLevel == LOG_LEVEL_ERROR) {
+		std::cerr << file << ":" << line << " " << func << std::endl;
+		std::cerr << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
+	} else {
+		std::cout << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
+	}
+
+	delete[] message;
+}

src/Engine/Core/World.cpp

@@ -54,8 +54,12 @@ ComponentWrapper World::AttachComponent(EntityID entity, const std::string& comp
 
 bool World::HasComponent(EntityID entity, const std::string& componentType) const
 {
-    ComponentPool* pool = m_ComponentPools.at(componentType);
-    return pool->KnowsEntity(entity);
+    auto it = m_ComponentPools.find(componentType);
+    if (it == m_ComponentPools.end()) {
+        return false;
+    } else {
+        return it->second->KnowsEntity(entity);
+    }
 }
 
 ComponentWrapper World::GetComponent(EntityID entity, const std::string& componentType)