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

Add helper method for optional stg values

Browse Source 
Anders Gidenstam: Style and indentation.
This commit is contained in:
Christian Schmitt
2012-06-12 09:10:26 +02:00
committed by Anders Gidenstam
parent 7e8fb16507
commit ec22623f1c
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
simgear/scene/tgdb/ReaderWriterSTG.cxx
View File

@@ -60,6 +60,19 @@ static SGBucket bucketIndexFromFileName(const std::string& fileName)
return SGBucket(index);
}
static bool hasOptionalValue(sg_gzifstream &in)
{
while ( (in.peek() != '\n') && (in.peek() != '\r')
&& isspace(in.peek()) ) {
in.get();
}
if ( isdigit(in.peek()) || (in.peek() == '-') ){
return true;
} else {
return false;
}
}
ReaderWriterSTG::ReaderWriterSTG()
{
supportsExtension("stg", "SimGear stg database format");
@@ -287,12 +300,7 @@ ReaderWriterSTG::readStgFile(const std::string& absoluteFileName,
matrix.preMultRotate(osg::Quat(SGMiscd::deg2rad(hdg),
osg::Vec3(0, 0, 1)));
while ( (in.peek() != '\n') && (in.peek() != '\r') &&
(in.peek() != '-') && isspace(in.peek()) ) {
in.get();
}
if (isdigit(in.peek()) || (in.peek() == '-')){
if ( hasOptionalValue(in) ){
double pitch(0.0), roll(0.0);
in >> pitch >> roll;