diff options
| author | sschirm <[email protected]> | 2017-02-27 16:40:12 +0100 |
|---|---|---|
| committer | sschirm <[email protected]> | 2017-03-01 18:04:26 +0100 |
| commit | 7840347c32755e94a807f978f1cbb558717ac8cf (patch) | |
| tree | 295cd3ca93a45f8fcc43cf3cbf3887c0e0c5526b /APEX_1.4/shared/external | |
| parent | Pre-release comments marking end of beta. (diff) | |
| download | physx-3.4-7840347c32755e94a807f978f1cbb558717ac8cf.tar.xz physx-3.4-7840347c32755e94a807f978f1cbb558717ac8cf.zip | |
PhysX 3.4, APEX 1.4 final release @21757769v3.4.0-rc-2
Diffstat (limited to 'APEX_1.4/shared/external')
| -rw-r--r-- | APEX_1.4/shared/external/include/DirEntry.h | 2 | ||||
| -rw-r--r-- | APEX_1.4/shared/external/include/TriangleMesh.h | 6 | ||||
| -rw-r--r-- | APEX_1.4/shared/external/src/UserAllocator.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/APEX_1.4/shared/external/include/DirEntry.h b/APEX_1.4/shared/external/include/DirEntry.h index 4bf44e92..64fd54cb 100644 --- a/APEX_1.4/shared/external/include/DirEntry.h +++ b/APEX_1.4/shared/external/include/DirEntry.h @@ -22,6 +22,8 @@ #include "linux/DirEntry.h" #elif PX_PS4 #include "ps4/DirEntry.h" +#elif PX_NX + #include "nx/DirEntry.h" #else #error "Platform not supported!" #endif diff --git a/APEX_1.4/shared/external/include/TriangleMesh.h b/APEX_1.4/shared/external/include/TriangleMesh.h index f9f2525c..c81ec82b 100644 --- a/APEX_1.4/shared/external/include/TriangleMesh.h +++ b/APEX_1.4/shared/external/include/TriangleMesh.h @@ -419,10 +419,8 @@ public: bool hasSkinningVertices(); private: - void operator=(const TriangleMesh& other) - { - *this = other; /* empty */ - } + void operator=(const TriangleMesh& other); // empty + void updateNormals(int subMeshNr); void updateTangents(); void updateBoneWeights(); diff --git a/APEX_1.4/shared/external/src/UserAllocator.cpp b/APEX_1.4/shared/external/src/UserAllocator.cpp index ded80705..ec131bc0 100644 --- a/APEX_1.4/shared/external/src/UserAllocator.cpp +++ b/APEX_1.4/shared/external/src/UserAllocator.cpp @@ -172,7 +172,7 @@ void* UserPxAllocator::allocate(size_t size, const char* typeName, const char* f #if PX_WINDOWS_FAMILY ret = ::_aligned_malloc(size, 16); -#elif PX_ANDROID || PX_LINUX_FAMILY +#elif PX_ANDROID || PX_LINUX_FAMILY || PX_NX /* Allocate size + (15 + sizeof(void*)) bytes and shift pointer further, write original address in the beginning of block.*/ /* Weirdly, memalign sometimes returns unaligned address */ // ret = ::memalign(size, 16); @@ -203,7 +203,7 @@ void UserPxAllocator::deallocate(void* memory) { #if PX_WINDOWS_FAMILY ::_aligned_free(memory); -#elif PX_ANDROID || PX_LINUX_FAMILY +#elif PX_ANDROID || PX_LINUX_FAMILY || PX_NX // Looks scary, but all it does is getting original unaligned block address back from 4/8 bytes (depends on pointer size) prior to <memory> pointer and frees this memory void* originalPtr = (void*)(*(size_t*)((char*)memory - sizeof(void*))); ::free(originalPtr); |