mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-01 18:40:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed colors and Y position

Browse Source
This commit is contained in:
Michel Mastriani 2019-05-21 21:09:11 -03:00
parent 6f42938bd7
commit 21311ce0aa
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Ember/XmlToEmber.cpp
View File

@ -1198,7 +1198,7 @@ bool XmlToEmber<T>::ParseEmberElementFromChaos(xmlNode* emberNode, Ember<T>& cur
{ {
if (!Compare(childNode->name, "imaging")) if (!Compare(childNode->name, "imaging"))
{ {
std::string bgstr; std::string bgstr, useHighlightPower;
for (auto imgChildNode = childNode->children; imgChildNode; imgChildNode = imgChildNode->next) for (auto imgChildNode = childNode->children; imgChildNode; imgChildNode = imgChildNode->next)
{ {
@ -1211,6 +1211,7 @@ bool XmlToEmber<T>::ParseEmberElementFromChaos(xmlNode* emberNode, Ember<T>& cur
else if (ParseAndAssignContent(imgChildNode, "name", "brightness", currentEmber.m_Brightness)) {} 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_gamma", currentEmber.m_Gamma)) {}
else if (ParseAndAssignContent(imgChildNode, "name", "flam3_vibrancy", currentEmber.m_Vibrancy)) {} 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_highlight_power", currentEmber.m_HighlightPower)) {}
else if (ParseAndAssignContent(imgChildNode, "name", "flam3_gamma_linear_threshold", currentEmber.m_GammaThresh)) {} else if (ParseAndAssignContent(imgChildNode, "name", "flam3_gamma_linear_threshold", currentEmber.m_GammaThresh)) {}
else if (ParseAndAssignContent(imgChildNode, "name", "background_colour", bgstr)) else if (ParseAndAssignContent(imgChildNode, "name", "background_colour", bgstr))
@ -1224,6 +1225,12 @@ bool XmlToEmber<T>::ParseEmberElementFromChaos(xmlNode* emberNode, Ember<T>& 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")) if (auto curvesnode = GetChildNodeByNodeName(childNode, "curves"))
{ {
T val = 0; T val = 0;
@ -1289,6 +1296,7 @@ bool XmlToEmber<T>::ParseEmberElementFromChaos(xmlNode* emberNode, Ember<T>& cur
{ {
istringstream istr(pos); istringstream istr(pos);
istr >> currentEmber.m_CenterX >> currentEmber.m_CenterY; istr >> currentEmber.m_CenterX >> currentEmber.m_CenterY;
currentEmber.m_CenterY *= -1;
currentEmber.m_RotCenterY = currentEmber.m_CenterY; currentEmber.m_RotCenterY = currentEmber.m_CenterY;
} }
else else