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

hla: Add propper attribute dirty handling.

Browse Source
This commit is contained in:
Mathias Froehlich 2012-03-02 21:51:59 +01:00
parent a07ca86207
commit 098441f5fb
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/hla/HLAArrayDataElement.cxx
View File

@ -111,6 +111,7 @@ HLAArrayDataElement::setNumElements(unsigned size)
_elementVector.resize(size);
for (unsigned i = oldSize; i < size; ++i)
_elementVector[i] = newElement(i);
setDirty(true);
return true;
}
@ -177,6 +178,7 @@ HLAArrayDataElement::setElement(unsigned index, HLADataElement* value)
_elementVector[index] = value;
if (value)
value->attachStamp(*this);
setDirty(true);
}
void
@ -252,6 +254,7 @@ HLAVariantArrayDataElement::setNumElements(unsigned size)
_elementVector.resize(size);
for (unsigned i = oldSize; i < size; ++i)
_elementVector[i] = newElement();
setDirty(true);
return true;
}
@ -318,6 +321,7 @@ HLAVariantArrayDataElement::setElement(unsigned index, HLAVariantRecordDataEleme
_elementVector[index] = value;
if (value)
value->attachStamp(*this);
setDirty(true);
}
void

10
simgear/hla/HLAArrayDataElement.hxx
View File

@ -139,7 +139,7 @@ public:
const std::string& getValue() const
{ return _value; }
void setValue(const std::string& value)
{ _value = value; }
{ _value = value; setDirty(true); }
virtual bool setNumElements(unsigned count)
{
@ -216,7 +216,7 @@ public:
const SGVec2<T>& getValue() const
{ return _value; }
void setValue(const SGVec2<T>& value)
{ _value = value; }
{ _value = value; setDirty(true); }
virtual bool setNumElements(unsigned count)
{
@ -308,7 +308,7 @@ public:
const SGVec3<T>& getValue() const
{ return _value; }
void setValue(const SGVec3<T>& value)
{ _value = value; }
{ _value = value; setDirty(true); }
virtual bool setNumElements(unsigned count)
{
@ -400,7 +400,7 @@ public:
const SGVec4<T>& getValue() const
{ return _value; }
void setValue(const SGVec4<T>& value)
{ _value = value; }
{ _value = value; setDirty(true); }
virtual bool setNumElements(unsigned count)
{
@ -492,7 +492,7 @@ public:
const SGQuat<T>& getValue() const
{ return _value; }
void setValue(const SGQuat<T>& value)
{ _value = value; }
{ _value = value; setDirty(true); }
virtual bool setNumElements(unsigned count)
{

1
simgear/hla/HLABasicDataElement.cxx
View File

@ -125,6 +125,7 @@ void
HLA##type##DataElement::setValue(ctype value) \
{ \
_value = value; \
setDirty(true); \
}
IMPLEMENT_TYPED_HLA_BASIC_DATA_ELEMENT(Char, char);

1
simgear/hla/HLAFixedRecordDataElement.cxx
View File

@ -187,6 +187,7 @@ HLAFixedRecordDataElement::setField(unsigned index, HLADataElement* value)
_fieldVector[index] = value;
if (value)
value->attachStamp(*this);
setDirty(true);
}
void

15
simgear/hla/HLAObjectInstance.cxx
View File

@ -121,8 +121,6 @@ HLAObjectInstance::setAttributeDataElement(unsigned index, const SGSharedPtr<HLA
_attributeVector[index]._dataElement = dataElement;
if (_attributeVector[index]._dataElement.valid())
_attributeVector[index]._dataElement->createStamp();
if (getAttributeOwned(index))
encodeAttributeValue(index);
}
class HLAObjectInstance::DataElementFactoryVisitor : public HLADataElementFactoryVisitor {
@ -477,9 +475,13 @@ HLAObjectInstance::encodeAttributeValues()
{
unsigned numAttributes = _attributeVector.size();
for (unsigned i = 0; i < numAttributes;++i) {
if (!_attributeVector[i]._unconditionalUpdate)
continue;
encodeAttributeValue(i);
if (_attributeVector[i]._unconditionalUpdate) {
encodeAttributeValue(i);
} else if (_attributeVector[i]._enabledUpdate) {
const HLADataElement* dataElement = getAttributeDataElement(i);
if (dataElement && dataElement->getDirty())
encodeAttributeValue(i);
}
}
}
@ -490,10 +492,11 @@ HLAObjectInstance::encodeAttributeValue(unsigned index)
SG_LOG(SG_IO, SG_INFO, "Not updating inactive object!");
return;
}
const HLADataElement* dataElement = getAttributeDataElement(index);
HLADataElement* dataElement = getAttributeDataElement(index);
if (!dataElement)
return;
_rtiObjectInstance->encodeAttributeData(index, *dataElement);
dataElement->setDirty(false);
}
void

1
simgear/hla/HLAVariantRecordDataElement.cxx
View File

@ -126,6 +126,7 @@ HLAVariantRecordDataElement::setAlternativeIndex(unsigned index)
return false;
_dataElement.swap(dataElement);
_alternativeIndex = index;
setDirty(true);
return true;
}