zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-09-06 08:47:26 +00:00
Code Activity

chore: improve api for vector packing for models

Browse Source
This commit is contained in:
Jan
2024-08-10 13:54:46 +02:00
parent 1f5050befa
commit f653530714
17 changed files with 201 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
src/Common/Utils/Pack.cpp
View File

@@ -4,6 +4,7 @@
#include <algorithm>
#include <cassert>
#include <limits>
union PackUtil32
{
@@ -14,70 +15,98 @@ union PackUtil32
uint8_t uc[4];
};
uint32_t Pack32::Vec2PackTexCoords(const float* in)
namespace pack32
{
return static_cast<uint32_t>(HalfFloat::ToHalf(in[0])) << 16 | HalfFloat::ToHalf(in[1]);
}
uint32_t Vec2PackTexCoordsUV(const float (&in)[2])
{
return static_cast<uint32_t>(HalfFloat::ToHalf(in[1])) << 16 | HalfFloat::ToHalf(in[0]);
}
uint32_t Pack32::Vec3PackUnitVec(const float* in)
{
// TODO
return 0;
}
uint32_t Vec2PackTexCoordsVU(const float (&in)[2])
{
return static_cast<uint32_t>(HalfFloat::ToHalf(in[0])) << 16 | HalfFloat::ToHalf(in[1]);
}
uint32_t Pack32::Vec4PackGfxColor(const float* in)
{
return static_cast<uint8_t>(std::clamp(in[0], 0.0f, 1.0f) * 255.0f) | static_cast<uint8_t>(std::clamp(in[1], 0.0f, 1.0f) * 255.0f) << 8
| static_cast<uint8_t>(std::clamp(in[2], 0.0f, 1.0f) * 255.0f) << 16 | static_cast<uint8_t>(std::clamp(in[3], 0.0f, 1.0f) * 255.0f) << 24;
}
uint32_t Vec3PackUnitVecScaleBased(const float (&in)[3])
{
// TODO: Implement
assert(false);
return 0;
}
void Pack32::Vec2UnpackTexCoordsUV(const uint32_t in, float* out)
{
const auto inHiDw = static_cast<half_float_t>((in >> 16) & UINT16_MAX);
const auto inLoDw = static_cast<half_float_t>(in & UINT16_MAX);
uint32_t Vec3PackUnitVecThirdBased(const float (&in)[3])
{
// This is based on the game's reversed code, the original code may have made a bit more sense
PackUtil32 x;
x.f = (in[0] - -24624.0939334638f) * 0.0001218318939208984f;
PackUtil32 y;
y.f = (in[1] - -24624.0939334638f) * 0.0001218318939208984f;
PackUtil32 z;
z.f = (in[2] - -24624.0939334638f) * 0.0001218318939208984f;
out[0] = HalfFloat::ToFloat(inLoDw);
out[1] = HalfFloat::ToFloat(inHiDw);
}
return x.u | y.u << 10u | z.u << 20u;
}
void Pack32::Vec2UnpackTexCoordsVU(const uint32_t in, float* out)
{
const auto inHiDw = static_cast<half_float_t>((in >> 16) & UINT16_MAX);
const auto inLoDw = static_cast<half_float_t>(in & UINT16_MAX);
uint32_t Vec4PackGfxColor(const float (&in)[4])
{
// clang-format off
return static_cast<uint8_t>(std::clamp(in[0], 0.0f, 1.0f) * 255.0f)
| static_cast<uint8_t>(std::clamp(in[1], 0.0f, 1.0f) * 255.0f) << 8
| static_cast<uint8_t>(std::clamp(in[2], 0.0f, 1.0f) * 255.0f) << 16
| static_cast<uint8_t>(std::clamp(in[3], 0.0f, 1.0f) * 255.0f) << 24;
// clang-format on
}
out[0] = HalfFloat::ToFloat(inHiDw);
out[1] = HalfFloat::ToFloat(inLoDw);
}
void Vec2UnpackTexCoordsUV(const uint32_t in, float (&out)[2])
{
const auto inHiDw = static_cast<half_float_t>((in >> 16) & std::numeric_limits<uint16_t>::max());
const auto inLoDw = static_cast<half_float_t>(in & std::numeric_limits<uint16_t>::max());
void Pack32::Vec3UnpackUnitVecScaleBased(const uint32_t in, float* out)
{
assert(out != nullptr);
out[0] = HalfFloat::ToFloat(inLoDw);
out[1] = HalfFloat::ToFloat(inHiDw);
}
PackUtil32 _in{in};
const float decodeScale = (static_cast<float>(_in.uc[3]) - -192.0f) / 32385.0f;
out[0] = (static_cast<float>(_in.uc[0]) + -127.0f) * decodeScale;
out[1] = (static_cast<float>(_in.uc[1]) + -127.0f) * decodeScale;
out[2] = (static_cast<float>(_in.uc[2]) + -127.0f) * decodeScale;
}
void Vec2UnpackTexCoordsVU(const uint32_t in, float (&out)[2])
{
const auto inHiDw = static_cast<half_float_t>((in >> 16) & std::numeric_limits<uint16_t>::max());
const auto inLoDw = static_cast<half_float_t>(in & std::numeric_limits<uint16_t>::max());
void Pack32::Vec3UnpackUnitVecThirdBased(const uint32_t in, float* out)
{
PackUtil32 v0{(in >> 0) & 0x3FF};
PackUtil32 v1{(in >> 10) & 0x3FF};
PackUtil32 v2{(in >> 20) & 0x3FF};
out[0] = HalfFloat::ToFloat(inHiDw);
out[1] = HalfFloat::ToFloat(inLoDw);
}
v0.u = v0.u - 2 * (v0.u & 0x200) + 0x40400000;
v1.u = v1.u - 2 * (v1.u & 0x200) + 0x40400000;
v2.u = v2.u - 2 * (v2.u & 0x200) + 0x40400000;
out[0] = (v0.f - 3.0f) * 8208.0312f;
out[1] = (v1.f - 3.0f) * 8208.0312f;
out[2] = (v2.f - 3.0f) * 8208.0312f;
}
void Vec3UnpackUnitVecScaleBased(const uint32_t in, float (&out)[3])
{
assert(out != nullptr);
void Pack32::Vec4UnpackGfxColor(uint32_t in, float* out)
{
out[0] = static_cast<float>(in & UINT8_MAX) / 255.0f;
out[1] = static_cast<float>((in >> 8) & UINT8_MAX) / 255.0f;
out[2] = static_cast<float>((in >> 16) & UINT8_MAX) / 255.0f;
out[3] = static_cast<float>((in >> 24) & UINT8_MAX) / 255.0f;
}
const PackUtil32 inUtil{in};
const float decodeScale = (static_cast<float>(inUtil.uc[3]) - -192.0f) / 32385.0f;
out[0] = (static_cast<float>(inUtil.uc[0]) + -127.0f) * decodeScale;
out[1] = (static_cast<float>(inUtil.uc[1]) + -127.0f) * decodeScale;
out[2] = (static_cast<float>(inUtil.uc[2]) + -127.0f) * decodeScale;
}
void Vec3UnpackUnitVecThirdBased(const uint32_t in, float (&out)[3])
{
// This is based on the game's reversed code, the original code may have made a bit more sense
PackUtil32 v0{(in >> 0) & 0x3FF};
PackUtil32 v1{(in >> 10) & 0x3FF};
PackUtil32 v2{(in >> 20) & 0x3FF};
v0.u = v0.u - 2 * (v0.u & 0x200) + 0x40400000;
v1.u = v1.u - 2 * (v1.u & 0x200) + 0x40400000;
v2.u = v2.u - 2 * (v2.u & 0x200) + 0x40400000;
out[0] = (v0.f - 3.0f) * 8208.0312f;
out[1] = (v1.f - 3.0f) * 8208.0312f;
out[2] = (v2.f - 3.0f) * 8208.0312f;
}
void Vec4UnpackGfxColor(const uint32_t in, float (&out)[4])
{
out[0] = static_cast<float>(in & std::numeric_limits<uint8_t>::max()) / 255.0f;
out[1] = static_cast<float>((in >> 8) & std::numeric_limits<uint8_t>::max()) / 255.0f;
out[2] = static_cast<float>((in >> 16) & std::numeric_limits<uint8_t>::max()) / 255.0f;
out[3] = static_cast<float>((in >> 24) & std::numeric_limits<uint8_t>::max()) / 255.0f;
}
} // namespace pack32

