aboutsummaryrefslogtreecommitdiff
path: root/PhysX_3.4/Include/extensions
diff options
context:
space:
mode:
authorSheikh Dawood Abdul Ajees <[email protected]>2017-09-15 15:41:57 -0500
committerSheikh Dawood Abdul Ajees <[email protected]>2017-09-15 15:41:57 -0500
commitd1c812f1162e5fdb13c215792725b2591d7428f5 (patch)
tree407056c45c7e9320c48fca6a3697d81a061c4ea0 /PhysX_3.4/Include/extensions
parentPhysX 3.4, APEX 1.4 patch release @22121272 (diff)
downloadphysx-3.4-d1c812f1162e5fdb13c215792725b2591d7428f5.tar.xz
physx-3.4-d1c812f1162e5fdb13c215792725b2591d7428f5.zip
PhysX 3.4.1, APEX 1.4.1 Release @22845541v3.4.1
Diffstat (limited to 'PhysX_3.4/Include/extensions')
-rw-r--r--PhysX_3.4/Include/extensions/PxBinaryConverter.h10
-rw-r--r--PhysX_3.4/Include/extensions/PxClothFabricCooker.h5
-rw-r--r--PhysX_3.4/Include/extensions/PxClothMeshDesc.h4
-rw-r--r--PhysX_3.4/Include/extensions/PxClothMeshQuadifier.h5
-rw-r--r--PhysX_3.4/Include/extensions/PxClothTetherCooker.h10
-rw-r--r--PhysX_3.4/Include/extensions/PxDefaultAllocator.h4
6 files changed, 31 insertions, 7 deletions
diff --git a/PhysX_3.4/Include/extensions/PxBinaryConverter.h b/PhysX_3.4/Include/extensions/PxBinaryConverter.h
index 2ef86edc..bb923682 100644
--- a/PhysX_3.4/Include/extensions/PxBinaryConverter.h
+++ b/PhysX_3.4/Include/extensions/PxBinaryConverter.h
@@ -95,6 +95,16 @@ public:
virtual bool setMetaData(PxInputStream& srcMetaData, PxInputStream& dstMetaData) = 0;
/**
+ \brief Test utility function to compare two sets of meta data.
+
+ The meta data needs to be set before calling the compareMetaData method.
+ This method will issue PxErrorCode::eDEBUG_INFO messages if mismatches are encountered.
+
+ \return True if meta data is equivalend
+ */
+ virtual bool compareMetaData() const = 0;
+
+ /**
\brief Converts binary stream from source platform to target platform
The converter needs to be configured with source and destination meta data before calling the conversion method.
diff --git a/PhysX_3.4/Include/extensions/PxClothFabricCooker.h b/PhysX_3.4/Include/extensions/PxClothFabricCooker.h
index 8ace189c..52086950 100644
--- a/PhysX_3.4/Include/extensions/PxClothFabricCooker.h
+++ b/PhysX_3.4/Include/extensions/PxClothFabricCooker.h
@@ -48,7 +48,10 @@ class PxPhysics;
struct PxFabricCookerImpl;
-class PxClothFabricCooker
+/**
+\deprecated The PhysX cloth feature has been deprecated in PhysX version 3.4.1
+*/
+class PX_DEPRECATED PxClothFabricCooker
{
public:
/**
diff --git a/PhysX_3.4/Include/extensions/PxClothMeshDesc.h b/PhysX_3.4/Include/extensions/PxClothMeshDesc.h
index 18d686a6..30527a0f 100644
--- a/PhysX_3.4/Include/extensions/PxClothMeshDesc.h
+++ b/PhysX_3.4/Include/extensions/PxClothMeshDesc.h
@@ -45,10 +45,12 @@ namespace physx
/**
\brief Descriptor class for a cloth mesh.
+\deprecated The PhysX cloth feature has been deprecated in PhysX version 3.4.1
+
@see PxCooking.cookClothMesh()
*/
-class PxClothMeshDesc
+class PX_DEPRECATED PxClothMeshDesc
{
public:
diff --git a/PhysX_3.4/Include/extensions/PxClothMeshQuadifier.h b/PhysX_3.4/Include/extensions/PxClothMeshQuadifier.h
index aab8d9f9..82f7d6dd 100644
--- a/PhysX_3.4/Include/extensions/PxClothMeshQuadifier.h
+++ b/PhysX_3.4/Include/extensions/PxClothMeshQuadifier.h
@@ -41,7 +41,10 @@ namespace physx
struct PxClothMeshQuadifierImpl;
-class PxClothMeshQuadifier
+/**
+\deprecated The PhysX cloth feature has been deprecated in PhysX version 3.4.1
+*/
+class PX_DEPRECATED PxClothMeshQuadifier
{
public:
/**
diff --git a/PhysX_3.4/Include/extensions/PxClothTetherCooker.h b/PhysX_3.4/Include/extensions/PxClothTetherCooker.h
index d095f390..6817df99 100644
--- a/PhysX_3.4/Include/extensions/PxClothTetherCooker.h
+++ b/PhysX_3.4/Include/extensions/PxClothTetherCooker.h
@@ -41,7 +41,10 @@ namespace physx
struct PxClothSimpleTetherCookerImpl;
-class PxClothSimpleTetherCooker
+/**
+\deprecated The PhysX cloth feature has been deprecated in PhysX version 3.4.1
+*/
+class PX_DEPRECATED PxClothSimpleTetherCooker
{
public:
/**
@@ -71,7 +74,10 @@ private:
struct PxClothGeodesicTetherCookerImpl;
-class PxClothGeodesicTetherCooker
+/**
+\deprecated The PhysX cloth feature has been deprecated in PhysX version 3.4.1
+*/
+class PX_DEPRECATED PxClothGeodesicTetherCooker
{
public:
/**
diff --git a/PhysX_3.4/Include/extensions/PxDefaultAllocator.h b/PhysX_3.4/Include/extensions/PxDefaultAllocator.h
index c9b96e0d..a2f8f8be 100644
--- a/PhysX_3.4/Include/extensions/PxDefaultAllocator.h
+++ b/PhysX_3.4/Include/extensions/PxDefaultAllocator.h
@@ -40,7 +40,7 @@
#include <stdlib.h>
-#if PX_WINDOWS || PX_LINUX_FAMILY || PX_NX
+#if PX_WINDOWS || PX_LINUX_FAMILY || PX_SWITCH
#include <malloc.h>
#endif
@@ -60,7 +60,7 @@ PX_FORCE_INLINE void platformAlignedFree(void* ptr)
{
_aligned_free(ptr);
}
-#elif PX_LINUX_FAMILY || PX_NX
+#elif PX_LINUX_FAMILY || PX_SWITCH
PX_FORCE_INLINE void* platformAlignedAlloc(size_t size)
{
return ::memalign(16, size);