BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed lots of slowing debug output from entity parsing pipeline

Browse Source
This commit is contained in:
sippeangelo
2016-01-19 13:27:29 +01:00
parent cfe023cc1d
commit 61984d2c4a
2 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Core/EntityFileParser.cpp
+7 -7
View File
@@ -28,14 +28,14 @@ void EntityFileParser::onStartEntity(EntityID entity, EntityID parent, const std
m_World->SetName(realEntity, name); m_World->SetName(realEntity, name);
} }
m_EntityIDMapper[entity] = realEntity; m_EntityIDMapper[entity] = realEntity;
LOG_DEBUG("Created entity #%i (%i) with parent %i (%i)", entity, realEntity, parent, realParent); //LOG_DEBUG("Created entity #%i (%i) with parent %i (%i)", entity, realEntity, parent, realParent);
} }
void EntityFileParser::onStartComponent(EntityID entity, const std::string& component) void EntityFileParser::onStartComponent(EntityID entity, const std::string& component)
{ {
EntityID realEntity = m_EntityIDMapper.at(entity); EntityID realEntity = m_EntityIDMapper.at(entity);
m_World->AttachComponent(realEntity, component); m_World->AttachComponent(realEntity, component);
LOG_DEBUG("Attached component of type \"%s\" to entity #%i (%i)", component.c_str(), entity, realEntity); //LOG_DEBUG("Attached component of type \"%s\" to entity #%i (%i)", component.c_str(), entity, realEntity);
} }
void EntityFileParser::onStartComponentField(EntityID entity, const std::string& componentType, const std::string& fieldName, const std::map<std::string, std::string>& attributes) void EntityFileParser::onStartComponentField(EntityID entity, const std::string& componentType, const std::string& fieldName, const std::map<std::string, std::string>& attributes)
@@ -49,11 +49,11 @@ void EntityFileParser::onStartComponentField(EntityID entity, const std::string&
} }
auto& field = fieldIt->second; auto& field = fieldIt->second;
LOG_DEBUG("Field \"%s\" type \"%s\"", fieldName.c_str(), field.Type.c_str()); //LOG_DEBUG("Field \"%s\" type \"%s\"", fieldName.c_str(), field.Type.c_str());
LOG_DEBUG("Attributes:"); //LOG_DEBUG("Attributes:");
for (auto& kv : attributes) { //for (auto& kv : attributes) {
LOG_DEBUG("\t%s = %s", kv.first.c_str(), kv.second.c_str()); // LOG_DEBUG("\t%s = %s", kv.first.c_str(), kv.second.c_str());
} //}
char* data = component.Data + field.Offset; char* data = component.Data + field.Offset;
EntityFile::WriteAttributeData(data, field, attributes); EntityFile::WriteAttributeData(data, field, attributes);
src/Engine/Core/EntityFilePreprocessor.cpp
+20 -21
View File
@@ -7,23 +7,23 @@ EntityFilePreprocessor::EntityFilePreprocessor(const EntityFile* entityFile)
handler.SetStartComponentCallback(std::bind(&EntityFilePreprocessor::onStartComponent, this, std::placeholders::_1, std::placeholders::_2)); handler.SetStartComponentCallback(std::bind(&EntityFilePreprocessor::onStartComponent, this, std::placeholders::_1, std::placeholders::_2));
m_EntityFile->Parse(&handler); m_EntityFile->Parse(&handler);
LOG_DEBUG("___ COMPONENT DEFINITIONS ___"); //LOG_DEBUG("___ COMPONENT DEFINITIONS ___");
for (auto& kv : m_ComponentCounts) { //for (auto& kv : m_ComponentCounts) {
LOG_DEBUG("%s: %i", kv.first.c_str(), kv.second); // LOG_DEBUG("%s: %i", kv.first.c_str(), kv.second);
} //}
parseComponentInfo(); parseComponentInfo();
for (auto& kv : m_ComponentInfo) { //for (auto& kv : m_ComponentInfo) {
auto& info = kv.second; // auto& info = kv.second;
LOG_DEBUG("Component: %s (%s)", info.Name.c_str(), info.Meta->Annotation.c_str()); // LOG_DEBUG("Component: %s (%s)", info.Name.c_str(), info.Meta->Annotation.c_str());
LOG_DEBUG("Stride: %i", info.Stride); // LOG_DEBUG("Stride: %i", info.Stride);
LOG_DEBUG("Allocation: %i", info.Meta->Allocation); // LOG_DEBUG("Allocation: %i", info.Meta->Allocation);
for (auto& kv : info.Fields) { // for (auto& kv : info.Fields) {
auto& field = kv.second; // auto& field = kv.second;
LOG_DEBUG("\t%i\t%s %s", field.Offset, field.Type.c_str(), kv.first.c_str()); // LOG_DEBUG("\t%i\t%s %s", field.Offset, field.Type.c_str(), kv.first.c_str());
} // }
} //}
parseDefaults(); parseDefaults();
} }
@@ -50,7 +50,6 @@ void EntityFilePreprocessor::parseComponentInfo()
auto xsModel = grammarPool->getXSModel(whateverTheFuckThisIs); auto xsModel = grammarPool->getXSModel(whateverTheFuckThisIs);
// Find component xsd element declarations // Find component xsd element declarations
std::cout << "Enumerating components..." << std::endl;
// <xs:element name="ComponentName"> // <xs:element name="ComponentName">
auto topLevelElements = xsModel->getComponents(XSConstants::ELEMENT_DECLARATION); auto topLevelElements = xsModel->getComponents(XSConstants::ELEMENT_DECLARATION);
for (unsigned int i = 0; i < topLevelElements->getLength(); ++i) { for (unsigned int i = 0; i < topLevelElements->getLength(); ++i) {
@@ -73,7 +72,7 @@ void EntityFilePreprocessor::parseComponentInfo()
if (componentAnnotation != nullptr) { if (componentAnnotation != nullptr) {
compInfo.Meta->Annotation = parseAnnotationXML(componentAnnotation->getAnnotationString()); compInfo.Meta->Annotation = parseAnnotationXML(componentAnnotation->getAnnotationString());
} else { } else {
LOG_WARNING("Component \"%s\" is missing an annotation!", compInfo.Name.c_str()); //LOG_WARNING("Component \"%s\" is missing an annotation!", compInfo.Name.c_str());
} }
// <xs:complexType> // <xs:complexType>
@@ -91,7 +90,7 @@ void EntityFilePreprocessor::parseComponentInfo()
// <xs:all> // <xs:all>
auto modelGroupParticle = complexTypeDefinition->getParticle(); auto modelGroupParticle = complexTypeDefinition->getParticle();
if (modelGroupParticle == nullptr || modelGroupParticle->getTermType() != XSParticle::TERM_MODELGROUP) { 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; continue;
} }
auto modelGroup = modelGroupParticle->getModelGroupTerm(); auto modelGroup = modelGroupParticle->getModelGroupTerm();
@@ -103,7 +102,7 @@ void EntityFilePreprocessor::parseComponentInfo()
for (unsigned int i = 0; i < particles->size(); ++i) { for (unsigned int i = 0; i < particles->size(); ++i) {
auto particle = particles->elementAt(i); auto particle = particles->elementAt(i);
if (particle->getTermType() != XSParticle::TERM_ELEMENT) { if (particle->getTermType() != XSParticle::TERM_ELEMENT) {
LOG_ERROR("Failed to parse a field definition in component \"%s\": Particle wasn't TERM_ELEMENT! Skipping.", compInfo.Name.c_str()); //LOG_ERROR("Failed to parse a field definition in component \"%s\": Particle wasn't TERM_ELEMENT! Skipping.", compInfo.Name.c_str());
continue; continue;
} }
auto elementDeclaration = particle->getElementTerm(); auto elementDeclaration = particle->getElementTerm();
@@ -129,7 +128,7 @@ void EntityFilePreprocessor::parseComponentInfo()
if (fieldAnnotation != nullptr) { if (fieldAnnotation != nullptr) {
compInfo.Meta->FieldAnnotations[name] = parseAnnotationXML(fieldAnnotation->getAnnotationString()); compInfo.Meta->FieldAnnotations[name] = parseAnnotationXML(fieldAnnotation->getAnnotationString());
} else { } else {
LOG_WARNING("Component field \"%s.%s\" is missing an annotation!", compInfo.Name.c_str(), name.c_str()); //LOG_WARNING("Component field \"%s.%s\" is missing an annotation!", compInfo.Name.c_str(), name.c_str());
} }
if (effectiveType == "enum") { if (effectiveType == "enum") {
@@ -147,7 +146,7 @@ void EntityFilePreprocessor::parseComponentInfo()
std::string enumName = XS::ToString(enumElement->getName()); std::string enumName = XS::ToString(enumElement->getName());
std::string enumValue = XS::ToString(enumElement->getConstraintValue()); std::string enumValue = XS::ToString(enumElement->getConstraintValue());
compInfo.Meta->FieldEnumDefinitions[name][enumName] = boost::lexical_cast<ComponentInfo::EnumType>(enumValue); compInfo.Meta->FieldEnumDefinitions[name][enumName] = boost::lexical_cast<ComponentInfo::EnumType>(enumValue);
LOG_DEBUG("ENUM %s = %s", enumName.c_str(), enumValue.c_str()); //LOG_DEBUG("ENUM %s = %s", enumName.c_str(), enumValue.c_str());
} }
} }
} }
@@ -190,7 +189,7 @@ void EntityFilePreprocessor::parseDefaults()
//std::string namespaceSchema = schemaLocation.string(); //std::string namespaceSchema = schemaLocation.string();
//parser.setExternalNoNamespaceSchemaLocation("Teamasdasdasdasd.xsd"); //parser.setExternalNoNamespaceSchemaLocation("Teamasdasdasdasd.xsd");
LOG_DEBUG("Parsing defaults for component %s", componentName.c_str()); //LOG_DEBUG("Parsing defaults for component %s", componentName.c_str());
boost::filesystem::path defaultsFile = "Schema/Components/" + componentName + ".xml"; boost::filesystem::path defaultsFile = "Schema/Components/" + componentName + ".xml";
parser.parse(defaultsFile.string().c_str()); parser.parse(defaultsFile.string().c_str());