diff options
| author | sschirm <[email protected]> | 2016-12-23 14:20:36 +0100 |
|---|---|---|
| committer | sschirm <[email protected]> | 2016-12-23 14:56:17 +0100 |
| commit | ef6937e69e8ee3f409cf9d460d5ad300a65d5924 (patch) | |
| tree | 710426e8daa605551ce3f34b581897011101c30f /APEX_1.4/NvParameterized/src | |
| parent | Initial commit: (diff) | |
| download | physx-3.4-ef6937e69e8ee3f409cf9d460d5ad300a65d5924.tar.xz physx-3.4-ef6937e69e8ee3f409cf9d460d5ad300a65d5924.zip | |
PhysX 3.4 / APEX 1.4 release candidate @21506124
Diffstat (limited to 'APEX_1.4/NvParameterized/src')
| -rw-r--r-- | APEX_1.4/NvParameterized/src/NvParameterized.cpp | 7 | ||||
| -rw-r--r-- | APEX_1.4/NvParameterized/src/NvSerializer.cpp | 10 |
2 files changed, 10 insertions, 7 deletions
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 <string.h> #include <PxSimpleTypes.h> #include <PsIntrinsics.h> +#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<float*>(ptr)[1], static_cast<float*>(ptr)[3]); swap(static_cast<float*>(ptr)[2], static_cast<float*>(ptr)[6]); swap(static_cast<float*>(ptr)[5], static_cast<float*>(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 } } diff --git a/APEX_1.4/NvParameterized/src/NvSerializer.cpp b/APEX_1.4/NvParameterized/src/NvSerializer.cpp index 0ec81855..76b48a07 100644 --- a/APEX_1.4/NvParameterized/src/NvSerializer.cpp +++ b/APEX_1.4/NvParameterized/src/NvSerializer.cpp @@ -168,9 +168,9 @@ bool GetPlatform(const char *name, SerializePlatform &platform_) } else if( 0 == strcmp("GccOsX64", name) ) { - platform.archType = SerializePlatform::ARCH_X86_64; - platform.compilerType = SerializePlatform::COMP_GCC; - platform.osType = SerializePlatform::OS_MACOSX; + platform_.archType = SerializePlatform::ARCH_X86_64; + platform_.compilerType = SerializePlatform::COMP_GCC; + platform_.osType = SerializePlatform::OS_MACOSX; } else if( 0 == strcmp("AndroidARM", name) ) { @@ -242,10 +242,10 @@ const char *GetPlatformName(const SerializePlatform &platform_) } case SerializePlatform::OS_MACOSX: - if( SerializePlatform::COMP_GCC != platform.compilerType ) + if( SerializePlatform::COMP_GCC != platform_.compilerType ) return unknown; - switch( platform.archType ) + switch( platform_.archType ) { case SerializePlatform::ARCH_X86: return "GccOsX32"; |