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-08-19 05:46:20 -07:00
commit a52339e574
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ReflexToQ3/includes/EntityConverter.cpp
View File

@ -283,7 +283,7 @@ EntityConverter::convertPickup(const std::vector<std::string> &lines) const
std::stringstream pickupStream; std::stringstream pickupStream;
pickupStream << "\"classname\" \"" << pickupIter->second << "\"" << std::endl; pickupStream << "\"classname\" \"" << pickupIter->second << "\"" << std::endl;
convertedLines.push_back ( pickupStream.str() ); convertedLines.push_back ( pickupStream.str() );
// coordinates reordered to x, z, yentity // coordinates reordered to x, z, y
std::stringstream positionStream; std::stringstream positionStream;
positionStream << "\"origin\" \"" << coords[0] << " " << coords[2] << " " << positionStream << "\"origin\" \"" << coords[0] << " " << coords[2] << " " <<
offset(coords[1], OFFSET_PICKUP) << "\"" << std::endl; offset(coords[1], OFFSET_PICKUP) << "\"" << std::endl;
@ -641,10 +641,8 @@ EntityConverter::convertPointLight(const std::vector<std::string> &lines) const
float red; float red;
float green; float green;
float blue; float blue;
if ( haveColor ) {
// Convert 32bit hex RGBA value (ALPHA ALWAYS FULL) into RGB values // Convert 32bit hex RGBA value (ALPHA ALWAYS FULL) into RGB values
hexToRGB(color, red, green, blue); hexToRGB(color, red, green, blue);
}
std::stringstream colorStream; std::stringstream colorStream;
colorStream << "\"_color\" \"" << red << " " << green << " " << blue << "\"" << std::endl; colorStream << "\"_color\" \"" << red << " " << green << " " << blue << "\"" << std::endl;