Skip to content

Commit 4fac646

Browse files
DeznomDeznom
committed
Prerelease update
- Fixed crash in 'PCS Samples' scene when GPU Simulation is enabled. - Fixed NullReferenceExceptions on first project load. - Removed deprecated code in SampleHeightField.cs. - Removed some garbage from Unity project.
1 parent d8d6deb commit 4fac646

57 files changed

Lines changed: 6 additions & 6925 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NVIDIA.PhysX.Native/Wrapper/NativeCSHARP_wrap.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NVIDIAfPhysX_PX_PHYSICS_VERSION_BUGFIX_get___(
932932
int jresult ;
933933
int result;
934934

935-
result = (int)(1);
935+
result = (int)(2);
936936
jresult = result;
937937
return jresult;
938938
}
@@ -942,7 +942,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NVIDIAfPhysX_PX_PHYSICS_VERSION_get___() {
942942
int jresult ;
943943
int result;
944944

945-
result = (int)(((4 << 24) +(1 << 16) +(1 << 8) +0));
945+
result = (int)(((4 << 24) +(1 << 16) +(2 << 8) +0));
946946
jresult = result;
947947
return jresult;
948948
}

‎NVIDIA.PhysX/Wrapper/PxVersion.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace NVIDIA.PhysX {
1212

1313
public enum PxVersion {
14-
PX_PHYSICS_VERSION = ((4 << 24) +(1 << 16) +(1 << 8) +0)
14+
PX_PHYSICS_VERSION = ((4 << 24) +(1 << 16) +(2 << 8) +0)
1515
}
1616

1717
}

‎Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/API Samples/Scripts/SampleHeightField.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ void CreateTerrain()
153153
m_terrainObject.transform.parent = transform;
154154
m_terrainObject.transform.position = new Vector3(-SIZE * 0.5f, 0, -SIZE * 0.5f);
155155
var terrain = m_terrainObject.AddComponent<Terrain>();
156-
terrain.materialType = Terrain.MaterialType.Custom;
156+
//terrain.materialType = Terrain.MaterialType.Custom;
157157
terrain.materialTemplate = m_groundMaterial;
158158
terrain.terrainData = new TerrainData();
159159
terrain.terrainData.heightmapResolution = RESOLUTION;

Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/Test Scenes.meta renamed to Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/Perfomance Test Scenes.meta

File renamed without changes.

Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/Test Scenes/Tests/Prefabs.meta renamed to Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/Perfomance Test Scenes/Prefabs.meta

File renamed without changes.

Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/Test Scenes/Tests/Prefabs/Sample Plugin4000 API.prefab renamed to Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/Perfomance Test Scenes/Prefabs/Sample Plugin4000 API.prefab

File renamed without changes.

Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/Test Scenes/Tests/Prefabs/Sample Plugin4000 API.prefab.meta renamed to Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/Perfomance Test Scenes/Prefabs/Sample Plugin4000 API.prefab.meta

File renamed without changes.

Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/Test Scenes/Tests/Prefabs/Sample Plugin4000 PCS.prefab renamed to Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/Perfomance Test Scenes/Prefabs/Sample Plugin4000 PCS.prefab

File renamed without changes.

Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/Test Scenes/Tests/Prefabs/Sample Plugin4000 PCS.prefab.meta renamed to Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/Perfomance Test Scenes/Prefabs/Sample Plugin4000 PCS.prefab.meta

File renamed without changes.

Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/Test Scenes/Tests/Prefabs/Sample Unity4000.prefab renamed to Unity/PhysX Plugin/Assets/NVIDIA/PhysX Samples/Perfomance Test Scenes/Prefabs/Sample Unity4000.prefab

File renamed without changes.

0 commit comments

Comments
 (0)