From ef6937e69e8ee3f409cf9d460d5ad300a65d5924 Mon Sep 17 00:00:00 2001 From: sschirm Date: Fri, 23 Dec 2016 14:20:36 +0100 Subject: PhysX 3.4 / APEX 1.4 release candidate @21506124 --- APEX_1.4/NvParameterized/src/NvParameterized.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'APEX_1.4/NvParameterized/src/NvParameterized.cpp') diff --git a/APEX_1.4/NvParameterized/src/NvParameterized.cpp b/APEX_1.4/NvParameterized/src/NvParameterized.cpp index 64ed67c5..0e164abd 100644 --- a/APEX_1.4/NvParameterized/src/NvParameterized.cpp +++ b/APEX_1.4/NvParameterized/src/NvParameterized.cpp @@ -30,6 +30,7 @@ #include #include #include +#include "ApexDefs.h" #if PX_VC && !PX_PS4 #pragma warning(disable:4996 4310) @@ -5650,11 +5651,12 @@ ErrorType NvParameters::rawSetParamMat34Legacy(const Handle &handle, const float physx::intrinsics::memCopy(ptr, val, 12 * sizeof(float)); +#if APEX_UE4 // swap raw-column major swap(static_cast(ptr)[1], static_cast(ptr)[3]); swap(static_cast(ptr)[2], static_cast(ptr)[6]); swap(static_cast(ptr)[5], static_cast(ptr)[7]); - +#endif return(ERROR_NONE); } @@ -5720,10 +5722,11 @@ ErrorType NvParameters::rawSetParamMat34LegacyArray(const Handle &handle, const const float* src = array + 12 * sizeof(float) * i; physx::intrinsics::memCopy(dst, src, 12 * sizeof(float)); - +#if APEX_UE4 swap(dst[1], dst[3]); swap(dst[2], dst[6]); swap(dst[5], dst[7]); +#endif } } -- cgit v1.2.3