AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Connection: Collapse definition of operator== for Vert 

This can be collapsed down to a single tie comparison
This commit is contained in:
Lioncash 2019-08-23 12:30:15 -04:00
parent 8fdd9a15c4
commit a3caa28483
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hecl/include/hecl/Blender/Connection.hpp
View File

@ -12,6 +12,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <array>
#include <cstdint> #include <cstdint>
#include <cstdio> #include <cstdio>
#include <cfloat> #include <cfloat>
@ -343,8 +344,8 @@ struct Mesh {
struct Vert { struct Vert {
uint32_t iPos = 0xffffffff; uint32_t iPos = 0xffffffff;
uint32_t iNorm = 0xffffffff; uint32_t iNorm = 0xffffffff;
uint32_t iColor[4] = {0xffffffff}; std::array<uint32_t, 4> iColor = {0xffffffff};
uint32_t iUv[8] = {0xffffffff}; std::array<uint32_t, 8> iUv = {0xffffffff};
uint32_t iSkin = 0xffffffff; uint32_t iSkin = 0xffffffff;
uint32_t iBankSkin = 0xffffffff; uint32_t iBankSkin = 0xffffffff;

33
hecl/lib/Blender/Connection.cpp
View File

@ -1,23 +1,25 @@
#include <algorithm>
#include <cerrno> #include <cerrno>
#include <chrono>
#include <cinttypes>
#include <csignal>
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <cinttypes>
#include <signal.h>
#include <system_error>
#include <string>
#include <algorithm>
#include <chrono>
#include <thread>
#include <mutex> #include <mutex>
#include <string>
#include <system_error>
#include <thread>
#include <tuple>
#include <hecl/hecl.hpp> #include <hecl/hecl.hpp>
#include <hecl/Database.hpp> #include <hecl/Database.hpp>
#include "logvisor/logvisor.hpp"
#include "hecl/Blender/Connection.hpp" #include "hecl/Blender/Connection.hpp"
#include "hecl/SteamFinder.hpp" #include "hecl/SteamFinder.hpp"
#include "MeshOptimizer.hpp" #include "MeshOptimizer.hpp"
#include <logvisor/logvisor.hpp>
#if _WIN32 #if _WIN32
#include <io.h> #include <io.h>
#include <fcntl.h> #include <fcntl.h>
@ -996,19 +998,8 @@ Material::Material(Connection& conn) {
} }
bool Mesh::Surface::Vert::operator==(const Vert& other) const { bool Mesh::Surface::Vert::operator==(const Vert& other) const {
if (iPos != other.iPos) return std::tie(iPos, iNorm, iColor, iUv, iSkin) ==
return false; std::tie(other.iPos, other.iNorm, other.iColor, other.iUv, other.iSkin);
if (iNorm != other.iNorm)
return false;
for (int i = 0; i < 4; ++i)
if (iColor[i] != other.iColor[i])
return false;
for (int i = 0; i < 8; ++i)
if (iUv[i] != other.iUv[i])
return false;
if (iSkin != other.iSkin)
return false;
return true;
} }
static bool VertInBank(const std::vector<uint32_t>& bank, uint32_t sIdx) { static bool VertInBank(const std::vector<uint32_t>& bank, uint32_t sIdx) {