PhysX 3.4.1, APEX 1.4.1 Release @22845541v3.4.1

19 files changed, 16 insertions, 6 deletions

diff --git a/PhysX_3.4/Tools/BinaryMetaData/android.metaData b/PhysX_3.4/Tools/BinaryMetaData/android.metaData
deleted file mode 100644
index 491759af..00000000
--- a/PhysX_3.4/Tools/BinaryMetaData/android.metaData
+++ /dev/null
diff --git a/PhysX_3.4/Tools/BinaryMetaData/android/android.metaData b/PhysX_3.4/Tools/BinaryMetaData/android/android.metaData
new file mode 100644
index 00000000..76bddc06
--- /dev/null
+++ b/PhysX_3.4/Tools/BinaryMetaData/android/android.metaData
diff --git a/PhysX_3.4/Tools/BinaryMetaData/ios.metaData b/PhysX_3.4/Tools/BinaryMetaData/ios/ios32.metaData
index 364fd3dd..364fd3dd 100644
--- a/PhysX_3.4/Tools/BinaryMetaData/ios.metaData
+++ b/PhysX_3.4/Tools/BinaryMetaData/ios/ios32.metaData
diff --git a/PhysX_3.4/Tools/BinaryMetaData/ios/ios64.metaData b/PhysX_3.4/Tools/BinaryMetaData/ios/ios64.metaData
new file mode 100644
index 00000000..43b00f1f
--- /dev/null
+++ b/PhysX_3.4/Tools/BinaryMetaData/ios/ios64.metaData
diff --git a/PhysX_3.4/Tools/BinaryMetaData/linux/linux32.metaData b/PhysX_3.4/Tools/BinaryMetaData/linux/linux32.metaData
new file mode 100644
index 00000000..261fa288
--- /dev/null
+++ b/PhysX_3.4/Tools/BinaryMetaData/linux/linux32.metaData
diff --git a/PhysX_3.4/Tools/BinaryMetaData/linux/linux64.metaData b/PhysX_3.4/Tools/BinaryMetaData/linux/linux64.metaData
new file mode 100644
index 00000000..49cefc0f
--- /dev/null
+++ b/PhysX_3.4/Tools/BinaryMetaData/linux/linux64.metaData
diff --git a/PhysX_3.4/Tools/BinaryMetaData/linux32.metaData b/PhysX_3.4/Tools/BinaryMetaData/linux32.metaData
deleted file mode 100644
index a38d9e60..00000000
--- a/PhysX_3.4/Tools/BinaryMetaData/linux32.metaData
+++ /dev/null
diff --git a/PhysX_3.4/Tools/BinaryMetaData/linux64.metaData b/PhysX_3.4/Tools/BinaryMetaData/linux64.metaData
deleted file mode 100644
index 09c3df53..00000000
--- a/PhysX_3.4/Tools/BinaryMetaData/linux64.metaData
+++ /dev/null
diff --git a/PhysX_3.4/Tools/BinaryMetaData/mac/mac32.metaData b/PhysX_3.4/Tools/BinaryMetaData/mac/mac32.metaData
new file mode 100644
index 00000000..9b6cffce
--- /dev/null
+++ b/PhysX_3.4/Tools/BinaryMetaData/mac/mac32.metaData
diff --git a/PhysX_3.4/Tools/BinaryMetaData/mac/mac64.metaData b/PhysX_3.4/Tools/BinaryMetaData/mac/mac64.metaData
new file mode 100644
index 00000000..68e521d5
--- /dev/null
+++ b/PhysX_3.4/Tools/BinaryMetaData/mac/mac64.metaData
diff --git a/PhysX_3.4/Tools/BinaryMetaData/osx32.metaData b/PhysX_3.4/Tools/BinaryMetaData/osx32.metaData
deleted file mode 100644
index a9b75525..00000000
--- a/PhysX_3.4/Tools/BinaryMetaData/osx32.metaData
+++ /dev/null
diff --git a/PhysX_3.4/Tools/BinaryMetaData/osx64.metaData b/PhysX_3.4/Tools/BinaryMetaData/osx64.metaData
deleted file mode 100644
index 0a8b775e..00000000
--- a/PhysX_3.4/Tools/BinaryMetaData/osx64.metaData
+++ /dev/null
diff --git a/PhysX_3.4/Tools/BinaryMetaData/win32.metaData b/PhysX_3.4/Tools/BinaryMetaData/win32.metaData
deleted file mode 100644
index fec2e616..00000000
--- a/PhysX_3.4/Tools/BinaryMetaData/win32.metaData
+++ /dev/null
diff --git a/PhysX_3.4/Tools/BinaryMetaData/win64.metaData b/PhysX_3.4/Tools/BinaryMetaData/win64.metaData
deleted file mode 100644
index 312cc01e..00000000
--- a/PhysX_3.4/Tools/BinaryMetaData/win64.metaData
+++ /dev/null
diff --git a/PhysX_3.4/Tools/BinaryMetaData/windows/win32.metaData b/PhysX_3.4/Tools/BinaryMetaData/windows/win32.metaData
new file mode 100644
index 00000000..30ba25be
--- /dev/null
+++ b/PhysX_3.4/Tools/BinaryMetaData/windows/win32.metaData
diff --git a/PhysX_3.4/Tools/BinaryMetaData/windows/win64.metaData b/PhysX_3.4/Tools/BinaryMetaData/windows/win64.metaData
new file mode 100644
index 00000000..4e8fabdf
--- /dev/null
+++ b/PhysX_3.4/Tools/BinaryMetaData/windows/win64.metaData
diff --git a/PhysX_3.4/Tools/PhysXMetaDataGenerator/PxPhysicsWithExtensionsAPI.h b/PhysX_3.4/Tools/PhysXMetaDataGenerator/PxPhysicsWithExtensionsAPI.h
index 64d9c6da..fc89f985 100644
--- a/PhysX_3.4/Tools/PhysXMetaDataGenerator/PxPhysicsWithExtensionsAPI.h
+++ b/PhysX_3.4/Tools/PhysXMetaDataGenerator/PxPhysicsWithExtensionsAPI.h
@@ -134,6 +134,14 @@ static const char* gImportantPhysXTypes[] =
 	"PxSceneLimits",
 	"PxgDynamicsMemoryConfig",
 	"PxBroadPhaseDesc",
