mirror of
https://github.com/Laupetin/OpenAssetTools.git
synced 2025-04-19 15:52:53 +00:00
Merge branch 'Laupetin:main' into fix/T6-clipmap-asset
This commit is contained in:
commit
f97f38dc31
@ -3814,7 +3814,8 @@ namespace T6
|
|||||||
uint16_t dynEntId;
|
uint16_t dynEntId;
|
||||||
};
|
};
|
||||||
|
|
||||||
union gcc_align(8) __m128
|
// Usually __m128, but that is not portable
|
||||||
|
union gcc_align(8) custom_m128
|
||||||
{
|
{
|
||||||
float m128_f32[4];
|
float m128_f32[4];
|
||||||
uint64_t m128_u64[2];
|
uint64_t m128_u64[2];
|
||||||
@ -3827,19 +3828,12 @@ namespace T6
|
|||||||
unsigned int m128_u32[4];
|
unsigned int m128_u32[4];
|
||||||
};
|
};
|
||||||
|
|
||||||
struct vector3
|
|
||||||
{
|
|
||||||
__m128 x;
|
|
||||||
__m128 y;
|
|
||||||
__m128 z;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct vector4
|
struct vector4
|
||||||
{
|
{
|
||||||
__m128 x;
|
custom_m128 x;
|
||||||
__m128 y;
|
custom_m128 y;
|
||||||
__m128 z;
|
custom_m128 z;
|
||||||
__m128 w;
|
custom_m128 w;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct type_align(16) SSkinInstance
|
struct type_align(16) SSkinInstance
|
||||||
|
2
thirdparty/catch2
vendored
2
thirdparty/catch2
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 914aeecfe23b1e16af6ea675a4fb5dbd5a5b8d0a
|
Subproject commit 76f70b1403dbc0781216f49e20e45b71f7eccdd8
|
2
thirdparty/eigen
vendored
2
thirdparty/eigen
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 5fc6fc9881dd533fc21da10ed3f6d2f2536deac5
|
Subproject commit 6579e36eb4f19e4a01d89277f927da8391a74c04
|
2
thirdparty/json
vendored
2
thirdparty/json
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 8215dbafbdab7c166fad02db86d4ea2a82f851c7
|
Subproject commit 11a835df85677002a8aadc5b4e945684c5b7f68b
|
2
thirdparty/libtomcrypt
vendored
2
thirdparty/libtomcrypt
vendored
@ -1 +1 @@
|
|||||||
Subproject commit d032686639224b3efd89b802edaff3c52d8592f7
|
Subproject commit a6b9aff7aab857fe1b491710a5c5b9e2be49cb08
|
2
thirdparty/libtommath
vendored
2
thirdparty/libtommath
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 5938524c60a7168ba5babb3e47b5cd4ee6eadb46
|
Subproject commit e823b0c34cea291bdb94d672731e1c1f08525557
|
Loading…
x
Reference in New Issue
Block a user