mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-01-26 02:07:26 +00:00
Code Issues Releases Wiki Activity

compile fixes for apple clang

Browse source
This commit is contained in:
fgenesis 2024-07-13 06:49:32 +02:00
parent a046038c33
commit 64c0c649cd
3 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ExternalLibs/glm/core/type_half.inl
View file

@ -116,9 +116,9 @@ namespace detail
// of float and half (127 versus 15). // of float and half (127 versus 15).
// //
register int s = (i >> 16) & 0x00008000; int s = (i >> 16) & 0x00008000;
register int e = ((i >> 23) & 0x000000ff) - (127 - 15); int e = ((i >> 23) & 0x000000ff) - (127 - 15);
register int m = i & 0x007fffff; int m = i & 0x007fffff;
// //
// Now reassemble s, e and m into a half: // Now reassemble s, e and m into a half:

10
ExternalLibs/tbsp.hh
View file

@ -365,7 +365,7 @@ public:
const size_t n = this->n; const size_t n = this->n;
tbsp__ASSERT(n == o.n); tbsp__ASSERT(n == o.n);
for(size_t i = 0; i < n; ++i) for(size_t i = 0; i < n; ++i)
s += a.p[i] * b.p[i]; s += p[i] * o.p[i];
return s; return s;
} }
@ -410,7 +410,9 @@ struct MatrixAcc
// and because math is backwards: // and because math is backwards:
// (h x w) * (H x W) -> (h x W) // (h x w) * (H x W) -> (h x W)
TBSP_ASSERT(size.w == o.size.h); TBSP_ASSERT(size.w == o.size.h);
Size2d wh { o.size.w, size.h }; Size2d wh;
wh.w = o.size.w;
wh.h = size.h;
return wh; return wh;
} }
@ -735,7 +737,7 @@ MatrixAcc<T> generateLeastSquares(T *mem, const MatrixAcc<T>& N)
{ {
MatrixAcc<T> M; MatrixAcc<T> M;
M.p = mem; M.p = mem;
M.size == getLeastSquaresSize(N); M.size = getLeastSquaresSize(N);
T * const pend = M.p + (M.size.w * M.size.h); T * const pend = M.p + (M.size.w * M.size.h);
@ -974,7 +976,7 @@ void chordal(T *parm, const P *points, size_t n)
{ {
const T dist = distance(points[i-1], points[i]); const T dist = distance(points[i-1], points[i]);
totaldist += dist; totaldist += dist;
parm[i] = totaldist parm[i] = totaldist;
} }
// Normalize to 0..1 // Normalize to 0..1

1
ExternalLibs/ttvfs/VFSDebug.h
View file

@ -2,6 +2,7 @@
#define TTVFS_DEBUG_H #define TTVFS_DEBUG_H
#include "VFSDefines.h" #include "VFSDefines.h"
#include <stddef.h>
#include <iosfwd> #include <iosfwd>
VFS_NAMESPACE_START VFS_NAMESPACE_START