diff options
| author | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-05-12 17:45:18 -0500 |
|---|---|---|
| committer | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-05-12 17:45:18 -0500 |
| commit | 7f12de60542edc8f1c6683e6b4cdce8570e51456 (patch) | |
| tree | 0b5d533bae189ea286257b5ab78b635fafb19aa0 /APEX_1.4/compiler | |
| parent | PhysX 3.4, APEX 1.4 patch release @22017166 (diff) | |
| download | physx-3.4-7f12de60542edc8f1c6683e6b4cdce8570e51456.tar.xz physx-3.4-7f12de60542edc8f1c6683e6b4cdce8570e51456.zip | |
PhysX 3.4, APEX 1.4 patch release @22121272
Diffstat (limited to 'APEX_1.4/compiler')
30 files changed, 591 insertions, 123 deletions
diff --git a/APEX_1.4/compiler/android16/Makefile.APEX_Clothing.mk b/APEX_1.4/compiler/android16/Makefile.APEX_Clothing.mk index 3850a299..469c9b0b 100644 --- a/APEX_1.4/compiler/android16/Makefile.APEX_Clothing.mk +++ b/APEX_1.4/compiler/android16/Makefile.APEX_Clothing.mk @@ -15,6 +15,7 @@ APEX_Clothing_cppfiles += ./../../module/clothing/src/ClothingScene.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/CookingAbstract.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/ModuleClothingHelpers.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/ModuleClothingImpl.cpp +APEX_Clothing_cppfiles += ./../../module/clothing/src/SimdMath.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/SimulationAbstract.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/autogen/ClothingActorParam.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/autogen/ClothingAssetParameters.cpp @@ -116,8 +117,8 @@ APEX_Clothing_debug_hpaths += ./../../module/clothing/include/unix APEX_Clothing_debug_hpaths += ./../../module/clothing/embedded/LowLevelCloth/include APEX_Clothing_debug_hpaths += ./../../module/clothing/embedded/LowLevelCloth/src APEX_Clothing_debug_hpaths += ./../../module/clothing/embedded +APEX_Clothing_debug_hpaths += ./../../module/clothing/src/simd APEX_Clothing_debug_hpaths += ./../../../PxShared/src/pvd/src -APEX_Clothing_debug_hpaths += ./../../../PxShared/src/NvSimd/include APEX_Clothing_debug_lpaths := APEX_Clothing_debug_lpaths += ./../../../PxShared/lib/makeandroid16 APEX_Clothing_debug_lpaths += ./../../../PhysX_3.4/Lib/android16 @@ -273,8 +274,8 @@ APEX_Clothing_release_hpaths += ./../../module/clothing/include/unix APEX_Clothing_release_hpaths += ./../../module/clothing/embedded/LowLevelCloth/include APEX_Clothing_release_hpaths += ./../../module/clothing/embedded/LowLevelCloth/src APEX_Clothing_release_hpaths += ./../../module/clothing/embedded +APEX_Clothing_release_hpaths += ./../../module/clothing/src/simd APEX_Clothing_release_hpaths += ./../../../PxShared/src/pvd/src -APEX_Clothing_release_hpaths += ./../../../PxShared/src/NvSimd/include APEX_Clothing_release_lpaths := APEX_Clothing_release_lpaths += ./../../../PxShared/lib/makeandroid16 APEX_Clothing_release_lpaths += ./../../../PhysX_3.4/Lib/android16 @@ -424,8 +425,8 @@ APEX_Clothing_profile_hpaths += ./../../module/clothing/include/unix APEX_Clothing_profile_hpaths += ./../../module/clothing/embedded/LowLevelCloth/include APEX_Clothing_profile_hpaths += ./../../module/clothing/embedded/LowLevelCloth/src APEX_Clothing_profile_hpaths += ./../../module/clothing/embedded +APEX_Clothing_profile_hpaths += ./../../module/clothing/src/simd APEX_Clothing_profile_hpaths += ./../../../PxShared/src/pvd/src -APEX_Clothing_profile_hpaths += ./../../../PxShared/src/NvSimd/include APEX_Clothing_profile_lpaths := APEX_Clothing_profile_lpaths += ./../../../PxShared/lib/makeandroid16 APEX_Clothing_profile_lpaths += ./../../../PhysX_3.4/Lib/android16 @@ -578,8 +579,8 @@ APEX_Clothing_checked_hpaths += ./../../module/clothing/include/unix APEX_Clothing_checked_hpaths += ./../../module/clothing/embedded/LowLevelCloth/include APEX_Clothing_checked_hpaths += ./../../module/clothing/embedded/LowLevelCloth/src APEX_Clothing_checked_hpaths += ./../../module/clothing/embedded +APEX_Clothing_checked_hpaths += ./../../module/clothing/src/simd APEX_Clothing_checked_hpaths += ./../../../PxShared/src/pvd/src -APEX_Clothing_checked_hpaths += ./../../../PxShared/src/NvSimd/include APEX_Clothing_checked_lpaths := APEX_Clothing_checked_lpaths += ./../../../PxShared/lib/makeandroid16 APEX_Clothing_checked_lpaths += ./../../../PhysX_3.4/Lib/android16 diff --git a/APEX_1.4/compiler/android16/Makefile.ApexCommon.mk b/APEX_1.4/compiler/android16/Makefile.ApexCommon.mk index dc5849b6..8b77d599 100644 --- a/APEX_1.4/compiler/android16/Makefile.ApexCommon.mk +++ b/APEX_1.4/compiler/android16/Makefile.ApexCommon.mk @@ -11,7 +11,6 @@ ApexCommon_cppfiles += ./../../common/src/ApexCudaTest.cpp ApexCommon_cppfiles += ./../../common/src/ApexGeneralizedCubeTemplates.cpp ApexCommon_cppfiles += ./../../common/src/ApexGeneralizedMarchingCubes.cpp ApexCommon_cppfiles += ./../../common/src/ApexIsoMesh.cpp -ApexCommon_cppfiles += ./../../common/src/ApexMath.cpp ApexCommon_cppfiles += ./../../common/src/ApexMeshContractor.cpp ApexCommon_cppfiles += ./../../common/src/ApexMeshHash.cpp ApexCommon_cppfiles += ./../../common/src/ApexPreview.cpp @@ -101,7 +100,6 @@ ApexCommon_debug_hpaths += ./../../framework/include ApexCommon_debug_hpaths += ./../../framework/include/autogen ApexCommon_debug_hpaths += ./../../include ApexCommon_debug_hpaths += ./../../include/PhysX3 -ApexCommon_debug_hpaths += ./../../../PxShared/src/NvSimd/include ApexCommon_debug_lpaths := ApexCommon_debug_lpaths += ./../../../PxShared/lib/makeandroid16 ApexCommon_debug_lpaths += ./../../../PhysX_3.4/Lib/android16 @@ -244,7 +242,6 @@ ApexCommon_release_hpaths += ./../../framework/include ApexCommon_release_hpaths += ./../../framework/include/autogen ApexCommon_release_hpaths += ./../../include ApexCommon_release_hpaths += ./../../include/PhysX3 -ApexCommon_release_hpaths += ./../../../PxShared/src/NvSimd/include ApexCommon_release_lpaths := ApexCommon_release_lpaths += ./../../../PxShared/lib/makeandroid16 ApexCommon_release_lpaths += ./../../../PhysX_3.4/Lib/android16 @@ -381,7 +378,6 @@ ApexCommon_profile_hpaths += ./../../framework/include ApexCommon_profile_hpaths += ./../../framework/include/autogen ApexCommon_profile_hpaths += ./../../include ApexCommon_profile_hpaths += ./../../include/PhysX3 -ApexCommon_profile_hpaths += ./../../../PxShared/src/NvSimd/include ApexCommon_profile_lpaths := ApexCommon_profile_lpaths += ./../../../PxShared/lib/makeandroid16 ApexCommon_profile_lpaths += ./../../../PhysX_3.4/Lib/android16 @@ -521,7 +517,6 @@ ApexCommon_checked_hpaths += ./../../framework/include ApexCommon_checked_hpaths += ./../../framework/include/autogen ApexCommon_checked_hpaths += ./../../include ApexCommon_checked_hpaths += ./../../include/PhysX3 -ApexCommon_checked_hpaths += ./../../../PxShared/src/NvSimd/include ApexCommon_checked_lpaths := ApexCommon_checked_lpaths += ./../../../PxShared/lib/makeandroid16 ApexCommon_checked_lpaths += ./../../../PhysX_3.4/Lib/android16 diff --git a/APEX_1.4/compiler/linux32/Makefile.APEX_Clothing.mk b/APEX_1.4/compiler/linux32/Makefile.APEX_Clothing.mk index fd9b350d..d17f094d 100644 --- a/APEX_1.4/compiler/linux32/Makefile.APEX_Clothing.mk +++ b/APEX_1.4/compiler/linux32/Makefile.APEX_Clothing.mk @@ -15,6 +15,7 @@ APEX_Clothing_cppfiles += ./../../module/clothing/src/ClothingScene.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/CookingAbstract.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/ModuleClothingHelpers.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/ModuleClothingImpl.cpp +APEX_Clothing_cppfiles += ./../../module/clothing/src/SimdMath.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/SimulationAbstract.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/autogen/ClothingActorParam.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/autogen/ClothingAssetParameters.cpp @@ -112,8 +113,8 @@ APEX_Clothing_debug_hpaths += ./../../module/clothing/include/unix APEX_Clothing_debug_hpaths += ./../../module/clothing/embedded/LowLevelCloth/include APEX_Clothing_debug_hpaths += ./../../module/clothing/embedded/LowLevelCloth/src APEX_Clothing_debug_hpaths += ./../../module/clothing/embedded +APEX_Clothing_debug_hpaths += ./../../module/clothing/src/simd APEX_Clothing_debug_hpaths += ./../../../PxShared/src/pvd/src -APEX_Clothing_debug_hpaths += ./../../../PxShared/src/NvSimd/include APEX_Clothing_debug_lpaths := APEX_Clothing_debug_lpaths += ./../../../PxShared/lib/makelinux32 APEX_Clothing_debug_lpaths += ./../../../PhysX_3.4/Lib/makelinux32 @@ -246,8 +247,8 @@ APEX_Clothing_release_hpaths += ./../../module/clothing/include/unix APEX_Clothing_release_hpaths += ./../../module/clothing/embedded/LowLevelCloth/include APEX_Clothing_release_hpaths += ./../../module/clothing/embedded/LowLevelCloth/src APEX_Clothing_release_hpaths += ./../../module/clothing/embedded +APEX_Clothing_release_hpaths += ./../../module/clothing/src/simd APEX_Clothing_release_hpaths += ./../../../PxShared/src/pvd/src -APEX_Clothing_release_hpaths += ./../../../PxShared/src/NvSimd/include APEX_Clothing_release_lpaths := APEX_Clothing_release_lpaths += ./../../../PxShared/lib/makelinux32 APEX_Clothing_release_lpaths += ./../../../PhysX_3.4/Lib/makelinux32 @@ -379,8 +380,8 @@ APEX_Clothing_profile_hpaths += ./../../module/clothing/include/unix APEX_Clothing_profile_hpaths += ./../../module/clothing/embedded/LowLevelCloth/include APEX_Clothing_profile_hpaths += ./../../module/clothing/embedded/LowLevelCloth/src APEX_Clothing_profile_hpaths += ./../../module/clothing/embedded +APEX_Clothing_profile_hpaths += ./../../module/clothing/src/simd APEX_Clothing_profile_hpaths += ./../../../PxShared/src/pvd/src -APEX_Clothing_profile_hpaths += ./../../../PxShared/src/NvSimd/include APEX_Clothing_profile_lpaths := APEX_Clothing_profile_lpaths += ./../../../PxShared/lib/makelinux32 APEX_Clothing_profile_lpaths += ./../../../PhysX_3.4/Lib/makelinux32 @@ -512,8 +513,8 @@ APEX_Clothing_checked_hpaths += ./../../module/clothing/include/unix APEX_Clothing_checked_hpaths += ./../../module/clothing/embedded/LowLevelCloth/include APEX_Clothing_checked_hpaths += ./../../module/clothing/embedded/LowLevelCloth/src APEX_Clothing_checked_hpaths += ./../../module/clothing/embedded +APEX_Clothing_checked_hpaths += ./../../module/clothing/src/simd APEX_Clothing_checked_hpaths += ./../../../PxShared/src/pvd/src -APEX_Clothing_checked_hpaths += ./../../../PxShared/src/NvSimd/include APEX_Clothing_checked_lpaths := APEX_Clothing_checked_lpaths += ./../../../PxShared/lib/makelinux32 APEX_Clothing_checked_lpaths += ./../../../PhysX_3.4/Lib/makelinux32 diff --git a/APEX_1.4/compiler/linux32/Makefile.ApexCommon.mk b/APEX_1.4/compiler/linux32/Makefile.ApexCommon.mk index e2aefa10..e1f21bc7 100644 --- a/APEX_1.4/compiler/linux32/Makefile.ApexCommon.mk +++ b/APEX_1.4/compiler/linux32/Makefile.ApexCommon.mk @@ -11,7 +11,6 @@ ApexCommon_cppfiles += ./../../common/src/ApexCudaTest.cpp ApexCommon_cppfiles += ./../../common/src/ApexGeneralizedCubeTemplates.cpp ApexCommon_cppfiles += ./../../common/src/ApexGeneralizedMarchingCubes.cpp ApexCommon_cppfiles += ./../../common/src/ApexIsoMesh.cpp -ApexCommon_cppfiles += ./../../common/src/ApexMath.cpp ApexCommon_cppfiles += ./../../common/src/ApexMeshContractor.cpp ApexCommon_cppfiles += ./../../common/src/ApexMeshHash.cpp ApexCommon_cppfiles += ./../../common/src/ApexPreview.cpp @@ -97,7 +96,6 @@ ApexCommon_debug_hpaths += ./../../framework/include ApexCommon_debug_hpaths += ./../../framework/include/autogen ApexCommon_debug_hpaths += ./../../include ApexCommon_debug_hpaths += ./../../include/PhysX3 -ApexCommon_debug_hpaths += ./../../../PxShared/src/NvSimd/include ApexCommon_debug_lpaths := ApexCommon_debug_lpaths += ./../../../PxShared/lib/makelinux32 ApexCommon_debug_lpaths += ./../../../PhysX_3.4/Lib/makelinux32 @@ -217,7 +215,6 @@ ApexCommon_release_hpaths += ./../../framework/include ApexCommon_release_hpaths += ./../../framework/include/autogen ApexCommon_release_hpaths += ./../../include ApexCommon_release_hpaths += ./../../include/PhysX3 -ApexCommon_release_hpaths += ./../../../PxShared/src/NvSimd/include ApexCommon_release_lpaths := ApexCommon_release_lpaths += ./../../../PxShared/lib/makelinux32 ApexCommon_release_lpaths += ./../../../PhysX_3.4/Lib/makelinux32 @@ -336,7 +333,6 @@ ApexCommon_profile_hpaths += ./../../framework/include ApexCommon_profile_hpaths += ./../../framework/include/autogen ApexCommon_profile_hpaths += ./../../include ApexCommon_profile_hpaths += ./../../include/PhysX3 -ApexCommon_profile_hpaths += ./../../../PxShared/src/NvSimd/include ApexCommon_profile_lpaths := ApexCommon_profile_lpaths += ./../../../PxShared/lib/makelinux32 ApexCommon_profile_lpaths += ./../../../PhysX_3.4/Lib/makelinux32 @@ -455,7 +451,6 @@ ApexCommon_checked_hpaths += ./../../framework/include ApexCommon_checked_hpaths += ./../../framework/include/autogen ApexCommon_checked_hpaths += ./../../include ApexCommon_checked_hpaths += ./../../include/PhysX3 -ApexCommon_checked_hpaths += ./../../../PxShared/src/NvSimd/include ApexCommon_checked_lpaths := ApexCommon_checked_lpaths += ./../../../PxShared/lib/makelinux32 ApexCommon_checked_lpaths += ./../../../PhysX_3.4/Lib/makelinux32 diff --git a/APEX_1.4/compiler/linux64/Makefile.APEX_Clothing.mk b/APEX_1.4/compiler/linux64/Makefile.APEX_Clothing.mk index 21a356d0..3d3bc270 100644 --- a/APEX_1.4/compiler/linux64/Makefile.APEX_Clothing.mk +++ b/APEX_1.4/compiler/linux64/Makefile.APEX_Clothing.mk @@ -15,6 +15,7 @@ APEX_Clothing_cppfiles += ./../../module/clothing/src/ClothingScene.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/CookingAbstract.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/ModuleClothingHelpers.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/ModuleClothingImpl.cpp +APEX_Clothing_cppfiles += ./../../module/clothing/src/SimdMath.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/SimulationAbstract.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/autogen/ClothingActorParam.cpp APEX_Clothing_cppfiles += ./../../module/clothing/src/autogen/ClothingAssetParameters.cpp @@ -112,8 +113,8 @@ APEX_Clothing_debug_hpaths += ./../../module/clothing/include/unix APEX_Clothing_debug_hpaths += ./../../module/clothing/embedded/LowLevelCloth/include APEX_Clothing_debug_hpaths += ./../../module/clothing/embedded/LowLevelCloth/src APEX_Clothing_debug_hpaths += ./../../module/clothing/embedded +APEX_Clothing_debug_hpaths += ./../../module/clothing/src/simd APEX_Clothing_debug_hpaths += ./../../../PxShared/src/pvd/src -APEX_Clothing_debug_hpaths += ./../../../PxShared/src/NvSimd/include APEX_Clothing_debug_lpaths := APEX_Clothing_debug_lpaths += ./../../../PxShared/lib/makelinux64 APEX_Clothing_debug_lpaths += ./../../../PhysX_3.4/Lib/makelinux64 @@ -245,8 +246,8 @@ APEX_Clothing_release_hpaths += ./../../module/clothing/include/unix APEX_Clothing_release_hpaths += ./../../module/clothing/embedded/LowLevelCloth/include APEX_Clothing_release_hpaths += ./../../module/clothing/embedded/LowLevelCloth/src APEX_Clothing_release_hpaths += ./../../module/clothing/embedded +APEX_Clothing_release_hpaths += ./../../module/clothing/src/simd APEX_Clothing_release_hpaths += ./../../../PxShared/src/pvd/src -APEX_Clothing_release_hpaths += ./../../../PxShared/src/NvSimd/include APEX_Clothing_release_lpaths := APEX_Clothing_release_lpaths += ./../../../PxShared/lib/makelinux64 APEX_Clothing_release_lpaths += ./../../../PhysX_3.4/Lib/makelinux64 @@ -377,8 +378,8 @@ APEX_Clothing_profile_hpaths += ./../../module/clothing/include/unix APEX_Clothing_profile_hpaths += ./../../module/clothing/embedded/LowLevelCloth/include APEX_Clothing_profile_hpaths += ./../../module/clothing/embedded/LowLevelCloth/src APEX_Clothing_profile_hpaths += ./../../module/clothing/embedded +APEX_Clothing_profile_hpaths += ./../../module/clothing/src/simd APEX_Clothing_profile_hpaths += ./../../../PxShared/src/pvd/src -APEX_Clothing_profile_hpaths += ./../../../PxShared/src/NvSimd/include APEX_Clothing_profile_lpaths := APEX_Clothing_profile_lpaths += ./../../../PxShared/lib/makelinux64 APEX_Clothing_profile_lpaths += ./../../../PhysX_3.4/Lib/makelinux64 @@ -509,8 +510,8 @@ APEX_Clothing_checked_hpaths += ./../../module/clothing/include/unix APEX_Clothing_checked_hpaths += ./../../module/clothing/embedded/LowLevelCloth/include APEX_Clothing_checked_hpaths += ./../../module/clothing/embedded/LowLevelCloth/src APEX_Clothing_checked_hpaths += ./../../module/clothing/embedded +APEX_Clothing_checked_hpaths += ./../../module/clothing/src/simd APEX_Clothing_checked_hpaths += ./../../../PxShared/src/pvd/src -APEX_Clothing_checked_hpaths += ./../../../PxShared/src/NvSimd/include APEX_Clothing_checked_lpaths := APEX_Clothing_checked_lpaths += ./../../../PxShared/lib/makelinux64 APEX_Clothing_checked_lpaths += ./../../../PhysX_3.4/Lib/makelinux64 diff --git a/APEX_1.4/compiler/linux64/Makefile.ApexCommon.mk b/APEX_1.4/compiler/linux64/Makefile.ApexCommon.mk index 04b422e7..98de03fd 100644 --- a/APEX_1.4/compiler/linux64/Makefile.ApexCommon.mk +++ b/APEX_1.4/compiler/linux64/Makefile.ApexCommon.mk @@ -11,7 +11,6 @@ ApexCommon_cppfiles += ./../../common/src/ApexCudaTest.cpp ApexCommon_cppfiles += ./../../common/src/ApexGeneralizedCubeTemplates.cpp ApexCommon_cppfiles += ./../../common/src/ApexGeneralizedMarchingCubes.cpp ApexCommon_cppfiles += ./../../common/src/ApexIsoMesh.cpp -ApexCommon_cppfiles += ./../../common/src/ApexMath.cpp ApexCommon_cppfiles += ./../../common/src/ApexMeshContractor.cpp ApexCommon_cppfiles += ./../../common/src/ApexMeshHash.cpp ApexCommon_cppfiles += ./../../common/src/ApexPreview.cpp @@ -97,7 +96,6 @@ ApexCommon_debug_hpaths += ./../../framework/include ApexCommon_debug_hpaths += ./../../framework/include/autogen ApexCommon_debug_hpaths += ./../../include ApexCommon_debug_hpaths += ./../../include/PhysX3 -ApexCommon_debug_hpaths += ./../../../PxShared/src/NvSimd/include ApexCommon_debug_lpaths := ApexCommon_debug_lpaths += ./../../../PxShared/lib/makelinux64 ApexCommon_debug_lpaths += ./../../../PhysX_3.4/Lib/makelinux64 @@ -216,7 +214,6 @@ ApexCommon_release_hpaths += ./../../framework/include ApexCommon_release_hpaths += ./../../framework/include/autogen ApexCommon_release_hpaths += ./../../include ApexCommon_release_hpaths += ./../../include/PhysX3 -ApexCommon_release_hpaths += ./../../../PxShared/src/NvSimd/include ApexCommon_release_lpaths := ApexCommon_release_lpaths += ./../../../PxShared/lib/makelinux64 ApexCommon_release_lpaths += ./../../../PhysX_3.4/Lib/makelinux64 @@ -334,7 +331,6 @@ ApexCommon_profile_hpaths += ./../../framework/include ApexCommon_profile_hpaths += ./../../framework/include/autogen ApexCommon_profile_hpaths += ./../../include ApexCommon_profile_hpaths += ./../../include/PhysX3 -ApexCommon_profile_hpaths += ./../../../PxShared/src/NvSimd/include ApexCommon_profile_lpaths := ApexCommon_profile_lpaths += ./../../../PxShared/lib/makelinux64 ApexCommon_profile_lpaths += ./../../../PhysX_3.4/Lib/makelinux64 @@ -452,7 +448,6 @@ ApexCommon_checked_hpaths += ./../../framework/include ApexCommon_checked_hpaths += ./../../framework/include/autogen ApexCommon_checked_hpaths += ./../../include ApexCommon_checked_hpaths += ./../../include/PhysX3 -ApexCommon_checked_hpaths += ./../../../PxShared/src/NvSimd/include ApexCommon_checked_lpaths := ApexCommon_checked_lpaths += ./../../../PxShared/lib/makelinux64 ApexCommon_checked_lpaths += ./../../../PhysX_3.4/Lib/makelinux64 diff --git a/APEX_1.4/compiler/vc11win32-PhysX_3.4/APEX_Clothing.vcxproj b/APEX_1.4/compiler/vc11win32-PhysX_3.4/APEX_Clothing.vcxproj index 5d58b270..7caf8973 100644 --- a/APEX_1.4/compiler/vc11win32-PhysX_3.4/APEX_Clothing.vcxproj +++ b/APEX_1.4/compiler/vc11win32-PhysX_3.4/APEX_Clothing.vcxproj @@ -112,7 +112,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;PX_PHYSX_DLL_NAME_POSTFIX=DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -154,7 +154,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -196,7 +196,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -238,7 +238,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=CHECKED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -265,6 +265,26 @@ <ResourceCompile Include="..\resource\apex.rc"></ResourceCompile> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2SimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingActorParam.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingAssetParameters.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingCookedParam.cpp"></ClCompile> @@ -291,7 +311,9 @@ <ClCompile Include="..\..\module\clothing\src\CookingAbstract.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\ModuleClothingHelpers.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\ModuleClothingImpl.cpp"></ClCompile> + <ClCompile Include="..\..\module\clothing\src\SimdMath.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\SimulationAbstract.cpp"></ClCompile> + <ClInclude Include="..\..\module\clothing\src\SimdMath.h"></ClInclude> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\module\clothing\include\autogen\ClothingActorParam.h"></ClInclude> diff --git a/APEX_1.4/compiler/vc11win32-PhysX_3.4/APEX_Clothing.vcxproj.filters b/APEX_1.4/compiler/vc11win32-PhysX_3.4/APEX_Clothing.vcxproj.filters index 9bf19d00..67e8a68d 100644 --- a/APEX_1.4/compiler/vc11win32-PhysX_3.4/APEX_Clothing.vcxproj.filters +++ b/APEX_1.4/compiler/vc11win32-PhysX_3.4/APEX_Clothing.vcxproj.filters @@ -18,6 +18,66 @@ </Filter>
</ItemGroup>
<ItemGroup>
+ <Filter Include="Clothing\src\simd">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\neon">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4f.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4i.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimdTypes.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\scalar">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4f.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4i.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimdTypes.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\sse2">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4f.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4i.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2SimdTypes.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4f.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4i.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimdTypes.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
<Filter Include="Clothing\src\autogen">
</Filter>
</ItemGroup>
@@ -96,9 +156,15 @@ <ClCompile Include="..\..\module\clothing\src\ModuleClothingImpl.cpp">
<Filter>Clothing\src</Filter>
</ClCompile>
+ <ClCompile Include="..\..\module\clothing\src\SimdMath.cpp">
+ <Filter>Clothing\src</Filter>
+ </ClCompile>
<ClCompile Include="..\..\module\clothing\src\SimulationAbstract.cpp">
<Filter>Clothing\src</Filter>
</ClCompile>
+ <ClInclude Include="..\..\module\clothing\src\SimdMath.h">
+ <Filter>Clothing\src</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Clothing\include">
diff --git a/APEX_1.4/compiler/vc11win32-PhysX_3.4/ApexCommon.vcxproj b/APEX_1.4/compiler/vc11win32-PhysX_3.4/ApexCommon.vcxproj index a327ab06..602e5aa1 100644 --- a/APEX_1.4/compiler/vc11win32-PhysX_3.4/ApexCommon.vcxproj +++ b/APEX_1.4/compiler/vc11win32-PhysX_3.4/ApexCommon.vcxproj @@ -111,7 +111,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;PX_PHYSX_DLL_NAME_POSTFIX=DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -151,7 +151,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -191,7 +191,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -231,7 +231,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=CHECKED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -269,7 +269,6 @@ <ClCompile Include="..\..\common\src\ApexGeneralizedCubeTemplates.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexGeneralizedMarchingCubes.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexIsoMesh.cpp"></ClCompile> - <ClCompile Include="..\..\common\src\ApexMath.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexMeshContractor.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexMeshHash.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexPreview.cpp"></ClCompile> @@ -343,7 +342,6 @@ <ClInclude Include="..\..\common\include\ApexSDKIntl.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexShape.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexSharedUtils.h"></ClInclude> - <ClInclude Include="..\..\common\include\ApexSimdMath.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexSubdivider.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexTest.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexTetrahedralizer.h"></ClInclude> diff --git a/APEX_1.4/compiler/vc11win32-PhysX_3.4/ApexCommon.vcxproj.filters b/APEX_1.4/compiler/vc11win32-PhysX_3.4/ApexCommon.vcxproj.filters index 376182fa..69c5ea2d 100644 --- a/APEX_1.4/compiler/vc11win32-PhysX_3.4/ApexCommon.vcxproj.filters +++ b/APEX_1.4/compiler/vc11win32-PhysX_3.4/ApexCommon.vcxproj.filters @@ -54,9 +54,6 @@ <ClCompile Include="..\..\common\src\ApexIsoMesh.cpp">
<Filter>Common\src</Filter>
</ClCompile>
- <ClCompile Include="..\..\common\src\ApexMath.cpp">
- <Filter>Common\src</Filter>
- </ClCompile>
<ClCompile Include="..\..\common\src\ApexMeshContractor.cpp">
<Filter>Common\src</Filter>
</ClCompile>
@@ -276,9 +273,6 @@ <ClInclude Include="..\..\common\include\ApexSharedUtils.h">
<Filter>Common\include</Filter>
</ClInclude>
- <ClInclude Include="..\..\common\include\ApexSimdMath.h">
- <Filter>Common\include</Filter>
- </ClInclude>
<ClInclude Include="..\..\common\include\ApexSubdivider.h">
<Filter>Common\include</Filter>
</ClInclude>
diff --git a/APEX_1.4/compiler/vc11win64-PhysX_3.4/APEX_Clothing.vcxproj b/APEX_1.4/compiler/vc11win64-PhysX_3.4/APEX_Clothing.vcxproj index 0d0cbc1b..362882b9 100644 --- a/APEX_1.4/compiler/vc11win64-PhysX_3.4/APEX_Clothing.vcxproj +++ b/APEX_1.4/compiler/vc11win64-PhysX_3.4/APEX_Clothing.vcxproj @@ -111,7 +111,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;PX_PHYSX_DLL_NAME_POSTFIX=DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -152,7 +152,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -193,7 +193,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -234,7 +234,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=CHECKED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -261,6 +261,26 @@ <ResourceCompile Include="..\resource\apex.rc"></ResourceCompile> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2SimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingActorParam.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingAssetParameters.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingCookedParam.cpp"></ClCompile> @@ -287,7 +307,9 @@ <ClCompile Include="..\..\module\clothing\src\CookingAbstract.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\ModuleClothingHelpers.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\ModuleClothingImpl.cpp"></ClCompile> + <ClCompile Include="..\..\module\clothing\src\SimdMath.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\SimulationAbstract.cpp"></ClCompile> + <ClInclude Include="..\..\module\clothing\src\SimdMath.h"></ClInclude> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\module\clothing\include\autogen\ClothingActorParam.h"></ClInclude> diff --git a/APEX_1.4/compiler/vc11win64-PhysX_3.4/APEX_Clothing.vcxproj.filters b/APEX_1.4/compiler/vc11win64-PhysX_3.4/APEX_Clothing.vcxproj.filters index 9bf19d00..67e8a68d 100644 --- a/APEX_1.4/compiler/vc11win64-PhysX_3.4/APEX_Clothing.vcxproj.filters +++ b/APEX_1.4/compiler/vc11win64-PhysX_3.4/APEX_Clothing.vcxproj.filters @@ -18,6 +18,66 @@ </Filter>
</ItemGroup>
<ItemGroup>
+ <Filter Include="Clothing\src\simd">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\neon">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4f.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4i.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimdTypes.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\scalar">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4f.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4i.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimdTypes.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\sse2">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4f.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4i.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2SimdTypes.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4f.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4i.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimdTypes.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
<Filter Include="Clothing\src\autogen">
</Filter>
</ItemGroup>
@@ -96,9 +156,15 @@ <ClCompile Include="..\..\module\clothing\src\ModuleClothingImpl.cpp">
<Filter>Clothing\src</Filter>
</ClCompile>
+ <ClCompile Include="..\..\module\clothing\src\SimdMath.cpp">
+ <Filter>Clothing\src</Filter>
+ </ClCompile>
<ClCompile Include="..\..\module\clothing\src\SimulationAbstract.cpp">
<Filter>Clothing\src</Filter>
</ClCompile>
+ <ClInclude Include="..\..\module\clothing\src\SimdMath.h">
+ <Filter>Clothing\src</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Clothing\include">
diff --git a/APEX_1.4/compiler/vc11win64-PhysX_3.4/ApexCommon.vcxproj b/APEX_1.4/compiler/vc11win64-PhysX_3.4/ApexCommon.vcxproj index cea13273..316a0dfa 100644 --- a/APEX_1.4/compiler/vc11win64-PhysX_3.4/ApexCommon.vcxproj +++ b/APEX_1.4/compiler/vc11win64-PhysX_3.4/ApexCommon.vcxproj @@ -110,7 +110,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;PX_PHYSX_DLL_NAME_POSTFIX=DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -149,7 +149,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -188,7 +188,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -227,7 +227,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=CHECKED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -265,7 +265,6 @@ <ClCompile Include="..\..\common\src\ApexGeneralizedCubeTemplates.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexGeneralizedMarchingCubes.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexIsoMesh.cpp"></ClCompile> - <ClCompile Include="..\..\common\src\ApexMath.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexMeshContractor.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexMeshHash.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexPreview.cpp"></ClCompile> @@ -339,7 +338,6 @@ <ClInclude Include="..\..\common\include\ApexSDKIntl.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexShape.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexSharedUtils.h"></ClInclude> - <ClInclude Include="..\..\common\include\ApexSimdMath.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexSubdivider.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexTest.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexTetrahedralizer.h"></ClInclude> diff --git a/APEX_1.4/compiler/vc11win64-PhysX_3.4/ApexCommon.vcxproj.filters b/APEX_1.4/compiler/vc11win64-PhysX_3.4/ApexCommon.vcxproj.filters index 376182fa..69c5ea2d 100644 --- a/APEX_1.4/compiler/vc11win64-PhysX_3.4/ApexCommon.vcxproj.filters +++ b/APEX_1.4/compiler/vc11win64-PhysX_3.4/ApexCommon.vcxproj.filters @@ -54,9 +54,6 @@ <ClCompile Include="..\..\common\src\ApexIsoMesh.cpp">
<Filter>Common\src</Filter>
</ClCompile>
- <ClCompile Include="..\..\common\src\ApexMath.cpp">
- <Filter>Common\src</Filter>
- </ClCompile>
<ClCompile Include="..\..\common\src\ApexMeshContractor.cpp">
<Filter>Common\src</Filter>
</ClCompile>
@@ -276,9 +273,6 @@ <ClInclude Include="..\..\common\include\ApexSharedUtils.h">
<Filter>Common\include</Filter>
</ClInclude>
- <ClInclude Include="..\..\common\include\ApexSimdMath.h">
- <Filter>Common\include</Filter>
- </ClInclude>
<ClInclude Include="..\..\common\include\ApexSubdivider.h">
<Filter>Common\include</Filter>
</ClInclude>
diff --git a/APEX_1.4/compiler/vc12win32-PhysX_3.4/APEX_Clothing.vcxproj b/APEX_1.4/compiler/vc12win32-PhysX_3.4/APEX_Clothing.vcxproj index 4c6fced6..9526788e 100644 --- a/APEX_1.4/compiler/vc12win32-PhysX_3.4/APEX_Clothing.vcxproj +++ b/APEX_1.4/compiler/vc12win32-PhysX_3.4/APEX_Clothing.vcxproj @@ -112,7 +112,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;PX_PHYSX_DLL_NAME_POSTFIX=DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -154,7 +154,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -196,7 +196,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -238,7 +238,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=CHECKED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -265,6 +265,26 @@ <ResourceCompile Include="..\resource\apex.rc"></ResourceCompile> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2SimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingActorParam.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingAssetParameters.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingCookedParam.cpp"></ClCompile> @@ -291,7 +311,9 @@ <ClCompile Include="..\..\module\clothing\src\CookingAbstract.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\ModuleClothingHelpers.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\ModuleClothingImpl.cpp"></ClCompile> + <ClCompile Include="..\..\module\clothing\src\SimdMath.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\SimulationAbstract.cpp"></ClCompile> + <ClInclude Include="..\..\module\clothing\src\SimdMath.h"></ClInclude> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\module\clothing\include\autogen\ClothingActorParam.h"></ClInclude> diff --git a/APEX_1.4/compiler/vc12win32-PhysX_3.4/APEX_Clothing.vcxproj.filters b/APEX_1.4/compiler/vc12win32-PhysX_3.4/APEX_Clothing.vcxproj.filters index 9bf19d00..67e8a68d 100644 --- a/APEX_1.4/compiler/vc12win32-PhysX_3.4/APEX_Clothing.vcxproj.filters +++ b/APEX_1.4/compiler/vc12win32-PhysX_3.4/APEX_Clothing.vcxproj.filters @@ -18,6 +18,66 @@ </Filter>
</ItemGroup>
<ItemGroup>
+ <Filter Include="Clothing\src\simd">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\neon">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4f.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4i.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimdTypes.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\scalar">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4f.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4i.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimdTypes.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\sse2">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4f.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4i.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2SimdTypes.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4f.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4i.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimdTypes.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
<Filter Include="Clothing\src\autogen">
</Filter>
</ItemGroup>
@@ -96,9 +156,15 @@ <ClCompile Include="..\..\module\clothing\src\ModuleClothingImpl.cpp">
<Filter>Clothing\src</Filter>
</ClCompile>
+ <ClCompile Include="..\..\module\clothing\src\SimdMath.cpp">
+ <Filter>Clothing\src</Filter>
+ </ClCompile>
<ClCompile Include="..\..\module\clothing\src\SimulationAbstract.cpp">
<Filter>Clothing\src</Filter>
</ClCompile>
+ <ClInclude Include="..\..\module\clothing\src\SimdMath.h">
+ <Filter>Clothing\src</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Clothing\include">
diff --git a/APEX_1.4/compiler/vc12win32-PhysX_3.4/ApexCommon.vcxproj b/APEX_1.4/compiler/vc12win32-PhysX_3.4/ApexCommon.vcxproj index 07430dc5..e9ed2267 100644 --- a/APEX_1.4/compiler/vc12win32-PhysX_3.4/ApexCommon.vcxproj +++ b/APEX_1.4/compiler/vc12win32-PhysX_3.4/ApexCommon.vcxproj @@ -111,7 +111,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;PX_PHYSX_DLL_NAME_POSTFIX=DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -151,7 +151,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -191,7 +191,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -231,7 +231,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=CHECKED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -269,7 +269,6 @@ <ClCompile Include="..\..\common\src\ApexGeneralizedCubeTemplates.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexGeneralizedMarchingCubes.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexIsoMesh.cpp"></ClCompile> - <ClCompile Include="..\..\common\src\ApexMath.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexMeshContractor.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexMeshHash.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexPreview.cpp"></ClCompile> @@ -343,7 +342,6 @@ <ClInclude Include="..\..\common\include\ApexSDKIntl.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexShape.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexSharedUtils.h"></ClInclude> - <ClInclude Include="..\..\common\include\ApexSimdMath.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexSubdivider.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexTest.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexTetrahedralizer.h"></ClInclude> diff --git a/APEX_1.4/compiler/vc12win32-PhysX_3.4/ApexCommon.vcxproj.filters b/APEX_1.4/compiler/vc12win32-PhysX_3.4/ApexCommon.vcxproj.filters index 376182fa..69c5ea2d 100644 --- a/APEX_1.4/compiler/vc12win32-PhysX_3.4/ApexCommon.vcxproj.filters +++ b/APEX_1.4/compiler/vc12win32-PhysX_3.4/ApexCommon.vcxproj.filters @@ -54,9 +54,6 @@ <ClCompile Include="..\..\common\src\ApexIsoMesh.cpp">
<Filter>Common\src</Filter>
</ClCompile>
- <ClCompile Include="..\..\common\src\ApexMath.cpp">
- <Filter>Common\src</Filter>
- </ClCompile>
<ClCompile Include="..\..\common\src\ApexMeshContractor.cpp">
<Filter>Common\src</Filter>
</ClCompile>
@@ -276,9 +273,6 @@ <ClInclude Include="..\..\common\include\ApexSharedUtils.h">
<Filter>Common\include</Filter>
</ClInclude>
- <ClInclude Include="..\..\common\include\ApexSimdMath.h">
- <Filter>Common\include</Filter>
- </ClInclude>
<ClInclude Include="..\..\common\include\ApexSubdivider.h">
<Filter>Common\include</Filter>
</ClInclude>
diff --git a/APEX_1.4/compiler/vc12win64-PhysX_3.4/APEX_Clothing.vcxproj b/APEX_1.4/compiler/vc12win64-PhysX_3.4/APEX_Clothing.vcxproj index ec51745d..1de5161c 100644 --- a/APEX_1.4/compiler/vc12win64-PhysX_3.4/APEX_Clothing.vcxproj +++ b/APEX_1.4/compiler/vc12win64-PhysX_3.4/APEX_Clothing.vcxproj @@ -111,7 +111,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;PX_PHYSX_DLL_NAME_POSTFIX=DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -152,7 +152,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -193,7 +193,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -234,7 +234,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=CHECKED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -261,6 +261,26 @@ <ResourceCompile Include="..\resource\apex.rc"></ResourceCompile> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2SimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingActorParam.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingAssetParameters.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingCookedParam.cpp"></ClCompile> @@ -287,7 +307,9 @@ <ClCompile Include="..\..\module\clothing\src\CookingAbstract.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\ModuleClothingHelpers.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\ModuleClothingImpl.cpp"></ClCompile> + <ClCompile Include="..\..\module\clothing\src\SimdMath.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\SimulationAbstract.cpp"></ClCompile> + <ClInclude Include="..\..\module\clothing\src\SimdMath.h"></ClInclude> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\module\clothing\include\autogen\ClothingActorParam.h"></ClInclude> diff --git a/APEX_1.4/compiler/vc12win64-PhysX_3.4/APEX_Clothing.vcxproj.filters b/APEX_1.4/compiler/vc12win64-PhysX_3.4/APEX_Clothing.vcxproj.filters index 9bf19d00..67e8a68d 100644 --- a/APEX_1.4/compiler/vc12win64-PhysX_3.4/APEX_Clothing.vcxproj.filters +++ b/APEX_1.4/compiler/vc12win64-PhysX_3.4/APEX_Clothing.vcxproj.filters @@ -18,6 +18,66 @@ </Filter>
</ItemGroup>
<ItemGroup>
+ <Filter Include="Clothing\src\simd">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\neon">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4f.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4i.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimdTypes.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\scalar">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4f.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4i.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimdTypes.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\sse2">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4f.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4i.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2SimdTypes.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4f.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4i.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimdTypes.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
<Filter Include="Clothing\src\autogen">
</Filter>
</ItemGroup>
@@ -96,9 +156,15 @@ <ClCompile Include="..\..\module\clothing\src\ModuleClothingImpl.cpp">
<Filter>Clothing\src</Filter>
</ClCompile>
+ <ClCompile Include="..\..\module\clothing\src\SimdMath.cpp">
+ <Filter>Clothing\src</Filter>
+ </ClCompile>
<ClCompile Include="..\..\module\clothing\src\SimulationAbstract.cpp">
<Filter>Clothing\src</Filter>
</ClCompile>
+ <ClInclude Include="..\..\module\clothing\src\SimdMath.h">
+ <Filter>Clothing\src</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Clothing\include">
diff --git a/APEX_1.4/compiler/vc12win64-PhysX_3.4/ApexCommon.vcxproj b/APEX_1.4/compiler/vc12win64-PhysX_3.4/ApexCommon.vcxproj index 1c116b15..b6286532 100644 --- a/APEX_1.4/compiler/vc12win64-PhysX_3.4/ApexCommon.vcxproj +++ b/APEX_1.4/compiler/vc12win64-PhysX_3.4/ApexCommon.vcxproj @@ -110,7 +110,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;PX_PHYSX_DLL_NAME_POSTFIX=DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -149,7 +149,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -188,7 +188,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -227,7 +227,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=CHECKED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -265,7 +265,6 @@ <ClCompile Include="..\..\common\src\ApexGeneralizedCubeTemplates.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexGeneralizedMarchingCubes.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexIsoMesh.cpp"></ClCompile> - <ClCompile Include="..\..\common\src\ApexMath.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexMeshContractor.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexMeshHash.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexPreview.cpp"></ClCompile> @@ -339,7 +338,6 @@ <ClInclude Include="..\..\common\include\ApexSDKIntl.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexShape.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexSharedUtils.h"></ClInclude> - <ClInclude Include="..\..\common\include\ApexSimdMath.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexSubdivider.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexTest.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexTetrahedralizer.h"></ClInclude> diff --git a/APEX_1.4/compiler/vc12win64-PhysX_3.4/ApexCommon.vcxproj.filters b/APEX_1.4/compiler/vc12win64-PhysX_3.4/ApexCommon.vcxproj.filters index 376182fa..69c5ea2d 100644 --- a/APEX_1.4/compiler/vc12win64-PhysX_3.4/ApexCommon.vcxproj.filters +++ b/APEX_1.4/compiler/vc12win64-PhysX_3.4/ApexCommon.vcxproj.filters @@ -54,9 +54,6 @@ <ClCompile Include="..\..\common\src\ApexIsoMesh.cpp">
<Filter>Common\src</Filter>
</ClCompile>
- <ClCompile Include="..\..\common\src\ApexMath.cpp">
- <Filter>Common\src</Filter>
- </ClCompile>
<ClCompile Include="..\..\common\src\ApexMeshContractor.cpp">
<Filter>Common\src</Filter>
</ClCompile>
@@ -276,9 +273,6 @@ <ClInclude Include="..\..\common\include\ApexSharedUtils.h">
<Filter>Common\include</Filter>
</ClInclude>
- <ClInclude Include="..\..\common\include\ApexSimdMath.h">
- <Filter>Common\include</Filter>
- </ClInclude>
<ClInclude Include="..\..\common\include\ApexSubdivider.h">
<Filter>Common\include</Filter>
</ClInclude>
diff --git a/APEX_1.4/compiler/vc14win32-PhysX_3.4/APEX_Clothing.vcxproj b/APEX_1.4/compiler/vc14win32-PhysX_3.4/APEX_Clothing.vcxproj index 0075063b..fe4ffebc 100644 --- a/APEX_1.4/compiler/vc14win32-PhysX_3.4/APEX_Clothing.vcxproj +++ b/APEX_1.4/compiler/vc14win32-PhysX_3.4/APEX_Clothing.vcxproj @@ -112,7 +112,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;PX_PHYSX_DLL_NAME_POSTFIX=DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -154,7 +154,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -196,7 +196,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -238,7 +238,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=CHECKED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -265,6 +265,26 @@ <ResourceCompile Include="..\resource\apex.rc"></ResourceCompile> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2SimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingActorParam.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingAssetParameters.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingCookedParam.cpp"></ClCompile> @@ -291,7 +311,9 @@ <ClCompile Include="..\..\module\clothing\src\CookingAbstract.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\ModuleClothingHelpers.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\ModuleClothingImpl.cpp"></ClCompile> + <ClCompile Include="..\..\module\clothing\src\SimdMath.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\SimulationAbstract.cpp"></ClCompile> + <ClInclude Include="..\..\module\clothing\src\SimdMath.h"></ClInclude> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\module\clothing\include\autogen\ClothingActorParam.h"></ClInclude> diff --git a/APEX_1.4/compiler/vc14win32-PhysX_3.4/APEX_Clothing.vcxproj.filters b/APEX_1.4/compiler/vc14win32-PhysX_3.4/APEX_Clothing.vcxproj.filters index 9bf19d00..67e8a68d 100644 --- a/APEX_1.4/compiler/vc14win32-PhysX_3.4/APEX_Clothing.vcxproj.filters +++ b/APEX_1.4/compiler/vc14win32-PhysX_3.4/APEX_Clothing.vcxproj.filters @@ -18,6 +18,66 @@ </Filter>
</ItemGroup>
<ItemGroup>
+ <Filter Include="Clothing\src\simd">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\neon">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4f.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4i.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimdTypes.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\scalar">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4f.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4i.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimdTypes.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\sse2">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4f.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4i.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2SimdTypes.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4f.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4i.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimdTypes.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
<Filter Include="Clothing\src\autogen">
</Filter>
</ItemGroup>
@@ -96,9 +156,15 @@ <ClCompile Include="..\..\module\clothing\src\ModuleClothingImpl.cpp">
<Filter>Clothing\src</Filter>
</ClCompile>
+ <ClCompile Include="..\..\module\clothing\src\SimdMath.cpp">
+ <Filter>Clothing\src</Filter>
+ </ClCompile>
<ClCompile Include="..\..\module\clothing\src\SimulationAbstract.cpp">
<Filter>Clothing\src</Filter>
</ClCompile>
+ <ClInclude Include="..\..\module\clothing\src\SimdMath.h">
+ <Filter>Clothing\src</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Clothing\include">
diff --git a/APEX_1.4/compiler/vc14win32-PhysX_3.4/ApexCommon.vcxproj b/APEX_1.4/compiler/vc14win32-PhysX_3.4/ApexCommon.vcxproj index 9d292eb8..4687556d 100644 --- a/APEX_1.4/compiler/vc14win32-PhysX_3.4/ApexCommon.vcxproj +++ b/APEX_1.4/compiler/vc14win32-PhysX_3.4/ApexCommon.vcxproj @@ -111,7 +111,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;PX_PHYSX_DLL_NAME_POSTFIX=DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -151,7 +151,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -191,7 +191,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -231,7 +231,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=CHECKED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -269,7 +269,6 @@ <ClCompile Include="..\..\common\src\ApexGeneralizedCubeTemplates.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexGeneralizedMarchingCubes.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexIsoMesh.cpp"></ClCompile> - <ClCompile Include="..\..\common\src\ApexMath.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexMeshContractor.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexMeshHash.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexPreview.cpp"></ClCompile> @@ -343,7 +342,6 @@ <ClInclude Include="..\..\common\include\ApexSDKIntl.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexShape.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexSharedUtils.h"></ClInclude> - <ClInclude Include="..\..\common\include\ApexSimdMath.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexSubdivider.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexTest.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexTetrahedralizer.h"></ClInclude> diff --git a/APEX_1.4/compiler/vc14win32-PhysX_3.4/ApexCommon.vcxproj.filters b/APEX_1.4/compiler/vc14win32-PhysX_3.4/ApexCommon.vcxproj.filters index 376182fa..69c5ea2d 100644 --- a/APEX_1.4/compiler/vc14win32-PhysX_3.4/ApexCommon.vcxproj.filters +++ b/APEX_1.4/compiler/vc14win32-PhysX_3.4/ApexCommon.vcxproj.filters @@ -54,9 +54,6 @@ <ClCompile Include="..\..\common\src\ApexIsoMesh.cpp">
<Filter>Common\src</Filter>
</ClCompile>
- <ClCompile Include="..\..\common\src\ApexMath.cpp">
- <Filter>Common\src</Filter>
- </ClCompile>
<ClCompile Include="..\..\common\src\ApexMeshContractor.cpp">
<Filter>Common\src</Filter>
</ClCompile>
@@ -276,9 +273,6 @@ <ClInclude Include="..\..\common\include\ApexSharedUtils.h">
<Filter>Common\include</Filter>
</ClInclude>
- <ClInclude Include="..\..\common\include\ApexSimdMath.h">
- <Filter>Common\include</Filter>
- </ClInclude>
<ClInclude Include="..\..\common\include\ApexSubdivider.h">
<Filter>Common\include</Filter>
</ClInclude>
diff --git a/APEX_1.4/compiler/vc14win64-PhysX_3.4/APEX_Clothing.vcxproj b/APEX_1.4/compiler/vc14win64-PhysX_3.4/APEX_Clothing.vcxproj index f4a87089..9eb72bc5 100644 --- a/APEX_1.4/compiler/vc14win64-PhysX_3.4/APEX_Clothing.vcxproj +++ b/APEX_1.4/compiler/vc14win64-PhysX_3.4/APEX_Clothing.vcxproj @@ -111,7 +111,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;PX_PHYSX_DLL_NAME_POSTFIX=DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -152,7 +152,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -193,7 +193,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -234,7 +234,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /EHsc /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;../../../PxShared/src/pvd/src;../../../PxShared/src/NvSimd/include;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../include/clothing;./../../module/clothing/include;./../../module/clothing/include/autogen;./../../module/clothing/include/windows;./../../module/clothing/embedded/LowLevelCloth/include;./../../module/clothing/embedded/LowLevelCloth/src;./../../module/clothing/embedded;./../../module/clothing/src/simd;../../../PxShared/src/pvd/src;./../../module/clothing/embedded/LowLevelCloth/src/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;_USRDLL;ENABLE_TEST=0;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=CHECKED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -261,6 +261,26 @@ <ResourceCompile Include="..\resource\apex.rc"></ResourceCompile> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2SimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4f.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4i.h"></ClInclude> + <ClInclude Include="..\..\module\clothing\src\simd\NvSimdTypes.h"></ClInclude> + </ItemGroup> + <ItemGroup> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingActorParam.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingAssetParameters.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\autogen\ClothingCookedParam.cpp"></ClCompile> @@ -287,7 +307,9 @@ <ClCompile Include="..\..\module\clothing\src\CookingAbstract.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\ModuleClothingHelpers.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\ModuleClothingImpl.cpp"></ClCompile> + <ClCompile Include="..\..\module\clothing\src\SimdMath.cpp"></ClCompile> <ClCompile Include="..\..\module\clothing\src\SimulationAbstract.cpp"></ClCompile> + <ClInclude Include="..\..\module\clothing\src\SimdMath.h"></ClInclude> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\module\clothing\include\autogen\ClothingActorParam.h"></ClInclude> diff --git a/APEX_1.4/compiler/vc14win64-PhysX_3.4/APEX_Clothing.vcxproj.filters b/APEX_1.4/compiler/vc14win64-PhysX_3.4/APEX_Clothing.vcxproj.filters index 9bf19d00..67e8a68d 100644 --- a/APEX_1.4/compiler/vc14win64-PhysX_3.4/APEX_Clothing.vcxproj.filters +++ b/APEX_1.4/compiler/vc14win64-PhysX_3.4/APEX_Clothing.vcxproj.filters @@ -18,6 +18,66 @@ </Filter>
</ItemGroup>
<ItemGroup>
+ <Filter Include="Clothing\src\simd">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\neon">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4f.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimd4i.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\neon\NvNeonSimdTypes.h">
+ <Filter>Clothing\src\simd\neon</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\scalar">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4f.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimd4i.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\scalar\NvScalarSimdTypes.h">
+ <Filter>Clothing\src\simd\scalar</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Clothing\src\simd\sse2">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4f.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2Simd4i.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\sse2\NvSse2SimdTypes.h">
+ <Filter>Clothing\src\simd\sse2</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4f.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimd4i.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\module\clothing\src\simd\NvSimdTypes.h">
+ <Filter>Clothing\src\simd</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
<Filter Include="Clothing\src\autogen">
</Filter>
</ItemGroup>
@@ -96,9 +156,15 @@ <ClCompile Include="..\..\module\clothing\src\ModuleClothingImpl.cpp">
<Filter>Clothing\src</Filter>
</ClCompile>
+ <ClCompile Include="..\..\module\clothing\src\SimdMath.cpp">
+ <Filter>Clothing\src</Filter>
+ </ClCompile>
<ClCompile Include="..\..\module\clothing\src\SimulationAbstract.cpp">
<Filter>Clothing\src</Filter>
</ClCompile>
+ <ClInclude Include="..\..\module\clothing\src\SimdMath.h">
+ <Filter>Clothing\src</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Clothing\include">
diff --git a/APEX_1.4/compiler/vc14win64-PhysX_3.4/ApexCommon.vcxproj b/APEX_1.4/compiler/vc14win64-PhysX_3.4/ApexCommon.vcxproj index 642800e9..047bcf4c 100644 --- a/APEX_1.4/compiler/vc14win64-PhysX_3.4/ApexCommon.vcxproj +++ b/APEX_1.4/compiler/vc14win64-PhysX_3.4/ApexCommon.vcxproj @@ -110,7 +110,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;PX_PHYSX_DLL_NAME_POSTFIX=DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -149,7 +149,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -188,7 +188,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -227,7 +227,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;../../../PxShared/src/NvSimd/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../PxShared/include;../../../PxShared/include/filebuf;../../../PxShared/include/foundation;../../../PxShared/include/task;../../../PxShared/include/cudamanager;../../../PxShared/include/pvd;../../../PxShared/src/foundation/include;../../../PxShared/src/filebuf/include;../../../PxShared/src/fastxml/include;../../../PxShared/src/pvd/include;./../../shared/general/shared;./../../public;../../../PhysX_3.4/Include;../../../PhysX_3.4/Include/common;../../../PhysX_3.4/Include/cooking;../../../PhysX_3.4/Include/extensions;../../../PhysX_3.4/Include/geometry;../../../PhysX_3.4/Include/gpu;../../../PhysX_3.4/Include/deformable;../../../PhysX_3.4/Include/particles;../../../PhysX_3.4/Include/characterkinematic;../../../PhysX_3.4/Include/characterdynamic;../../../PhysX_3.4/Include/vehicle;../../../PhysX_3.4/Source/GeomUtils/headers;../../../PhysX_3.4/Source/PhysXGpu/include;./../../shared/general/RenderDebug/public;./../../shared/general/shared/inparser/include;./../../common/include;./../../common/include/autogen;./../../common/include/windows;./../../shared/internal/include;./../../module/common/include;./../../NvParameterized/include;./../../include;./../../include/PhysX3;./../../../Externals/nvToolsExt/1/include;./../../framework/include;./../../framework/include/autogen;./../../include;./../../include/PhysX3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;INSTALLER=1;EXCLUDE_PARTICLES=1;ENABLE_TEST=0;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;PX_PHYSX_DLL_NAME_POSTFIX=CHECKED;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ExceptionHandling>false</ExceptionHandling> <WarningLevel>Level4</WarningLevel> @@ -265,7 +265,6 @@ <ClCompile Include="..\..\common\src\ApexGeneralizedCubeTemplates.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexGeneralizedMarchingCubes.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexIsoMesh.cpp"></ClCompile> - <ClCompile Include="..\..\common\src\ApexMath.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexMeshContractor.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexMeshHash.cpp"></ClCompile> <ClCompile Include="..\..\common\src\ApexPreview.cpp"></ClCompile> @@ -339,7 +338,6 @@ <ClInclude Include="..\..\common\include\ApexSDKIntl.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexShape.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexSharedUtils.h"></ClInclude> - <ClInclude Include="..\..\common\include\ApexSimdMath.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexSubdivider.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexTest.h"></ClInclude> <ClInclude Include="..\..\common\include\ApexTetrahedralizer.h"></ClInclude> diff --git a/APEX_1.4/compiler/vc14win64-PhysX_3.4/ApexCommon.vcxproj.filters b/APEX_1.4/compiler/vc14win64-PhysX_3.4/ApexCommon.vcxproj.filters index 376182fa..69c5ea2d 100644 --- a/APEX_1.4/compiler/vc14win64-PhysX_3.4/ApexCommon.vcxproj.filters +++ b/APEX_1.4/compiler/vc14win64-PhysX_3.4/ApexCommon.vcxproj.filters @@ -54,9 +54,6 @@ <ClCompile Include="..\..\common\src\ApexIsoMesh.cpp">
<Filter>Common\src</Filter>
</ClCompile>
- <ClCompile Include="..\..\common\src\ApexMath.cpp">
- <Filter>Common\src</Filter>
- </ClCompile>
<ClCompile Include="..\..\common\src\ApexMeshContractor.cpp">
<Filter>Common\src</Filter>
</ClCompile>
@@ -276,9 +273,6 @@ <ClInclude Include="..\..\common\include\ApexSharedUtils.h">
<Filter>Common\include</Filter>
</ClInclude>
- <ClInclude Include="..\..\common\include\ApexSimdMath.h">
- <Filter>Common\include</Filter>
- </ClInclude>
<ClInclude Include="..\..\common\include\ApexSubdivider.h">
<Filter>Common\include</Filter>
</ClInclude>
|