olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use tie for mtexinfo too

This commit is contained in:
Jonathan 2021-09-06 22:15:59 -04:00
parent 398b865c96
commit acc65953ce
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/qbsp/qbsp.hh
View File

@ -146,28 +146,17 @@ typedef struct mtexinfo_s {
int32_t miptex;
surfflags_t flags;
int outputnum; // -1 until added to bsp
constexpr auto as_tuple() const {
return std::tie(vecs, miptex, flags);
}
bool operator<(const mtexinfo_s &other) const {
if (this->miptex < other.miptex)
return true;
if (this->miptex > other.miptex)
return false;
if (this->flags < other.flags)
return true;
if (this->flags > other.flags)
return false;
for (int i=0; i<2; i++) {
for (int j=0; j<4; j++) {
if (this->vecs[i][j] < other.vecs[i][j])
return true;
if (this->vecs[i][j] > other.vecs[i][j])
return false;
}
}
return false;
constexpr bool operator<(const mtexinfo_s &other) const {
return as_tuple() < other.as_tuple();
}
constexpr bool operator>(const mtexinfo_s &other) const {
return as_tuple() > other.as_tuple();
}
} mtexinfo_t;