TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into ABAssetPreviewBitmapsFix

Browse source
This commit is contained in:
JeffR 2026-01-07 17:12:37 -06:00
parent 56db8cadd0 55f7b227f0
commit d95f5f798e
1 changed files with 49 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
Engine/source/gfx/bitmap/bitmapUtils.h
View file

@ -61,45 +61,39 @@ inline F32 convertHalfToFloat(U16 h)
U32 exp = (h >> 10) & 0x0000001F; U32 exp = (h >> 10) & 0x0000001F;
U32 mant = h & 0x000003FF; U32 mant = h & 0x000003FF;
U32 outSign = sign << 31; U32 out;
U32 outExp, outMant;
if (exp == 0) if (exp == 0)
{ {
if (mant == 0) if (mant == 0)
{ {
// Zero // Zero
outExp = 0; out = sign;
outMant = 0;
} }
else else
{ {
// Subnormal number -> normalize // Subnormal number -> normalize
exp = 1; exp = 127 - 14;
while ((mant & 0x00000400) == 0) while ((mant & 0x0400) == 0)
{ {
mant <<= 1; mant <<= 1;
exp -= 1; exp--;
} }
mant &= 0x000003FF; mant &= 0x03FF;
outExp = (exp + (127 - 15)) << 23; out = sign | (exp << 23) | (mant << 13);
outMant = mant << 13;
} }
} }
else if (exp == 31) else if (exp == 31)
{ {
// Inf or NaN // Inf or NaN
outExp = 0xFF << 23; out = sign | 0x7F800000 | (mant << 13);
outMant = mant ? (mant << 13) : 0;
} }
else else
{ {
// Normalized // Normalized
outExp = (exp + (127 - 15)) << 23; out = sign | ((exp + (127 - 15)) << 23) | (mant << 13);
outMant = mant << 13;
} }
U32 out = outSign | outExp | outMant;
F32 result; F32 result;
dMemcpy(&result, &out, sizeof(F32)); dMemcpy(&result, &out, sizeof(F32));
return result; return result;
@ -110,40 +104,54 @@ inline U16 convertFloatToHalf(F32 f)
U32 bits; U32 bits;
dMemcpy(&bits, &f, sizeof(U32)); dMemcpy(&bits, &f, sizeof(U32));
U32 sign = (bits >> 16) & 0x00008000; U32 sign = (bits >> 16) & 0x8000;
U32 exp = ((bits >> 23) & 0x000000FF) - (127 - 15); U32 exp = (bits >> 23) & 0xFF;
U32 mant = bits & 0x007FFFFF; U32 mant = bits & 0x007FFFFF;
if (exp <= 0) if (exp == 255)
{
if (exp < -10)
return (U16)sign; // Too small => 0
mant = (mant | 0x00800000) >> (1 - exp);
return (U16)(sign | (mant >> 13));
}
else if (exp == 0xFF - (127 - 15))
{ {
// Inf or NaN
if (mant == 0) if (mant == 0)
{
// Inf
return (U16)(sign | 0x7C00); return (U16)(sign | 0x7C00);
} mant >>= 13;
else return (U16)(sign | 0x7C00 | mant | (mant == 0));
{
// NaN
mant >>= 13;
return (U16)(sign | 0x7C00 | mant | (mant == 0));
}
} }
else
S32 newExp = (S32)exp - 127 + 15;
if (newExp >= 31)
{ {
if (exp > 30) // Overflow → Inf
{ return (U16)(sign | 0x7C00);
// Overflow => Inf
return (U16)(sign | 0x7C00);
}
return (U16)(sign | (exp << 10) | (mant >> 13));
} }
else if (newExp <= 0)
{
// Subnormal or underflow
if (newExp < -10)
return (U16)sign;
mant |= 0x800000;
U32 shifted = mant >> (1 - newExp);
// Round to nearest-even
if (shifted & 0x00001000)
shifted += 0x00002000;
return (U16)(sign | (shifted >> 13));
}
// Normalized with rounding
mant += 0x00001000;
if (mant & 0x00800000)
{
mant = 0;
newExp++;
}
if (newExp >= 31)
return (U16)(sign | 0x7C00);
return (U16)(sign | (newExp << 10) | (mant >> 13));
} }
// Convert a single 16-bit value (0..65535) to 8-bit (0..255) // Convert a single 16-bit value (0..65535) to 8-bit (0..255)