actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Change RadarValues internal implementation to not use a union and use the subscript operator instead of the float* operator for subscripting.

Browse Source
This commit is contained in:
Kyzentun
2014-08-22 13:19:17 -06:00
parent 8b062785ea
commit 2c49ec7380
6 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RadarValues.cpp
+21 -7
View File
@@ -16,13 +16,17 @@ RadarValues::RadarValues()
void RadarValues::MakeUnknown()
{
FOREACH_ENUM( RadarCategory, rc )
m_Values.f[rc] = RADAR_VAL_UNKNOWN;
{
(*this)[rc] = RADAR_VAL_UNKNOWN;
}
}
void RadarValues::Zero()
{
FOREACH_ENUM( RadarCategory, rc )
m_Values.f[rc] = 0;
{
(*this)[rc] = 0;
}
}
XNode* RadarValues::CreateNode( bool bIncludeSimpleValues, bool bIncludeComplexValues ) const
@@ -35,12 +39,16 @@ XNode* RadarValues::CreateNode( bool bIncludeSimpleValues, bool bIncludeComplexV
if( rc >= RadarCategory_TapsAndHolds )
{
if( bIncludeSimpleValues )
pNode->AppendChild( RadarCategoryToString(rc), (int)m_Values.f[rc] );
{
pNode->AppendChild(RadarCategoryToString(rc), (int)((*this)[rc]));
}
}
else
{
if( bIncludeComplexValues )
pNode->AppendChild( RadarCategoryToString(rc), m_Values.f[rc] );
{
pNode->AppendChild(RadarCategoryToString(rc), (*this)[rc]);
}
}
}
@@ -54,7 +62,9 @@ void RadarValues::LoadFromNode( const XNode* pNode )
Zero();
FOREACH_ENUM( RadarCategory, rc )
pNode->GetChildValue( RadarCategoryToString(rc), m_Values.f[rc] );
{
pNode->GetChildValue( RadarCategoryToString(rc), (*this)[rc] );
}
}
/* iMaxValues is only used for writing compatibility fields in non-cache
@@ -67,7 +77,9 @@ RString RadarValues::ToString( int iMaxValues ) const
vector<RString> asRadarValues;
for( int r=0; r < iMaxValues; r++ )
asRadarValues.push_back( ssprintf("%.3f", m_Values.f[r]) );
{
asRadarValues.push_back(ssprintf("%.3f", (*this)[r]));
}
return join( ",",asRadarValues );
}
@@ -84,7 +96,9 @@ void RadarValues::FromString( RString sRadarValues )
}
FOREACH_ENUM( RadarCategory, rc )
m_Values.f[rc] = StringToFloat( saValues[rc] );
{
(*this)[rc] = StringToFloat(saValues[rc]);
}
}