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

Appended hex color to the end of material name

Browse Source
This commit is contained in:
2017-07-05 16:25:00 -07:00
parent dbcd7c59d8
commit a1f1a35372
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ReflexToQ3/includes/oopless-parser.hpp
View File

@ -118,7 +118,7 @@ using namespace std;
if (SECONDCH(fdata) == 'x') { if (SECONDCH(fdata) == 'x') {
// this is the unidentified hex digit. // this is the unidentified hex digit.
// out of range for stoi // out of range for stoi
x.hex = strtoul(fdata.c_str(), NULL, 16); x.hex = fdata;
hex = true; hex = true;
} }
} else if (!hex) { } else if (!hex) {

3
ReflexToQ3/includes/planes.cpp
View File

@ -90,6 +90,9 @@ std::vector<TPlanePoints> GetBrushPlanes(const TBrush& _krBrush)
} }
TPlanePoints PP = GetPlanePoints(Verts.data(), Verts.size()); TPlanePoints PP = GetPlanePoints(Verts.data(), Verts.size());
PP.m_material = krFace.m_Material; PP.m_material = krFace.m_Material;
if (!krFace.hex.empty()) {
PP.m_material.append("+" + krFace.hex);
}
Planes.push_back(PP); Planes.push_back(PP);
} }

2
ReflexToQ3/includes/worldspawn.h
View File

@ -18,7 +18,7 @@ struct TFace
float m_fYScale; float m_fYScale;
float m_fRotation; float m_fRotation;
std::vector<int> m_Indices; std::vector<int> m_Indices;
unsigned long hex; std::string hex;
std::string m_Material; std::string m_Material;
}; };