From 21311ce0aabe6637e25330d776027955b0247198 Mon Sep 17 00:00:00 2001 From: Michel Mastriani Date: Tue, 21 May 2019 21:09:11 -0300 Subject: [PATCH] Fixed colors and Y position --- Source/Ember/XmlToEmber.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Source/Ember/XmlToEmber.cpp b/Source/Ember/XmlToEmber.cpp index e309ff9..f3fbe87 100644 --- a/Source/Ember/XmlToEmber.cpp +++ b/Source/Ember/XmlToEmber.cpp @@ -1198,7 +1198,7 @@ bool XmlToEmber::ParseEmberElementFromChaos(xmlNode* emberNode, Ember& cur { if (!Compare(childNode->name, "imaging")) { - std::string bgstr; + std::string bgstr, useHighlightPower; for (auto imgChildNode = childNode->children; imgChildNode; imgChildNode = imgChildNode->next) { @@ -1211,6 +1211,7 @@ bool XmlToEmber::ParseEmberElementFromChaos(xmlNode* emberNode, Ember& cur else if (ParseAndAssignContent(imgChildNode, "name", "brightness", currentEmber.m_Brightness)) {} else if (ParseAndAssignContent(imgChildNode, "name", "flam3_gamma", currentEmber.m_Gamma)) {} else if (ParseAndAssignContent(imgChildNode, "name", "flam3_vibrancy", currentEmber.m_Vibrancy)) {} + else if (ParseAndAssignContent(imgChildNode, "name", "flam3_use_highlight_power", useHighlightPower)) {} else if (ParseAndAssignContent(imgChildNode, "name", "flam3_highlight_power", currentEmber.m_HighlightPower)) {} else if (ParseAndAssignContent(imgChildNode, "name", "flam3_gamma_linear_threshold", currentEmber.m_GammaThresh)) {} else if (ParseAndAssignContent(imgChildNode, "name", "background_colour", bgstr)) @@ -1224,6 +1225,12 @@ bool XmlToEmber::ParseEmberElementFromChaos(xmlNode* emberNode, Ember& cur } } + // there is no warranty that flam3_use_highlight_power will be read before flam3_highlight_power. So, better to be here. + bool bVal; istringstream istr(useHighlightPower); istr >> std::boolalpha >> bVal; + + if(!bVal && !istr.bad() && !istr.fail()) + currentEmber.m_HighlightPower = T(-1); + if (auto curvesnode = GetChildNodeByNodeName(childNode, "curves")) { T val = 0; @@ -1289,6 +1296,7 @@ bool XmlToEmber::ParseEmberElementFromChaos(xmlNode* emberNode, Ember& cur { istringstream istr(pos); istr >> currentEmber.m_CenterX >> currentEmber.m_CenterY; + currentEmber.m_CenterY *= -1; currentEmber.m_RotCenterY = currentEmber.m_CenterY; } else @@ -2541,4 +2549,4 @@ EXPORT_XML_TO_EMBER(float) #ifdef DO_DOUBLE EXPORT_XML_TO_EMBER(double) #endif -} \ No newline at end of file +}