24
src/Common/Utils/Pack.h
View File

@@ -2,17 +2,17 @@
#include <cstdint>
class Pack32
namespace pack32
{
Pack32() = default;
uint32_t Vec2PackTexCoordsUV(const float (&in)[2]);
uint32_t Vec2PackTexCoordsVU(const float (&in)[2]);
uint32_t Vec3PackUnitVecScaleBased(const float (&in)[3]);
uint32_t Vec3PackUnitVecThirdBased(const float (&in)[3]);
uint32_t Vec4PackGfxColor(const float (&in)[4]);
public:
static uint32_t Vec2PackTexCoords(const float* in);
static uint32_t Vec3PackUnitVec(const float* in);
static uint32_t Vec4PackGfxColor(const float* in);
static void Vec2UnpackTexCoordsUV(uint32_t in, float* out);
static void Vec2UnpackTexCoordsVU(uint32_t in, float* out);
static void Vec3UnpackUnitVecScaleBased(uint32_t in, float* out);
static void Vec3UnpackUnitVecThirdBased(uint32_t in, float* out);
static void Vec4UnpackGfxColor(uint32_t in, float* out);
};
void Vec2UnpackTexCoordsUV(uint32_t in, float (&out)[2]);
void Vec2UnpackTexCoordsVU(uint32_t in, float (&out)[2]);
void Vec3UnpackUnitVecScaleBased(uint32_t in, float (&out)[3]);
void Vec3UnpackUnitVecThirdBased(uint32_t in, float (&out)[3]);
void Vec4UnpackGfxColor(uint32_t in, float (&out)[4]);
}; // namespace pack32