scuti/reflex2q3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

Merge branch 'master' of https://git.teknik.io/scuti/reflex2q3

Browse Source
This commit is contained in:
2017-07-14 15:14:44 -07:00
parent 046912cad7 130cf2d762
commit c2fc685cb4
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ReflexToQ3/includes/EntityConverter.cpp
View File

@@ -466,10 +466,9 @@ EntityConverter::convertTarget(const std::vector<std::string> &lines) const
//position and name required, angles optional
std::string coords[3] = {"0.0", "0.0", "0.0"};
std::string targetName;
std::string angle;
std::string angle = "0.0";
std::string trash;
bool haveName = false;
bool haveAngle = false;
if ( lines.size() < 3 ) {
@@ -504,7 +503,6 @@ EntityConverter::convertTarget(const std::vector<std::string> &lines) const
throw std::runtime_error(
makeErrorMessage( "error: Target entity requires target angle if specified", lines ));
}
haveAngle = true;
}
}
@@ -538,12 +536,10 @@ EntityConverter::convertTarget(const std::vector<std::string> &lines) const
targetStream << "\"targetname\" \"" << targetName << "\"" << std::endl;
convertedLines.push_back ( targetStream.str() );
// Write angle only if position and name exist
if ( haveAngle ) {
std::stringstream angleStream;
angleStream << "\"angle\" \"" << adjustAngleForHandedness(angle) << "\"" << std::endl;
convertedLines.push_back( angleStream.str() );
}
// write angle every time
std::stringstream angleStream;
angleStream << "\"angle\" \"" << adjustAngleForHandedness(angle) << "\"" << std::endl;
convertedLines.push_back( angleStream.str() );
return convertedLines;
}
else {