+	"PxGeometry",
+	"PxBoxGeometry",
+	"PxCapsuleGeometry",
+	"PxConvexMeshGeometry",
+	"PxSphereGeometry",
+	"PxPlaneGeometry",
+	"PxTriangleMeshGeometry",
+	"PxHeightFieldGeometry",
 #if PX_USE_PARTICLE_SYSTEM_API
 	"PxParticleSystem",
 	"PxParticleFluid",
diff --git a/PhysX_3.4/Tools/PhysXMetaDataGenerator/generateMetaData.bat b/PhysX_3.4/Tools/PhysXMetaDataGenerator/generateMetaData.bat
index e3b6f99a..98ae2eb6 100644
--- a/PhysX_3.4/Tools/PhysXMetaDataGenerator/generateMetaData.bat
+++ b/PhysX_3.4/Tools/PhysXMetaDataGenerator/generateMetaData.bat
@@ -9,6 +9,8 @@ setlocal EnableDelayedExpansion
 ::
 :: see readme.txt
 
+cd %~dp0
+
 :: look for python in p4 location unless PYTHON is set
 if not defined PYTHON (
 	call :find_root_path %~p0 "tools\python\3.3" _RESULT
diff --git a/PhysX_3.4/Tools/PhysXMetaDataGenerator/generateMetaData.py b/PhysX_3.4/Tools/PhysXMetaDataGenerator/generateMetaData.py
index b8881492..5fbc3cf3 100644
--- a/PhysX_3.4/Tools/PhysXMetaDataGenerator/generateMetaData.py
+++ b/PhysX_3.4/Tools/PhysXMetaDataGenerator/generateMetaData.py
@@ -101,7 +101,7 @@ if os.path.isdir(os.path.join(sdkRoot, "../PhysX_3.4")):
 	externalsRoot = os.path.join(sdkRoot, "../Externals")
 	pxSharedRoot = os.path.join(sdkRoot, "../PxShared")
 else:
-	externalsRoot = os.path.join(utils.find_root_path(scriptDir, "externals/clang"), "externals")
+	externalsRoot = os.path.join(utils.find_root_path(scriptDir, os.path.normpath("externals/clang")), "externals")
 	pxSharedRoot = os.path.join(utils.find_root_path(scriptDir, "PxShared"), os.path.normpath("PxShared/1.0/trunk"))
 
 print("testmode:", args.test)
@@ -143,24 +143,24 @@ includes += includeString(sdkRoot + '/Tools/PhysXMetaDataGenerator')
 
 print("platform:", platform.system())
 
-commonFlags = '-DNDEBUG -DPX_GENERATE_META_DATA -x c++-header -std=c++0x -w -nobuiltininc -fms-extensions '
+commonFlags = '-DNDEBUG -DPX_GENERATE_META_DATA -x c++-header -std=c++0x -w -Wno-c++11-narrowing -fms-extensions '
 
 if platform.system() == "Windows":
 	# stddef.h doesn't compile with VS10 and -std=c++0x
 	# for some reason -cc1 needs to go first in commonFlags
 	commonFlags = '-cc1 ' + commonFlags
 	platformFlags = '-DPX_VC=11 -D_WIN32 ' + ' -isystem"' + os.environ['VS110COMNTOOLS'] + '/../../VC/include"'
-	clangExe = os.path.join(externalsRoot, os.path.normpath('clang/3.3.3/win32/bin/clang.exe'))
+	clangExe = os.path.join(externalsRoot, os.path.normpath('clang/4.0.0/win32/bin/clang.exe'))
 	debugFile = open("temp/clangCommandLine_windows.txt", "a")
 	
 elif platform.system() == "Linux":
 	platformFlags = ''
-	clangExe = os.path.join(externalsRoot, os.path.normpath('clang/3.3.3/linux32/bin/clang'))
+	clangExe = os.path.join(externalsRoot, os.path.normpath('clang/4.0.0/linux32/bin/clang'))
 	debugFile = open("temp/clangCommandLine_linux.txt", "a")
 	
 elif platform.system() == "Darwin":
 	platformFlags = ' -isysroot' + get_osx_platform_path()
-	clangExe = os.path.join(externalsRoot, os.path.normpath('clang/3.3.3/osx/bin/clang'))
+	clangExe = os.path.join(externalsRoot, os.path.normpath('clang/4.0.0/osx/bin/clang'))
 	debugFile = open("temp/clangCommandLine_osx.txt", "a")
 	
 else:
@@ -177,7 +177,7 @@ if not os.path.isfile(clangExe):
 clangExe = '"' + clangExe + '"'
 	
 # required for execution of clang.exe
-os.environ["PWD"] = os.path.join(sdkRoot, os.path.normpath("Tools\PhysXMetaDataGenerator"))
+os.environ["PWD"] = os.path.join(sdkRoot, os.path.normpath("Tools/PhysXMetaDataGenerator"))
 
 ###############################
 # PxPhysicsWithExtensions     #