MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-06-25 22:09:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix NEON build

Browse Source
This commit is contained in:
fzurita 2018-06-16 09:35:51 -04:00 committed by Sergey Lipskiy
parent 3e0c635ad2
commit 3fe0f5ec67
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/3DMath.cpp
View File

@ -1,6 +1,5 @@
#include <math.h>
#include "3DMath.h"
#include "GBI.h"
void MultMatrix(float m0[4][4], float m1[4][4], float dest[4][4])
{
@ -144,15 +143,3 @@ void CopyMatrix( float m0[4][4], float m1[4][4] )
memcpy( m0, m1, 16 * sizeof( float ) );
#endif // WIN32_ASM
}
float GetFloatMatrixElement(s16 _int, u16 _fract)
{
const s32 element = (_int << 16) | _fract;
return _FIXED2FLOAT(element, 16);
}
std::pair<s16, u16> GetIntMatrixElement(f32 _elem)
{
const s32 value = static_cast<s32>(_elem * 65536.0f);
return std::pair<s16, u16>(static_cast<s16>(value >> 16), static_cast<u16>(value & 0xFFFF));
}

14
src/3DMath.h
View File

@ -4,6 +4,7 @@
#include <memory.h>
#include <string.h>
#include <Types.h>
#include "GBI.h"
void MultMatrix(float m0[4][4], float m1[4][4], float dest[4][4]);
void MultMatrix2(float m0[4][4], float m1[4][4]);
@ -39,7 +40,16 @@ inline float DotProduct(const float v0[3], const float v1[3])
return dot;
}
float GetFloatMatrixElement(s16 _int, u16 _fract);
std::pair<s16, u16> GetIntMatrixElement(f32 _elem);
inline float GetFloatMatrixElement(s16 _int, u16 _fract)
{
const s32 element = (_int << 16) | _fract;
return _FIXED2FLOAT(element, 16);
}
inline std::pair<s16, u16> GetIntMatrixElement(f32 _elem)
{
const s32 value = static_cast<s32>(_elem * 65536.0f);
return std::pair<s16, u16>(static_cast<s16>(value >> 16), static_cast<u16>(value & 0xFFFF));
}
#endif