FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce "PRESERVE" flag to protect properties on sim reset.

Browse Source 
Some specific properties need protection and shouldn't be restored to their
original values on sim-reset.
This commit is contained in:
ThorstenB
2011-06-12 20:32:13 +02:00
parent edc877442f
commit c782a32076
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
simgear/props/props.hxx
View File

@@ -760,7 +760,8 @@ public:
REMOVED = 8,
TRACE_READ = 16,
TRACE_WRITE = 32,
USERARCHIVE = 64
USERARCHIVE = 64,
PRESERVE = 128
};

21
simgear/props/props_io.cxx
View File

@@ -227,6 +227,9 @@ PropsVisitor::startElement (const char * name, const XMLAttributes &atts)
attval = atts.getValue("userarchive");
if (checkFlag(attval, false))
mode |= SGPropertyNode::USERARCHIVE;
attval = atts.getValue("preserve");
if (checkFlag(attval, false))
mode |= SGPropertyNode::PRESERVE;
// Check for an alias.
attval = atts.getValue("alias");
@@ -691,8 +694,12 @@ copyProperties (const SGPropertyNode *in, SGPropertyNode *out,
int nChildren = in->nChildren();
for (int i = 0; i < nChildren; i++) {
const SGPropertyNode * in_child = in->getChild(i);
if (!in_child->hasValue() ||
(in_child->getAttributes() & attr_mask) == attr_value)
int mask = attr_mask;
/* attributes have no meaning for nodes without values - except
* the PRESERVE flag. So ignore them. */
if (!in_child->hasValue())
mask &= SGPropertyNode::PRESERVE;
if ((in_child->getAttributes() & mask) == (attr_value & mask))
{
SGPropertyNode * out_child = out->getChild(in_child->getNameString(),
in_child->getIndex(),
@@ -704,9 +711,13 @@ copyProperties (const SGPropertyNode *in, SGPropertyNode *out,
true);
}
else
if (out_child->hasValue() &&
(out_child->getAttributes() & attr_mask) != attr_value)
out_child = NULL;
{
mask = attr_mask;
if (!out_child->hasValue())
mask &= SGPropertyNode::PRESERVE;
if ((out_child->getAttributes() & mask) != (attr_value & mask))
out_child = NULL;
}
if (out_child &&
(!copyProperties(in_child, out_child, attr_value, attr_mask)))
retval = false;

1
simgear/scene/tsync/terrasync.cxx
View File

@@ -627,6 +627,7 @@ void SGTerraSync::bind()
// stalled is used as a signal handler (to connect listeners triggering GUI pop-ups)
_stalled_node = _terraRoot->getNode("stalled", true);
_stalled_node->setBoolValue(_svnThread->_stalled);
_stalled_node->setAttribute(SGPropertyNode::PRESERVE,true);
}
void SGTerraSync::unbind()