aboutsummaryrefslogtreecommitdiff
path: root/PhysX_3.4/Source/PhysX/src
diff options
context:
space:
mode:
authorSheikh Dawood <[email protected]>2018-05-25 09:54:38 -0500
committerSheikh Dawood <[email protected]>2018-05-25 09:54:38 -0500
commitb99b3783cd7e3fb1bb0a07dc472b2fc000c4cdc1 (patch)
treede67d7adc7cc66d44c3e0a399d94d1db6bcebd0c /PhysX_3.4/Source/PhysX/src
parentPhysX 3.4, APEX 1.4 patch release @23933511 (diff)
downloadphysx-3.4-b99b3783cd7e3fb1bb0a07dc472b2fc000c4cdc1.tar.xz
physx-3.4-b99b3783cd7e3fb1bb0a07dc472b2fc000c4cdc1.zip
PhysX 3.4, APEX 1.4 patch release @24214033v3.4.2
Diffstat (limited to 'PhysX_3.4/Source/PhysX/src')
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpActor.cpp7
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpActor.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpActorTemplate.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpAggregate.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpAggregate.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpArticulation.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpArticulation.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpArticulationJoint.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpArticulationJoint.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpArticulationLink.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpArticulationLink.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpBatchQuery.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpBatchQuery.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpCast.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpConnector.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpConstraint.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpConstraint.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpFactory.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpFactory.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpMaterial.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpMaterial.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpMaterialManager.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpMetaData.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpPhysics.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpPhysics.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpPhysicsInsertionCallback.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpPtrTableStorageManager.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpPvdSceneQueryCollector.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpPvdSceneQueryCollector.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpQueryShared.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpReadCheck.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpReadCheck.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpRigidActorTemplate.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpRigidActorTemplateInternal.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpRigidBodyTemplate.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpRigidDynamic.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpRigidDynamic.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpRigidStatic.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpRigidStatic.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpScene.cpp54
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpScene.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpSceneQueries.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpSerializerAdapter.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpShape.cpp6
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpShape.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpShapeManager.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpShapeManager.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpSpatialIndex.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpSpatialIndex.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpVolumeCache.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpVolumeCache.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpWriteCheck.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/NpWriteCheck.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/PvdMetaDataBindingData.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/PvdMetaDataPvdBinding.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/PvdMetaDataPvdBinding.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/PvdPhysicsClient.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/PvdPhysicsClient.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/PvdTypeNames.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbActor.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbActor.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbAggregate.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbAggregate.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbArticulation.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbArticulationJoint.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbBase.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbBase.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbBody.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbCloth.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbCloth.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbConstraint.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbDefs.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbMetaData.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbNpDeps.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbRigidObject.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbRigidStatic.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbScene.cpp9
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbScene.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbSceneBuffer.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbShape.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbShape.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/buffering/ScbType.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/cloth/NpCloth.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/cloth/NpCloth.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/cloth/NpClothFabric.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/cloth/NpClothFabric.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/cloth/NpClothParticleData.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/cloth/NpClothParticleData.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/device/PhysXIndicator.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/device/linux/PhysXIndicatorLinux.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/device/nvPhysXtoDrv.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/device/windows/PhysXIndicatorWindows.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/gpu/NpPhysicsGpu.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/gpu/NpPhysicsGpu.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/gpu/PxGpu.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/gpu/PxParticleDeviceExclusive.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/gpu/PxParticleGpu.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/gpu/PxPhysXGpuModuleLoader.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/gpu/PxPhysXIndicatorDeviceExclusive.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/particles/NpParticleBaseTemplate.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/particles/NpParticleFluidReadData.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/particles/NpParticleSystem.cpp2
-rw-r--r--PhysX_3.4/Source/PhysX/src/particles/NpParticleSystem.h2
-rw-r--r--PhysX_3.4/Source/PhysX/src/windows/NpWindowsDelayLoadHook.cpp2
111 files changed, 151 insertions, 139 deletions
diff --git a/PhysX_3.4/Source/PhysX/src/NpActor.cpp b/PhysX_3.4/Source/PhysX/src/NpActor.cpp
index 7651a5e8..2b25a46c 100644
--- a/PhysX_3.4/Source/PhysX/src/NpActor.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpActor.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
@@ -452,11 +452,6 @@ namespace
{
return static_cast<NpActor*>(static_cast<N*>(p));
}
-
- template <typename N> const NpActor* pxToNpActor(const PxActor *p)
- {
- return static_cast<const NpActor*>(static_cast<const N*>(p));
- }
}
NpActor::Offsets::Offsets()
diff --git a/PhysX_3.4/Source/PhysX/src/NpActor.h b/PhysX_3.4/Source/PhysX/src/NpActor.h
index c1472e07..a439c1a7 100644
--- a/PhysX_3.4/Source/PhysX/src/NpActor.h
+++ b/PhysX_3.4/Source/PhysX/src/NpActor.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpActorTemplate.h b/PhysX_3.4/Source/PhysX/src/NpActorTemplate.h
index c04678fe..7de4eafc 100644
--- a/PhysX_3.4/Source/PhysX/src/NpActorTemplate.h
+++ b/PhysX_3.4/Source/PhysX/src/NpActorTemplate.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpAggregate.cpp b/PhysX_3.4/Source/PhysX/src/NpAggregate.cpp
index e60aac1c..cc98e656 100644
--- a/PhysX_3.4/Source/PhysX/src/NpAggregate.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpAggregate.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpAggregate.h b/PhysX_3.4/Source/PhysX/src/NpAggregate.h
index 464132dd..b09eb8f7 100644
--- a/PhysX_3.4/Source/PhysX/src/NpAggregate.h
+++ b/PhysX_3.4/Source/PhysX/src/NpAggregate.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpArticulation.cpp b/PhysX_3.4/Source/PhysX/src/NpArticulation.cpp
index c29a0d5b..1486441a 100644
--- a/PhysX_3.4/Source/PhysX/src/NpArticulation.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpArticulation.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpArticulation.h b/PhysX_3.4/Source/PhysX/src/NpArticulation.h
index d68e6e8f..f167df3f 100644
--- a/PhysX_3.4/Source/PhysX/src/NpArticulation.h
+++ b/PhysX_3.4/Source/PhysX/src/NpArticulation.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpArticulationJoint.cpp b/PhysX_3.4/Source/PhysX/src/NpArticulationJoint.cpp
index fe8157ed..235a1c88 100644
--- a/PhysX_3.4/Source/PhysX/src/NpArticulationJoint.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpArticulationJoint.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpArticulationJoint.h b/PhysX_3.4/Source/PhysX/src/NpArticulationJoint.h
index d50d0c6a..3c48e537 100644
--- a/PhysX_3.4/Source/PhysX/src/NpArticulationJoint.h
+++ b/PhysX_3.4/Source/PhysX/src/NpArticulationJoint.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpArticulationLink.cpp b/PhysX_3.4/Source/PhysX/src/NpArticulationLink.cpp
index 05ec51d6..fc1411e8 100644
--- a/PhysX_3.4/Source/PhysX/src/NpArticulationLink.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpArticulationLink.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpArticulationLink.h b/PhysX_3.4/Source/PhysX/src/NpArticulationLink.h
index 73d74313..fd220b97 100644
--- a/PhysX_3.4/Source/PhysX/src/NpArticulationLink.h
+++ b/PhysX_3.4/Source/PhysX/src/NpArticulationLink.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpBatchQuery.cpp b/PhysX_3.4/Source/PhysX/src/NpBatchQuery.cpp
index 0ca62673..5b6a0ff9 100644
--- a/PhysX_3.4/Source/PhysX/src/NpBatchQuery.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpBatchQuery.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpBatchQuery.h b/PhysX_3.4/Source/PhysX/src/NpBatchQuery.h
index 05569153..6d9a7bd1 100644
--- a/PhysX_3.4/Source/PhysX/src/NpBatchQuery.h
+++ b/PhysX_3.4/Source/PhysX/src/NpBatchQuery.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpCast.h b/PhysX_3.4/Source/PhysX/src/NpCast.h
index 68cac29d..79bd5d99 100644
--- a/PhysX_3.4/Source/PhysX/src/NpCast.h
+++ b/PhysX_3.4/Source/PhysX/src/NpCast.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpConnector.h b/PhysX_3.4/Source/PhysX/src/NpConnector.h
index b82ecd27..899d0502 100644
--- a/PhysX_3.4/Source/PhysX/src/NpConnector.h
+++ b/PhysX_3.4/Source/PhysX/src/NpConnector.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpConstraint.cpp b/PhysX_3.4/Source/PhysX/src/NpConstraint.cpp
index 2b02033f..8c915a4d 100644
--- a/PhysX_3.4/Source/PhysX/src/NpConstraint.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpConstraint.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpConstraint.h b/PhysX_3.4/Source/PhysX/src/NpConstraint.h
index 2fa01e59..426080eb 100644
--- a/PhysX_3.4/Source/PhysX/src/NpConstraint.h
+++ b/PhysX_3.4/Source/PhysX/src/NpConstraint.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpFactory.cpp b/PhysX_3.4/Source/PhysX/src/NpFactory.cpp
index 0c630ac7..f1aa7d0d 100644
--- a/PhysX_3.4/Source/PhysX/src/NpFactory.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpFactory.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpFactory.h b/PhysX_3.4/Source/PhysX/src/NpFactory.h
index bdfcc39c..364823ea 100644
--- a/PhysX_3.4/Source/PhysX/src/NpFactory.h
+++ b/PhysX_3.4/Source/PhysX/src/NpFactory.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpMaterial.cpp b/PhysX_3.4/Source/PhysX/src/NpMaterial.cpp
index ebd0a8d8..ada6e08e 100644
--- a/PhysX_3.4/Source/PhysX/src/NpMaterial.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpMaterial.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpMaterial.h b/PhysX_3.4/Source/PhysX/src/NpMaterial.h
index b1c8636d..0f17e2de 100644
--- a/PhysX_3.4/Source/PhysX/src/NpMaterial.h
+++ b/PhysX_3.4/Source/PhysX/src/NpMaterial.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpMaterialManager.h b/PhysX_3.4/Source/PhysX/src/NpMaterialManager.h
index 7eb9a3ea..db918621 100644
--- a/PhysX_3.4/Source/PhysX/src/NpMaterialManager.h
+++ b/PhysX_3.4/Source/PhysX/src/NpMaterialManager.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpMetaData.cpp b/PhysX_3.4/Source/PhysX/src/NpMetaData.cpp
index a2267191..b7f39b61 100644
--- a/PhysX_3.4/Source/PhysX/src/NpMetaData.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpMetaData.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpPhysics.cpp b/PhysX_3.4/Source/PhysX/src/NpPhysics.cpp
index 606f55b6..9c8f009a 100644
--- a/PhysX_3.4/Source/PhysX/src/NpPhysics.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpPhysics.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpPhysics.h b/PhysX_3.4/Source/PhysX/src/NpPhysics.h
index bcbfa9f0..b8bb13d5 100644
--- a/PhysX_3.4/Source/PhysX/src/NpPhysics.h
+++ b/PhysX_3.4/Source/PhysX/src/NpPhysics.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpPhysicsInsertionCallback.h b/PhysX_3.4/Source/PhysX/src/NpPhysicsInsertionCallback.h
index 3c917998..0be2a41a 100644
--- a/PhysX_3.4/Source/PhysX/src/NpPhysicsInsertionCallback.h
+++ b/PhysX_3.4/Source/PhysX/src/NpPhysicsInsertionCallback.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpPtrTableStorageManager.h b/PhysX_3.4/Source/PhysX/src/NpPtrTableStorageManager.h
index 65421be8..80f307e7 100644
--- a/PhysX_3.4/Source/PhysX/src/NpPtrTableStorageManager.h
+++ b/PhysX_3.4/Source/PhysX/src/NpPtrTableStorageManager.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpPvdSceneQueryCollector.cpp b/PhysX_3.4/Source/PhysX/src/NpPvdSceneQueryCollector.cpp
index 03d8d4af..7dc14615 100644
--- a/PhysX_3.4/Source/PhysX/src/NpPvdSceneQueryCollector.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpPvdSceneQueryCollector.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpPvdSceneQueryCollector.h b/PhysX_3.4/Source/PhysX/src/NpPvdSceneQueryCollector.h
index 81a5ce2d..6b906e2a 100644
--- a/PhysX_3.4/Source/PhysX/src/NpPvdSceneQueryCollector.h
+++ b/PhysX_3.4/Source/PhysX/src/NpPvdSceneQueryCollector.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpQueryShared.h b/PhysX_3.4/Source/PhysX/src/NpQueryShared.h
index ad862a12..0bdc27f3 100644
--- a/PhysX_3.4/Source/PhysX/src/NpQueryShared.h
+++ b/PhysX_3.4/Source/PhysX/src/NpQueryShared.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpReadCheck.cpp b/PhysX_3.4/Source/PhysX/src/NpReadCheck.cpp
index 823c074b..80b6711c 100644
--- a/PhysX_3.4/Source/PhysX/src/NpReadCheck.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpReadCheck.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpReadCheck.h b/PhysX_3.4/Source/PhysX/src/NpReadCheck.h
index 4c9c2bc0..233afed7 100644
--- a/PhysX_3.4/Source/PhysX/src/NpReadCheck.h
+++ b/PhysX_3.4/Source/PhysX/src/NpReadCheck.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpRigidActorTemplate.h b/PhysX_3.4/Source/PhysX/src/NpRigidActorTemplate.h
index 855409a1..7a6413b7 100644
--- a/PhysX_3.4/Source/PhysX/src/NpRigidActorTemplate.h
+++ b/PhysX_3.4/Source/PhysX/src/NpRigidActorTemplate.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpRigidActorTemplateInternal.h b/PhysX_3.4/Source/PhysX/src/NpRigidActorTemplateInternal.h
index 57b94d77..00b4e621 100644
--- a/PhysX_3.4/Source/PhysX/src/NpRigidActorTemplateInternal.h
+++ b/PhysX_3.4/Source/PhysX/src/NpRigidActorTemplateInternal.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpRigidBodyTemplate.h b/PhysX_3.4/Source/PhysX/src/NpRigidBodyTemplate.h
index 34e124cf..41148e20 100644
--- a/PhysX_3.4/Source/PhysX/src/NpRigidBodyTemplate.h
+++ b/PhysX_3.4/Source/PhysX/src/NpRigidBodyTemplate.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.cpp b/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.cpp
index a0cd6cbd..8328dcef 100644
--- a/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.h b/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.h
index 9104d883..a53b02b6 100644
--- a/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.h
+++ b/PhysX_3.4/Source/PhysX/src/NpRigidDynamic.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpRigidStatic.cpp b/PhysX_3.4/Source/PhysX/src/NpRigidStatic.cpp
index 7049db6c..b963287a 100644
--- a/PhysX_3.4/Source/PhysX/src/NpRigidStatic.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpRigidStatic.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpRigidStatic.h b/PhysX_3.4/Source/PhysX/src/NpRigidStatic.h
index c6f7e1c2..4d2cc5df 100644
--- a/PhysX_3.4/Source/PhysX/src/NpRigidStatic.h
+++ b/PhysX_3.4/Source/PhysX/src/NpRigidStatic.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpScene.cpp b/PhysX_3.4/Source/PhysX/src/NpScene.cpp
index 4ba6334a..59a7ae37 100644
--- a/PhysX_3.4/Source/PhysX/src/NpScene.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpScene.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
@@ -2345,7 +2345,10 @@ bool NpScene::fetchResults(bool block, PxU32* errorState)
}
#if PX_SUPPORT_PVD
- mScene.getScenePvdClient().frameEnd();
+ {
+ PX_SIMD_GUARD;
+ mScene.getScenePvdClient().frameEnd();
+ }
#endif
return true;
}
@@ -2865,6 +2868,17 @@ namespace
{
struct ThreadReadWriteCount
{
+ ThreadReadWriteCount(const size_t data)
+ : readDepth(data & 0xFF),
+ writeDepth((data >> 8) & 0xFF),
+ readLockDepth((data >> 16) & 0xFF),
+ writeLockDepth((data >> 24) & 0xFF)
+ {
+
+ }
+
+ size_t getData() const { return size_t(writeLockDepth) << 24 | size_t(readLockDepth) << 16 | size_t(writeDepth) << 8 | size_t(readDepth); }
+
PxU8 readDepth; // depth of re-entrant reads
PxU8 writeDepth; // depth of re-entrant writes
@@ -2881,7 +2895,7 @@ NpScene::StartWriteResult::Enum NpScene::startWrite(bool allowReentry)
if (mScene.getFlags() & PxSceneFlag::eREQUIRE_RW_LOCK)
{
- ThreadReadWriteCount localCounts = PxUnionCast<ThreadReadWriteCount>(TlsGet(mThreadReadWriteDepth));
+ ThreadReadWriteCount localCounts(TlsGetValue(mThreadReadWriteDepth));
if (mBetweenFetchResults)
return StartWriteResult::eIN_FETCHRESULTS;
@@ -2891,7 +2905,7 @@ NpScene::StartWriteResult::Enum NpScene::startWrite(bool allowReentry)
}
{
- ThreadReadWriteCount localCounts = PxUnionCast<ThreadReadWriteCount>(TlsGet(mThreadReadWriteDepth));
+ ThreadReadWriteCount localCounts(TlsGetValue(mThreadReadWriteDepth));
StartWriteResult::Enum result;
if (mBetweenFetchResults)
@@ -2912,7 +2926,7 @@ NpScene::StartWriteResult::Enum NpScene::startWrite(bool allowReentry)
// by 2 to force subsequent writes to fail by creating a mismatch between
// the concurrent write counter and the local counter, any value > 1 will do
localCounts.writeDepth += allowReentry ? 1 : 2;
- TlsSet(mThreadReadWriteDepth, PxUnionCast<void*>(localCounts));
+ TlsSetValue(mThreadReadWriteDepth, localCounts.getData());
if (result != StartWriteResult::eOK)
Ps::atomicIncrement(&mConcurrentErrorCount);
@@ -2928,7 +2942,7 @@ void NpScene::stopWrite(bool allowReentry)
Ps::atomicDecrement(&mConcurrentWriteCount);
// decrement depth of writes for this thread
- ThreadReadWriteCount localCounts = PxUnionCast<ThreadReadWriteCount>(TlsGet(mThreadReadWriteDepth));
+ ThreadReadWriteCount localCounts (TlsGetValue(mThreadReadWriteDepth));
// see comment in startWrite()
if (allowReentry)
@@ -2936,7 +2950,7 @@ void NpScene::stopWrite(bool allowReentry)
else
localCounts.writeDepth-=2;
- TlsSet(mThreadReadWriteDepth, PxUnionCast<void*>(localCounts));
+ TlsSetValue(mThreadReadWriteDepth, localCounts.getData());
}
}
@@ -2944,7 +2958,7 @@ bool NpScene::startRead() const
{
if (mScene.getFlags() & PxSceneFlag::eREQUIRE_RW_LOCK)
{
- ThreadReadWriteCount localCounts = PxUnionCast<ThreadReadWriteCount>(TlsGet(mThreadReadWriteDepth));
+ ThreadReadWriteCount localCounts (TlsGetValue(mThreadReadWriteDepth));
// ensure we already have the write or read lock
return localCounts.writeLockDepth > 0 || localCounts.readLockDepth > 0;
@@ -2954,9 +2968,9 @@ bool NpScene::startRead() const
Ps::atomicIncrement(&mConcurrentReadCount);
// update current threads read depth
- ThreadReadWriteCount localCounts = PxUnionCast<ThreadReadWriteCount>(TlsGet(mThreadReadWriteDepth));
+ ThreadReadWriteCount localCounts (TlsGetValue(mThreadReadWriteDepth));
localCounts.readDepth++;
- TlsSet(mThreadReadWriteDepth, PxUnionCast<void*>(localCounts));
+ TlsSetValue(mThreadReadWriteDepth, localCounts.getData());
// success if the current thread is already performing a write (API re-entry) or no writes are in progress
bool success = (localCounts.writeDepth > 0 || mConcurrentWriteCount == 0);
@@ -2975,9 +2989,9 @@ void NpScene::stopRead() const
Ps::atomicDecrement(&mConcurrentReadCount);
// update local threads read depth
- ThreadReadWriteCount localCounts = PxUnionCast<ThreadReadWriteCount>(TlsGet(mThreadReadWriteDepth));
+ ThreadReadWriteCount localCounts (TlsGetValue(mThreadReadWriteDepth));
localCounts.readDepth--;
- TlsSet(mThreadReadWriteDepth, PxUnionCast<void*>(localCounts));
+ TlsSetValue(mThreadReadWriteDepth, localCounts.getData());
}
}
@@ -2994,9 +3008,9 @@ void NpScene::stopRead() const {}
void NpScene::lockRead(const char* /*file*/, PxU32 /*line*/)
{
// increment this threads read depth
- ThreadReadWriteCount localCounts = PxUnionCast<ThreadReadWriteCount>(TlsGet(mThreadReadWriteDepth));
+ ThreadReadWriteCount localCounts (TlsGetValue(mThreadReadWriteDepth));
localCounts.readLockDepth++;
- TlsSet(mThreadReadWriteDepth, PxUnionCast<void*>(localCounts));
+ TlsSetValue(mThreadReadWriteDepth, localCounts.getData());
// only lock on first read
// if we are the current writer then increment the reader count but don't actually lock (allow reading from threads with write ownership)
@@ -3007,14 +3021,14 @@ void NpScene::lockRead(const char* /*file*/, PxU32 /*line*/)
void NpScene::unlockRead()
{
// increment this threads read depth
- ThreadReadWriteCount localCounts = PxUnionCast<ThreadReadWriteCount>(TlsGet(mThreadReadWriteDepth));
+ ThreadReadWriteCount localCounts (TlsGetValue(mThreadReadWriteDepth));
if(localCounts.readLockDepth < 1)
{
Ps::getFoundation().error(PxErrorCode::eINVALID_OPERATION, __FILE__, __LINE__, "PxScene::unlockRead() called without matching call to PxScene::lockRead(), behaviour will be undefined.");
return;
}
localCounts.readLockDepth--;
- TlsSet(mThreadReadWriteDepth, PxUnionCast<void*>(localCounts));
+ TlsSetValue(mThreadReadWriteDepth, localCounts.getData());
// only unlock on last read
if(localCounts.readLockDepth == 0)
@@ -3024,14 +3038,14 @@ void NpScene::unlockRead()
void NpScene::lockWrite(const char* file, PxU32 line)
{
// increment this threads write depth
- ThreadReadWriteCount localCounts = PxUnionCast<ThreadReadWriteCount>(TlsGet(mThreadReadWriteDepth));
+ ThreadReadWriteCount localCounts (TlsGetValue(mThreadReadWriteDepth));
if (localCounts.writeLockDepth == 0 && localCounts.readLockDepth > 0)
{
Ps::getFoundation().error(PxErrorCode::eINVALID_OPERATION, file?file:__FILE__, file?int(line):__LINE__, "PxScene::lockWrite() detected after a PxScene::lockRead(), lock upgrading is not supported, behaviour will be undefined.");
return;
}
localCounts.writeLockDepth++;
- TlsSet(mThreadReadWriteDepth, PxUnionCast<void*>(localCounts));
+ TlsSetValue(mThreadReadWriteDepth, localCounts.getData());
// only lock on first call
if (localCounts.writeLockDepth == 1)
@@ -3046,14 +3060,14 @@ void NpScene::lockWrite(const char* file, PxU32 line)
void NpScene::unlockWrite()
{
// increment this thread's write depth
- ThreadReadWriteCount localCounts = PxUnionCast<ThreadReadWriteCount>(TlsGet(mThreadReadWriteDepth));
+ ThreadReadWriteCount localCounts (TlsGetValue(mThreadReadWriteDepth));
if (localCounts.writeLockDepth < 1)
{
Ps::getFoundation().error(PxErrorCode::eINVALID_OPERATION, __FILE__, __LINE__, "PxScene::unlockWrite() called without matching call to PxScene::lockWrite(), behaviour will be undefined.");
return;
}
localCounts.writeLockDepth--;
- TlsSet(mThreadReadWriteDepth, PxUnionCast<void*>(localCounts));
+ TlsSetValue(mThreadReadWriteDepth, localCounts.getData());
PX_ASSERT(mCurrentWriter == Thread::getId());
diff --git a/PhysX_3.4/Source/PhysX/src/NpScene.h b/PhysX_3.4/Source/PhysX/src/NpScene.h
index a5e9ca65..9706648f 100644
--- a/PhysX_3.4/Source/PhysX/src/NpScene.h
+++ b/PhysX_3.4/Source/PhysX/src/NpScene.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp b/PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp
index a50844c6..eef42285 100644
--- a/PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpSceneQueries.h b/PhysX_3.4/Source/PhysX/src/NpSceneQueries.h
index b30b7b51..5fc8d5bd 100644
--- a/PhysX_3.4/Source/PhysX/src/NpSceneQueries.h
+++ b/PhysX_3.4/Source/PhysX/src/NpSceneQueries.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpSerializerAdapter.cpp b/PhysX_3.4/Source/PhysX/src/NpSerializerAdapter.cpp
index 7e1f5f0d..a25f3779 100644
--- a/PhysX_3.4/Source/PhysX/src/NpSerializerAdapter.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpSerializerAdapter.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpShape.cpp b/PhysX_3.4/Source/PhysX/src/NpShape.cpp
index 5f595569..5bd5e8ad 100644
--- a/PhysX_3.4/Source/PhysX/src/NpShape.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpShape.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
@@ -772,11 +772,11 @@ bool NpShape::checkMaterialSetup(const PxGeometry& geom, const char* errorMsgPre
const PxHeightField& mesh = *meshGeom.heightField;
if(mesh.getTriangleMaterialIndex(0) != 0xffff)
{
- const PxU32 nbTris = (mesh.getNbColumns() - 1)*(mesh.getNbColumns() - 1)*2;
+ const PxU32 nbTris = mesh.getNbColumns()*mesh.getNbRows()*2;
for(PxU32 i = 0; i < nbTris; i++)
{
const PxMaterialTableIndex meshMaterialIndex = mesh.getTriangleMaterialIndex(i);
- if(meshMaterialIndex >= materialCount)
+ if(meshMaterialIndex != PxHeightFieldMaterial::eHOLE && meshMaterialIndex >= materialCount)
{
Ps::getFoundation().error(PxErrorCode::eINVALID_PARAMETER, __FILE__, __LINE__,
"%s: PxHeightField material indices reference more materials than provided!", errorMsgPrefix);
diff --git a/PhysX_3.4/Source/PhysX/src/NpShape.h b/PhysX_3.4/Source/PhysX/src/NpShape.h
index da82d3bc..d1f2bd1c 100644
--- a/PhysX_3.4/Source/PhysX/src/NpShape.h
+++ b/PhysX_3.4/Source/PhysX/src/NpShape.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpShapeManager.cpp b/PhysX_3.4/Source/PhysX/src/NpShapeManager.cpp
index d7a904e5..b251b906 100644
--- a/PhysX_3.4/Source/PhysX/src/NpShapeManager.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpShapeManager.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpShapeManager.h b/PhysX_3.4/Source/PhysX/src/NpShapeManager.h
index be12bf05..28443642 100644
--- a/PhysX_3.4/Source/PhysX/src/NpShapeManager.h
+++ b/PhysX_3.4/Source/PhysX/src/NpShapeManager.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpSpatialIndex.cpp b/PhysX_3.4/Source/PhysX/src/NpSpatialIndex.cpp
index 0c69c225..8e038a9f 100644
--- a/PhysX_3.4/Source/PhysX/src/NpSpatialIndex.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpSpatialIndex.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpSpatialIndex.h b/PhysX_3.4/Source/PhysX/src/NpSpatialIndex.h
index 82370c5b..653064a9 100644
--- a/PhysX_3.4/Source/PhysX/src/NpSpatialIndex.h
+++ b/PhysX_3.4/Source/PhysX/src/NpSpatialIndex.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpVolumeCache.cpp b/PhysX_3.4/Source/PhysX/src/NpVolumeCache.cpp
index d5da557b..667095dd 100644
--- a/PhysX_3.4/Source/PhysX/src/NpVolumeCache.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpVolumeCache.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpVolumeCache.h b/PhysX_3.4/Source/PhysX/src/NpVolumeCache.h
index e14f58b5..79f1731c 100644
--- a/PhysX_3.4/Source/PhysX/src/NpVolumeCache.h
+++ b/PhysX_3.4/Source/PhysX/src/NpVolumeCache.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpWriteCheck.cpp b/PhysX_3.4/Source/PhysX/src/NpWriteCheck.cpp
index ed9c9366..7a46c8d0 100644
--- a/PhysX_3.4/Source/PhysX/src/NpWriteCheck.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpWriteCheck.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/NpWriteCheck.h b/PhysX_3.4/Source/PhysX/src/NpWriteCheck.h
index 98eb53c3..77e7393b 100644
--- a/PhysX_3.4/Source/PhysX/src/NpWriteCheck.h
+++ b/PhysX_3.4/Source/PhysX/src/NpWriteCheck.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/PvdMetaDataBindingData.h b/PhysX_3.4/Source/PhysX/src/PvdMetaDataBindingData.h
index 3afc5e41..0d1600a5 100644
--- a/PhysX_3.4/Source/PhysX/src/PvdMetaDataBindingData.h
+++ b/PhysX_3.4/Source/PhysX/src/PvdMetaDataBindingData.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
#ifndef PX_META_DATA_PVD_BINDING_DATA_H
diff --git a/PhysX_3.4/Source/PhysX/src/PvdMetaDataPvdBinding.cpp b/PhysX_3.4/Source/PhysX/src/PvdMetaDataPvdBinding.cpp
index 6440ca46..cc544b10 100644
--- a/PhysX_3.4/Source/PhysX/src/PvdMetaDataPvdBinding.cpp
+++ b/PhysX_3.4/Source/PhysX/src/PvdMetaDataPvdBinding.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/PvdMetaDataPvdBinding.h b/PhysX_3.4/Source/PhysX/src/PvdMetaDataPvdBinding.h
index dce5247b..97b2a449 100644
--- a/PhysX_3.4/Source/PhysX/src/PvdMetaDataPvdBinding.h
+++ b/PhysX_3.4/Source/PhysX/src/PvdMetaDataPvdBinding.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/PvdPhysicsClient.cpp b/PhysX_3.4/Source/PhysX/src/PvdPhysicsClient.cpp
index d616373c..dfaad17e 100644
--- a/PhysX_3.4/Source/PhysX/src/PvdPhysicsClient.cpp
+++ b/PhysX_3.4/Source/PhysX/src/PvdPhysicsClient.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/PvdPhysicsClient.h b/PhysX_3.4/Source/PhysX/src/PvdPhysicsClient.h
index 0dff828f..5d725c76 100644
--- a/PhysX_3.4/Source/PhysX/src/PvdPhysicsClient.h
+++ b/PhysX_3.4/Source/PhysX/src/PvdPhysicsClient.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/PvdTypeNames.h b/PhysX_3.4/Source/PhysX/src/PvdTypeNames.h
index 771ba9ea..8033d665 100644
--- a/PhysX_3.4/Source/PhysX/src/PvdTypeNames.h
+++ b/PhysX_3.4/Source/PhysX/src/PvdTypeNames.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
#ifndef PVD_TYPE_NAMES_H
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbActor.cpp b/PhysX_3.4/Source/PhysX/src/buffering/ScbActor.cpp
index e48d3ba4..6c79a2e5 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbActor.cpp
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbActor.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbActor.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbActor.h
index a00151ac..9536e0bb 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbActor.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbActor.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbAggregate.cpp b/PhysX_3.4/Source/PhysX/src/buffering/ScbAggregate.cpp
index e02bc327..863f73b9 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbAggregate.cpp
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbAggregate.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbAggregate.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbAggregate.h
index 1d8bff57..a6ecde49 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbAggregate.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbAggregate.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulation.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulation.h
index 75465694..91ab1fbf 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulation.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulation.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulationJoint.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulationJoint.h
index 85557347..9c8b66b4 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulationJoint.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulationJoint.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbBase.cpp b/PhysX_3.4/Source/PhysX/src/buffering/ScbBase.cpp
index a9d57d23..c482834e 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbBase.cpp
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbBase.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbBase.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbBase.h
index 0477afd8..9f63d104 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbBase.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbBase.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbBody.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbBody.h
index e38961b4..fb7f8387 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbBody.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbBody.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbCloth.cpp b/PhysX_3.4/Source/PhysX/src/buffering/ScbCloth.cpp
index afc00532..a1115e2d 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbCloth.cpp
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbCloth.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbCloth.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbCloth.h
index 12e8a16f..e0e78cf9 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbCloth.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbCloth.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbConstraint.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbConstraint.h
index c44b6de1..3836f847 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbConstraint.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbConstraint.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbDefs.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbDefs.h
index 12f4b91e..74bef40f 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbDefs.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbDefs.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbMetaData.cpp b/PhysX_3.4/Source/PhysX/src/buffering/ScbMetaData.cpp
index 8376079b..dea90f86 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbMetaData.cpp
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbMetaData.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbNpDeps.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbNpDeps.h
index 3802476c..c9829cbf 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbNpDeps.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbNpDeps.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.cpp b/PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.cpp
index 5af36fdf..950f2dbd 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.cpp
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.h
index 443fac76..d75027f1 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbParticleSystem.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbRigidObject.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbRigidObject.h
index 55c90ae8..125bcabb 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbRigidObject.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbRigidObject.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbRigidStatic.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbRigidStatic.h
index 6e93147b..b3d91de1 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbRigidStatic.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbRigidStatic.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbScene.cpp b/PhysX_3.4/Source/PhysX/src/buffering/ScbScene.cpp
index a757546d..19f02854 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbScene.cpp
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbScene.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
@@ -850,8 +850,11 @@ void Scb::Scene::updateLowLevelMaterial(NpMaterial** masterMaterial)
if (event.mHandle < manager.getMaxSize()) // materials might get added and then removed again immediately. However, the add does not get processed (see case MATERIAL_ADD above),
{ // so the remove might end up reading out of bounds memory unless checked.
PxsMaterialCore* materialCore = manager.getMaterial(event.mHandle);
- mScene.unregisterMaterialInNP(*materialCore);
- manager.removeMaterial(materialCore);
+ if (materialCore->getMaterialIndex() == event.mHandle)
+ {
+ mScene.unregisterMaterialInNP(*materialCore);
+ manager.removeMaterial(materialCore);
+ }
}
break;
};
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbScene.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbScene.h
index 6c76efba..a485ccb9 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbScene.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbScene.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbSceneBuffer.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbSceneBuffer.h
index 54dbb09c..b388213b 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbSceneBuffer.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbSceneBuffer.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.cpp b/PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.cpp
index 3991251f..549fd57e 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.cpp
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.h
index ad470b12..21e472a0 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.cpp b/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.cpp
index 8f2ca2d0..445557ec 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.cpp
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.h
index 2272e33a..acadd163 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbShape.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbType.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbType.h
index 08d72b74..9fde79dc 100644
--- a/PhysX_3.4/Source/PhysX/src/buffering/ScbType.h
+++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbType.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.cpp b/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.cpp
index 58fac836..f91029cd 100644
--- a/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.cpp
+++ b/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.h b/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.h
index 92d4703e..a7bf279d 100644
--- a/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.h
+++ b/PhysX_3.4/Source/PhysX/src/cloth/NpCloth.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/cloth/NpClothFabric.cpp b/PhysX_3.4/Source/PhysX/src/cloth/NpClothFabric.cpp
index cfc51245..5d252fed 100644
--- a/PhysX_3.4/Source/PhysX/src/cloth/NpClothFabric.cpp
+++ b/PhysX_3.4/Source/PhysX/src/cloth/NpClothFabric.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/cloth/NpClothFabric.h b/PhysX_3.4/Source/PhysX/src/cloth/NpClothFabric.h
index 9955faf6..41a7cad8 100644
--- a/PhysX_3.4/Source/PhysX/src/cloth/NpClothFabric.h
+++ b/PhysX_3.4/Source/PhysX/src/cloth/NpClothFabric.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/cloth/NpClothParticleData.cpp b/PhysX_3.4/Source/PhysX/src/cloth/NpClothParticleData.cpp
index 3b2986a6..6998d133 100644
--- a/PhysX_3.4/Source/PhysX/src/cloth/NpClothParticleData.cpp
+++ b/PhysX_3.4/Source/PhysX/src/cloth/NpClothParticleData.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/cloth/NpClothParticleData.h b/PhysX_3.4/Source/PhysX/src/cloth/NpClothParticleData.h
index e2d8bc5e..a8cd5cb1 100644
--- a/PhysX_3.4/Source/PhysX/src/cloth/NpClothParticleData.h
+++ b/PhysX_3.4/Source/PhysX/src/cloth/NpClothParticleData.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/device/PhysXIndicator.h b/PhysX_3.4/Source/PhysX/src/device/PhysXIndicator.h
index cb46d68a..ae96b845 100644
--- a/PhysX_3.4/Source/PhysX/src/device/PhysXIndicator.h
+++ b/PhysX_3.4/Source/PhysX/src/device/PhysXIndicator.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/device/linux/PhysXIndicatorLinux.cpp b/PhysX_3.4/Source/PhysX/src/device/linux/PhysXIndicatorLinux.cpp
index 5bfe3ad0..4dfc1b9f 100644
--- a/PhysX_3.4/Source/PhysX/src/device/linux/PhysXIndicatorLinux.cpp
+++ b/PhysX_3.4/Source/PhysX/src/device/linux/PhysXIndicatorLinux.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/device/nvPhysXtoDrv.h b/PhysX_3.4/Source/PhysX/src/device/nvPhysXtoDrv.h
index 533b5d36..76882d22 100644
--- a/PhysX_3.4/Source/PhysX/src/device/nvPhysXtoDrv.h
+++ b/PhysX_3.4/Source/PhysX/src/device/nvPhysXtoDrv.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/device/windows/PhysXIndicatorWindows.cpp b/PhysX_3.4/Source/PhysX/src/device/windows/PhysXIndicatorWindows.cpp
index 845f27ae..966ecdca 100644
--- a/PhysX_3.4/Source/PhysX/src/device/windows/PhysXIndicatorWindows.cpp
+++ b/PhysX_3.4/Source/PhysX/src/device/windows/PhysXIndicatorWindows.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/gpu/NpPhysicsGpu.cpp b/PhysX_3.4/Source/PhysX/src/gpu/NpPhysicsGpu.cpp
index 6964eda4..2ed6da58 100644
--- a/PhysX_3.4/Source/PhysX/src/gpu/NpPhysicsGpu.cpp
+++ b/PhysX_3.4/Source/PhysX/src/gpu/NpPhysicsGpu.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/gpu/NpPhysicsGpu.h b/PhysX_3.4/Source/PhysX/src/gpu/NpPhysicsGpu.h
index ca97153f..dae20790 100644
--- a/PhysX_3.4/Source/PhysX/src/gpu/NpPhysicsGpu.h
+++ b/PhysX_3.4/Source/PhysX/src/gpu/NpPhysicsGpu.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/gpu/PxGpu.cpp b/PhysX_3.4/Source/PhysX/src/gpu/PxGpu.cpp
index e976d2d2..0ca74d92 100644
--- a/PhysX_3.4/Source/PhysX/src/gpu/PxGpu.cpp
+++ b/PhysX_3.4/Source/PhysX/src/gpu/PxGpu.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
#include "PxPhysXConfig.h"
diff --git a/PhysX_3.4/Source/PhysX/src/gpu/PxParticleDeviceExclusive.cpp b/PhysX_3.4/Source/PhysX/src/gpu/PxParticleDeviceExclusive.cpp
index f577aba2..fda0f894 100644
--- a/PhysX_3.4/Source/PhysX/src/gpu/PxParticleDeviceExclusive.cpp
+++ b/PhysX_3.4/Source/PhysX/src/gpu/PxParticleDeviceExclusive.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/gpu/PxParticleGpu.cpp b/PhysX_3.4/Source/PhysX/src/gpu/PxParticleGpu.cpp
index 9e6af81a..7298649e 100644
--- a/PhysX_3.4/Source/PhysX/src/gpu/PxParticleGpu.cpp
+++ b/PhysX_3.4/Source/PhysX/src/gpu/PxParticleGpu.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/gpu/PxPhysXGpuModuleLoader.cpp b/PhysX_3.4/Source/PhysX/src/gpu/PxPhysXGpuModuleLoader.cpp
index 0ed04ce4..9ac8a523 100644
--- a/PhysX_3.4/Source/PhysX/src/gpu/PxPhysXGpuModuleLoader.cpp
+++ b/PhysX_3.4/Source/PhysX/src/gpu/PxPhysXGpuModuleLoader.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
#include "PxPhysXConfig.h"
diff --git a/PhysX_3.4/Source/PhysX/src/gpu/PxPhysXIndicatorDeviceExclusive.cpp b/PhysX_3.4/Source/PhysX/src/gpu/PxPhysXIndicatorDeviceExclusive.cpp
index 8489c3c7..bea4bdee 100644
--- a/PhysX_3.4/Source/PhysX/src/gpu/PxPhysXIndicatorDeviceExclusive.cpp
+++ b/PhysX_3.4/Source/PhysX/src/gpu/PxPhysXIndicatorDeviceExclusive.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/particles/NpParticleBaseTemplate.h b/PhysX_3.4/Source/PhysX/src/particles/NpParticleBaseTemplate.h
index 295bf7b4..68f8d224 100644
--- a/PhysX_3.4/Source/PhysX/src/particles/NpParticleBaseTemplate.h
+++ b/PhysX_3.4/Source/PhysX/src/particles/NpParticleBaseTemplate.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.cpp b/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.cpp
index 4ca1c7c3..1b4d58ff 100644
--- a/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.cpp
+++ b/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.h b/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.h
index 03e8a238..e729447d 100644
--- a/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.h
+++ b/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluid.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluidReadData.h b/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluidReadData.h
index 8f15e838..256877ad 100644
--- a/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluidReadData.h
+++ b/PhysX_3.4/Source/PhysX/src/particles/NpParticleFluidReadData.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/particles/NpParticleSystem.cpp b/PhysX_3.4/Source/PhysX/src/particles/NpParticleSystem.cpp
index 92d8a72c..9e475078 100644
--- a/PhysX_3.4/Source/PhysX/src/particles/NpParticleSystem.cpp
+++ b/PhysX_3.4/Source/PhysX/src/particles/NpParticleSystem.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/particles/NpParticleSystem.h b/PhysX_3.4/Source/PhysX/src/particles/NpParticleSystem.h
index a72aae44..e95780b7 100644
--- a/PhysX_3.4/Source/PhysX/src/particles/NpParticleSystem.h
+++ b/PhysX_3.4/Source/PhysX/src/particles/NpParticleSystem.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.
diff --git a/PhysX_3.4/Source/PhysX/src/windows/NpWindowsDelayLoadHook.cpp b/PhysX_3.4/Source/PhysX/src/windows/NpWindowsDelayLoadHook.cpp
index 157d5973..0f6c495f 100644
--- a/PhysX_3.4/Source/PhysX/src/windows/NpWindowsDelayLoadHook.cpp
+++ b/PhysX_3.4/Source/PhysX/src/windows/NpWindowsDelayLoadHook.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.